Bump to Forge 33.0.5

.github/workflows/release.yml

@@ -55,15 +55,7 @@ jobs:
           KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
           KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew publishMavenPublicationToGitHubPackagesRepository --no-daemon --max-workers 1
-      - name: Publish to modmaven
-        env:
-          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
-          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
-          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
-          MODMAVEN_USER: ${{ secrets.MODMAVEN_USER }}
-          MODMAVEN_PASSWORD: ${{ secrets.MODMAVEN_PASSWORD }}
-        run: ./gradlew publishMavenPublicationToModmavenRepository --no-daemon --max-workers 1
+        run: ./gradlew publish --no-daemon --max-workers 1
       - name: Prepare artifact metadata
         id: prepare_artifact_metadata
         run: |

build.gradle

@@ -30,10 +30,11 @@ buildscript {
 }
 
 plugins {
-    id "maven-publish"
-    id "com.diffplug.gradle.spotless" version "4.3.0"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
-    id "idea"
+  id "maven-publish"
+  id "com.diffplug.gradle.spotless" version "4.3.0"
+  id "com.matthewprenger.cursegradle" version "1.4.0"
+  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-${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}")
-
-    // 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'
 }
 
-///////////////////
-// Version Number
+// Create 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)
 }
 
-////////////////////
-// Forge/Minecraft
+apply from: 'gradle/scripts/dependencies.gradle'
+apply from: 'gradle/scripts/spotless.gradle'
+
 minecraft {
     mappings channel: "snapshot", version: project.mcp_mappings
 
@@ -168,14 +147,18 @@ minecraft {
     }
 }
 
-///////////
-// Mixins
 mixin {
     add sourceSets.main, "appliedenergistics2.mixins.refmap.json"
 }
 
-////////////////
-// Jar Signing
+jar {
+    manifest {
+        attributes([
+                "MixinConfigs": "appliedenergistics2.mixins.json"
+        ])
+    }
+}
+
 def signProps = [:]
 if (System.getenv("KEY_STORE_FILE")) {
     signProps['keyStore'] = System.getenv("KEY_STORE_FILE")
@@ -198,88 +181,15 @@ task signJar(type: net.minecraftforge.gradle.common.task.SignJar, dependsOn: 're
     }
 }
 
-//////////////
-// Aritfacts
-processResources {
-    exclude '.cache'
-}
+apply from: 'gradle/scripts/artifacts.gradle'
+apply from: 'gradle/scripts/curseforge.gradle'
 
-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) {
             groupId = project.group
             artifactId = project.archivesBaseName
             version = project.version
-
-            // ForgeGradle will generate wild dependency definitions, see https://github.com/MinecraftForge/ForgeGradle/issues/584
-            // Since we don't actually depend on anything, just remove the entire node.
-            pom.withXml {
-                asNode().remove(asNode().dependencies)
-            }
-
             from components.java
             artifact sourcesJar
             artifact javadocJar
@@ -295,63 +205,5 @@ publishing {
             name = "GitHubPackages"
             url = "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
         }
-        maven {
-            credentials {
-                username System.getenv("MODMAVEN_USER")
-                password System.getenv("MODMAVEN_PASSWORD")
-            }
-            name = "modmaven"
-            url = "https://modmaven.k-4u.nl/artifactory/local-releases/"
-        }
-    }
-}
-
-/////////////
-// 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,13 +9,14 @@ artifact_basename=appliedenergistics2
 # Minecraft Versions                                    #
 #########################################################
 minecraft_release=1.16
-minecraft_version=1.16.1
+minecraft_version=1.16.2
 mcp_mappings=20200723-1.16.1
-forge_version=32.0.108
+forge_version=33.0.5
 
 #########################################################
 # Provided APIs                                         #
 #########################################################
+jei_minecraft_version=1.16.1
 jei_version=7.0.0.6
 top_version=3.0.1-beta-4
 hwyla_version=1.10.8-B72_1.15.2
@@ -24,8 +25,8 @@ ctm_version=MC1.15.2-1.1.0.9
 #########################################################
 # Deployment                                            #
 #########################################################
-website_version=1.16.1
-curse_versions=1.16.1
+website_version=1.16.2
+curse_versions=1.16.2
 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-${jei_minecraft_version}:${jei_version}:api"
+    compileOnly "mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}:api"
+
+    // Runtime, Mods
+// FIXME 1.16.2    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
+// FIXME 1.16.2    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/crafting/ICraftingHelper.java

@@ -53,8 +53,6 @@ public interface ICraftingHelper {
      * @param stack If null, a new item will be created to hold the encoded pattern.
      *              Otherwise the given item must already contains an encoded
      *              pattern that will be overwritten.
-     * @throws IllegalArgumentException If either in or out contain only empty
-     *                                  ItemStacks.
      * @return A new encoded pattern, or the given stack with the pattern encoded in
      *         it.
      */
@@ -75,8 +73,6 @@ public interface ICraftingHelper {
      *                         operation by the ME system.
      * @param allowSubstitutes Controls whether the ME system will allow the use of
      *                         equivalent items to craft this recipe.
-     * @throws IllegalArgumentException If either in or out contain only empty
-     *                                  ItemStacks.
      */
     ItemStack encodeCraftingPattern(@Nullable ItemStack stack, ICraftingRecipe recipe, ItemStack[] in, ItemStack out,
             boolean allowSubstitutes);

src/api/java/appeng/api/implementations/items/IGrowableCrystal.java

@@ -23,23 +23,13 @@
 
 package appeng.api.implementations.items;
 
-import javax.annotation.Nullable;
-
-import net.minecraft.block.BlockState;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 
 public interface IGrowableCrystal {
 
     ItemStack triggerGrowth(ItemStack is);
 
-    /**
-     * Gets the crystal growth multiplier based on the material it is submerged in.
-     *
-     * @param state The blockstate of the block the crystal is currently in.
-     * @return The multiplier for the growth tick progress. Zero if the crystal
-     *         cannot grow in the current material.
-     */
-    float getMultiplier(BlockState state, @Nullable World world, @Nullable BlockPos pos);
+    float getMultiplier(Block blk, Material mat);
 }

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
-     * events.
+     * Notifies your IGridBlock that changes were made to your connections
      */
     void onGridNotification(@Nonnull GridNotification notification);
 

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

@@ -27,13 +27,14 @@ 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 IWorld world;
+    private final World world;
     private final DimensionType dimension;
 
     public DimensionalCoord(final DimensionalCoord coordinate) {
@@ -48,13 +49,13 @@ public class DimensionalCoord extends WorldCoord {
         this.dimension = this.world.func_230315_m_();
     }
 
-    public DimensionalCoord(final IWorld world, final int x, final int y, final int z) {
+    public DimensionalCoord(final World world, final int x, final int y, final int z) {
         super(x, y, z);
         this.world = world;
         this.dimension = world.func_230315_m_();
     }
 
-    public DimensionalCoord(final IWorld world, final BlockPos pos) {
+    public DimensionalCoord(final World world, final BlockPos pos) {
         super(pos);
         this.world = world;
         this.dimension = world.func_230315_m_();
@@ -84,7 +85,7 @@ public class DimensionalCoord extends WorldCoord {
         return this.world == world;
     }
 
-    public IWorld getWorld() {
+    public World getWorld() {
         return this.world;
     }
 

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

@@ -111,11 +111,6 @@ 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/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()
-                .setLightLevel(state -> state.get(LIGHT_LEVEL)));
-        setDefaultState(getDefaultState().with(LIGHT_LEVEL, 0));
+        super(defaultProps(AEMaterials.GLASS).notSolid().noDrops().variableOpacity());
     }
 
     @Override
@@ -132,9 +126,11 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
     }
 
     @Override
-    protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
-        super.fillStateContainer(builder);
-        builder.add(LIGHT_LEVEL);
+    public int getLightValue(final BlockState state, final IBlockReader world, final BlockPos pos) {
+        if (state.getBlock() != this) {
+            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/client/gui/AEBaseMEScreen.java

@@ -22,6 +22,7 @@ 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;
@@ -72,14 +73,16 @@ public abstract class AEBaseMEScreen<T extends AEBaseContainer> extends AEBaseSc
                     currentToolTip.add(ButtonToolTips.ItemsRequestable.text(formattedAmount));
                 }
 
-                this.renderToolTip(matrixStack, currentToolTip, x, y, this.font);
+                this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
+                        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, currentToolTip, x, y, this.font);
+                this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
+                        this.font);
 
                 return;
             }

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

@@ -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) {
@@ -219,7 +218,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
             styledLines.add(lines.get(i).deepCopy().modifyStyle(s -> style));
         }
 
-        this.renderTooltip(matrices, styledLines, x, y);
+        this.func_243308_b(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;
-            try {
-                for (final Object o : this.buttons) {
-                    final Widget widget = (Widget) o;
-                    if (widget.isMouseOver(xCoord, yCoord)) {
-                        return super.mouseClicked(xCoord, yCoord, 0);
-                    }
+            for (final Object o : this.buttons) {
+                final Widget widget = (Widget) o;
+                if (widget.isMouseOver(xCoord, yCoord)) {
+                    return super.mouseClicked(xCoord, yCoord, 0);
                 }
-            } finally {
-                handlingRightClick = false;
             }
         }
 
@@ -298,36 +291,22 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
             }
         }
 
-        // Forward left mouse button down events to the scrollbar
-        if (btn == 0 && this.getScrollBar() != null) {
-            if (this.getScrollBar().mouseDown(xCoord - this.guiLeft, yCoord - this.guiTop)) {
-                return true;
-            }
+        if (this.getScrollBar() != null) {
+            this.getScrollBar().click(xCoord - this.guiLeft, yCoord - this.guiTop);
         }
 
         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/Size1Slot.java

@@ -8,18 +8,19 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.items.SlotItemHandler;
 
 /**
  * A proxy for a slot that will always return an itemstack with size 1, if there
  * is an item in the slot. Used to prevent the default item count from
  * rendering.
  */
-class Size1Slot extends Slot {
+class Size1Slot extends SlotItemHandler {
 
-    private final Slot delegate;
+    private final SlotItemHandler delegate;
 
-    public Size1Slot(Slot delegate) {
-        super(delegate.inventory, delegate.getSlotIndex(), delegate.xPos, delegate.yPos);
+    public Size1Slot(SlotItemHandler delegate) {
+        super(delegate.getItemHandler(), delegate.getSlotIndex(), delegate.xPos, delegate.yPos);
         this.delegate = delegate;
     }
 

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);
-        if (amount <= 0) {
-            return;
-        }
-        NetworkHandler.instance().sendToServer(new CraftRequestPacket(amount, hasShiftDown()));
+        NetworkHandler.instance()
+                .sendToServer(new CraftRequestPacket((int) this.amountToCraft.getValue(), 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;
-        if (this.container.cpuName == null) {
-            cpuName = GuiText.Automatic.text();
-        } else {
-            cpuName = this.container.cpuName;
-        }
-
-        return GuiText.CraftingCPU.withSuffix(": ").append(cpuName);
+        this.selectCPU.setMessage(new StringTextComponent(btnTextText));
     }
 
     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.noCPU) {
-            return GuiText.NoCraftingJobs.text();
+        if (this.container.selectedCpu >= 0)// && status.selectedCpu < status.cpus.size() )
+        {
+            if (this.container.myName != null) {
+                final String name = this.container.myName.getStringTruncated(20);
+                btnTextText = GuiText.CPUs.getLocal() + ": " + name;
+            } else {
+                btnTextText = GuiText.CPUs.getLocal() + ": #" + this.container.selectedCpu;
+            }
         }
-        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/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,14 +81,16 @@ 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);
         this.searchField.setTextColor(0xFFFFFF);
         this.searchField.setVisible(true);
-        this.searchField.setResponder(str -> this.refreshList());
-        this.addListener(this.searchField);
-        this.changeFocus(true);
+        this.searchField.setFocused2(true);
     }
 
     @Override
@@ -128,8 +131,11 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
 
     @Override
     public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
-        if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
-            this.searchField.setText("");
+        if (this.searchField.mouseClicked(xCoord, yCoord, btn)) {
+            if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
+                this.searchField.setText("");
+                this.refreshList();
+            }
             return true;
         }
 
@@ -167,7 +173,11 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
         if (character == ' ' && this.searchField.getText().isEmpty()) {
             return true;
         }
-        return super.charTyped(character, key);
+        if (this.searchField.charTyped(character, key)) {
+            this.refreshList();
+            return true;
+        }
+        return false;
     }
 
     @Override
@@ -235,7 +245,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
 
     /**
      * Rebuilds the list of interfaces.
-     * <p>
+     *
      * Respects a search term if present (ignores case) and adding only matching
      * patterns.
      */
@@ -328,11 +338,12 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
 
     /**
      * Tries to retrieve a cache for a with search term as keyword.
-     * <p>
+     *
      * If this cache should be empty, it will populate it with an earlier cache if
      * available or at least the cache for the empty string.
      *
      * @param searchTerm the corresponding search
+     *
      * @return a Set matching a superset of the search term
      */
     private Set<Object> getCacheForSearchTerm(final String searchTerm) {

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());
-        this.level.setOnChange(this::saveReportingValue);
-        this.level.setOnConfirm(this::closeScreen);
-
-        this.changeFocus(true);
+        container.setTextField(this.level);
     }
 
-    private void saveReportingValue() {
-        this.level.getLongValue().ifPresent(container::setReportingValue);
+    private void onLevelChange(long level) {
+        NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(level)));
     }
 
     @Override

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

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

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.ValidationIcon;
+import appeng.client.gui.widgets.ITickingWidget;
+import appeng.client.gui.widgets.NumberBox;
 import appeng.core.AEConfig;
 
 /**
  * A utility widget that consists of a text-field to enter a number with
  * attached buttons to increment/decrement the number in fixed intervals.
  */
-public class NumberEntryWidget 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
-    private Runnable onChange;
-
-    // Called when the user presses enter while there's a valid number in the field
-    private Runnable onConfirm;
-
-    private boolean hideValidationIcon;
-
-    public NumberEntryWidget(AEBaseScreen<?> parent, int x, int y, int width, int height, NumberEntryType type) {
+    public NumberEntryWidget(AEBaseScreen<?> parent, int x, int y, int width, int height, NumberEntryType type,
+            LongConsumer changeListener) {
         this.parent = parent;
         this.x = x;
         this.y = y;
@@ -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,
-                StringTextComponent.EMPTY);
-        this.textField.setEnableBackgroundDrawing(false);
-        this.textField.setMaxStringLength(16);
-        this.textField.setTextColor(TEXT_COLOR_NORMAL);
-        this.textField.setVisible(true);
-        this.textField.setFocused2(true);
-        parent.setFocusedDefault(this.textField);
-        this.textField.setResponder(text -> {
-            validate();
-            if (onChange != null) {
-                this.onChange.run();
-            }
-        });
-        this.textField.setOnConfirm(() -> {
-            // Only confirm if it's actually valid
-            if (this.onConfirm != null && getLongValue().isPresent()) {
-                this.onConfirm.run();
-            }
-        });
-        validate();
-    }
-
-    public void setOnConfirm(Runnable callback) {
-        this.onConfirm = callback;
-    }
-
-    public void setOnChange(Runnable callback) {
-        this.onChange = callback;
+        this.level = new NumberBox(font, inputX, inputY, width, font.FONT_HEIGHT, type.getInputType(), changeListener);
+        this.level.setEnableBackgroundDrawing(false);
+        this.level.setMaxStringLength(16);
+        this.level.setTextColor(0xFFFFFF);
+        this.level.setVisible(true);
+        this.level.setFocused2(true);
+        parent.setFocusedDefault(this.level);
     }
 
     public void setActive(boolean active) {
-        this.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.textField.y = parent.getGuiTop() + y;
-        this.textField.setWidth(width);
+        this.level.x = parent.getGuiLeft() + x;
+        this.level.y = parent.getGuiTop() + y;
+        this.level.setWidth(width);
     }
 
     public void setMinValue(long minValue) {
-        this.minValue = minValue;
-        validate();
+        this.level.setMinValue(minValue);
     }
 
     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;
-
-        // 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();
+        this.buttons.forEach(addButton);
     }
 
     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) {
-        this.textField.render(matrices, mouseX, mouseY, partialTicks);
+    public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+        this.level.render(matrixStack, mouseX, mouseY, partialTicks);
     }
 
-    private void validate() {
-        List<ITextComponent> validationErrors = new ArrayList<>();
+    public void setValue(long value, boolean skipNotify) {
+        this.level.setValue(value, skipNotify);
+    }
 
-        String text = textField.getText().trim();
-        try {
-            long value = Long.parseLong(text, 10);
-            if (value < minValue) {
-                validationErrors.add(new TranslationTextComponent(NUMBER_LESS_THAN_MIN_VALUE, minValue));
-            }
-        } catch (NumberFormatException ignored) {
-            validationErrors.add(INVALID_NUMBER);
-        }
+    public void setValue(long value) {
+        setValue(value, false);
+    }
 
-        boolean valid = validationErrors.isEmpty();
-        this.textField.setTextColor(valid ? TEXT_COLOR_NORMAL : TEXT_COLOR_ERROR);
-        if (this.validationIcon != null) {
-            this.validationIcon.setValid(valid);
-            this.validationIcon.setTooltip(validationErrors);
-        }
+    public long getValue() {
+        return level.getValue();
+    }
+
+    @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() {
-        OptionalInt priority = this.priority.getIntValue();
-        if (priority.isPresent()) {
-            container.setPriority(priority.getAsInt());
-        }
+    private void onPriorityChange(long priority) {
+        NetworkHandler.instance()
+                .sendToServer(new ConfigValuePacket("PriorityHost.Priority", String.valueOf(priority)));
     }
 
     @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/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/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.minecraft.client.gui.AbstractGui;
-import net.minecraft.client.renderer.Rectangle2d;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
+import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.client.gui.AEBaseScreen;
 
-/**
- * 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 {
+public class Scrollbar 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;
-
-    /**
-     * The inner width of the scrollbar track.
-     */
-    private int width = HANDLE_WIDTH;
-
-    /**
-     * The inner height of the scrollbar track.
-     */
+    private int width = 12;
     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;
 
-    /**
-     * True if the scrollbar's handle is currently being dragged.
-     */
-    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;
+    public void draw(final AEBaseScreen<?> g) {
+        g.bindTexture("minecraft", "gui/container/creative_inventory/tabs.png");
+        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
 
-    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;
-            sourceRect = DISABLED;
+            GuiUtils.drawTexturedModalRect(this.displayX, this.displayY, 232 + this.width, 0, this.width, 15,
+                    g.getBlitOffset());
         } else {
-            yOffset = getHandleYOffset();
-            sourceRect = ENABLED;
+            final int offset = (this.currentScroll - this.minScroll) * (this.height - 15) / this.getRange();
+            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) {
-        this.dragging = false;
-
-        // 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()) {
+    public void click(final double x, final double y) {
+        if (this.getRange() == 0) {
             return;
         }
 
-        // Compute the position of the mouse (adjusted for where it grabbed the handle,
-        // so as if it grabbed
-        // the upper edge of it) within the scrollable area of the track (minus the
-        // handle height).
-        double handleUpperEdgeY = y - this.displayY - this.dragYOffset;
-        double availableHeight = this.height - HANDLE_HEIGHT;
-        double position = MathHelper.clamp(handleUpperEdgeY / availableHeight, 0.0, 1.0);
-
-        this.currentScroll = this.minScroll + (int) Math.round(position * this.getRange());
-        this.applyRange();
+        if (x > this.displayX && x <= this.displayX + this.width) {
+            if (y > this.displayY && y <= this.displayY + this.height) {
+                this.currentScroll = (int) (y - this.displayY);
+                this.currentScroll = this.minScroll + ((this.currentScroll * 2 * this.getRange() / this.height));
+                this.currentScroll = (this.currentScroll + 1) >> 1;
+                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.MatterBalls.text(CondenserOutput.MATTER_BALLS.requiredPower));
+                    ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls);
             registerApp(16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY,
-                    ButtonToolTips.CondenserOutput,
-                    ButtonToolTips.Singularity.text(CondenserOutput.SINGULARITY.requiredPower));
+                    ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity);
 
             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;
-        // 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();
-        }
+        boolean backwards = Minecraft.getInstance().mouseHelper.isRightDown();
         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
-            // 2x2 slot
-            int uv_x = 8 + (this.hideEdge ? 0 : 2);
-            int uv_y = 12 + (this.isFocused() ? 2 : 0);
+            int uv_x = (this.hideEdge > 0 ? 11 : 13);
 
-            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.renderToolTip(matrices, this.tooltip, x, y, client.fontRenderer);
-    }
-}

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

@@ -41,6 +41,11 @@ import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
 import appeng.util.prioritylist.IPartitionList;
 
+/**
+ * @author BrockWS
+ * @version rv6 - 22/05/2018
+ * @since rv6 22/05/2018
+ */
 public class FluidRepo {
     private final IItemList<IAEFluidStack> list = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)
             .createList();

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

@@ -21,22 +21,23 @@ package appeng.client.me;
 import javax.annotation.Nonnull;
 
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.SlotItemHandler;
 
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.fluids.container.slots.IMEFluidSlot;
 
-public class SlotFluidME extends Slot implements IMEFluidSlot {
+/**
+ * @author BrockWS
+ * @version rv6 - 22/05/2018
+ * @since rv6 22/05/2018
+ */
+public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot {
 
-    private static final IInventory EMPTY_INVENTORY = new Inventory(0);
-
-    private final InternalFluidSlotME slot;
+    private InternalFluidSlotME slot;
 
     public SlotFluidME(InternalFluidSlotME slot) {
-        super(EMPTY_INVENTORY, 0, slot.getxPosition(), slot.getyPosition());
+        super(null, 0, slot.getxPosition(), slot.getyPosition());
         this.slot = slot;
     }
 
@@ -49,7 +50,7 @@ public class SlotFluidME extends Slot implements IMEFluidSlot {
     }
 
     @Override
-    public boolean isItemValid(final ItemStack stack) {
+    public boolean isItemValid(final ItemStack par1ItemStack) {
         return false;
     }
 
@@ -68,7 +69,7 @@ public class SlotFluidME extends Slot implements IMEFluidSlot {
     }
 
     @Override
-    public void putStack(final ItemStack stack) {
+    public void putStack(final ItemStack par1ItemStack) {
 
     }
 
@@ -84,7 +85,7 @@ public class SlotFluidME extends Slot implements IMEFluidSlot {
     }
 
     @Override
-    public boolean canTakeStack(final PlayerEntity player) {
+    public boolean canTakeStack(final PlayerEntity par1PlayerEntity) {
         return false;
     }
 }

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

@@ -19,27 +19,23 @@
 package appeng.client.me;
 
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.SlotItemHandler;
 
 import appeng.api.storage.data.IAEItemStack;
 
-public class SlotME extends Slot {
+public class SlotME extends SlotItemHandler {
 
-    private static final IInventory EMPTY_INVENTORY = new Inventory(0);
+    private final InternalSlotME mySlot;
 
-    private final InternalSlotME slot;
-
-    public SlotME(final InternalSlotME slot) {
-        super(EMPTY_INVENTORY, 0, slot.getxPosition(), slot.getyPosition());
-        this.slot = slot;
+    public SlotME(final InternalSlotME me) {
+        super(null, 0, me.getxPosition(), me.getyPosition());
+        this.mySlot = me;
     }
 
     public IAEItemStack getAEStack() {
-        if (this.slot.hasPower()) {
-            return this.slot.getAEStack();
+        if (this.mySlot.hasPower()) {
+            return this.mySlot.getAEStack();
         }
         return null;
     }
@@ -51,15 +47,15 @@ public class SlotME extends Slot {
 
     @Override
     public ItemStack getStack() {
-        if (this.slot.hasPower()) {
-            return this.slot.getStack();
+        if (this.mySlot.hasPower()) {
+            return this.mySlot.getStack();
         }
         return ItemStack.EMPTY;
     }
 
     @Override
     public boolean getHasStack() {
-        if (this.slot.hasPower()) {
+        if (this.mySlot.hasPower()) {
             return !this.getStack().isEmpty();
         }
         return false;

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

@@ -21,6 +21,7 @@ package appeng.client.render.cablebus;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -29,11 +30,6 @@ import java.util.Random;
 
 import javax.annotation.Nullable;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.Weigher;
-
 import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.model.BakedQuad;
@@ -54,10 +50,7 @@ import appeng.api.util.AEColor;
 
 public class CableBusBakedModel implements IBakedModel {
 
-    // The number of quads overall that will be cached
-    private static final int CACHE_QUAD_COUNT = 5000;
-
-    private final LoadingCache<CableBusRenderState, List<BakedQuad>> cableModelCache;
+    private static final Map<CableBusRenderState, List<BakedQuad>> CABLE_MODEL_CACHE = new HashMap<>();
 
     private final CableBuilder cableBuilder;
 
@@ -73,17 +66,6 @@ public class CableBusBakedModel implements IBakedModel {
         this.facadeBuilder = facadeBuilder;
         this.partModels = partModels;
         this.particleTexture = particleTexture;
-        this.cableModelCache = CacheBuilder.newBuilder()//
-                .maximumWeight(CACHE_QUAD_COUNT)//
-                .weigher((Weigher<CableBusRenderState, List<BakedQuad>>) (key, value) -> value.size())//
-                .build(new CacheLoader<CableBusRenderState, List<BakedQuad>>() {
-                    @Override
-                    public List<BakedQuad> load(CableBusRenderState renderState) {
-                        final List<BakedQuad> model = new ArrayList<>();
-                        addCableQuads(renderState, model);
-                        return model;
-                    }
-                });
     }
 
     @Override
@@ -110,7 +92,11 @@ public class CableBusBakedModel implements IBakedModel {
         if (layer == RenderType.getCutout()) {
 
             // First, handle the cable at the center of the cable bus
-            final List<BakedQuad> cableModel = cableModelCache.getUnchecked(renderState);
+            final List<BakedQuad> cableModel = CABLE_MODEL_CACHE.computeIfAbsent(renderState, k -> {
+                final List<BakedQuad> model = new ArrayList<>();
+                this.addCableQuads(renderState, model);
+                return model;
+            });
             quads.addAll(cableModel);
 
             // Then handle attachments
@@ -355,4 +341,8 @@ public class CableBusBakedModel implements IBakedModel {
         return ItemOverrideList.EMPTY;
     }
 
+    public static void clearCache() {
+        CABLE_MODEL_CACHE.clear();
+    }
+
 }

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

@@ -18,6 +18,7 @@ public class CableBusModelLoader implements IModelLoader<CableBusModel> {
 
     @Override
     public void onResourceManagerReload(IResourceManager resourceManager) {
+        CableBusBakedModel.clearCache();
     }
 
     @Override

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);

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

@@ -142,7 +142,7 @@ public class ChestTileEntityRenderer extends TileEntityRenderer<ChestTileEntity>
         public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand,
                 @Nonnull IModelData extraData) {
             if (side != null) {
-                side = r.resultingRotate(side); // This fixes the incorrect lightmap position
+                side = r.rotate(side); // This fixes the incorrect lightmap position
             }
             List<BakedQuad> quads = new ArrayList<>(super.getQuads(state, side, rand, extraData));
 

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

@@ -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().getWorld(), pos.getBlockPos(), part.getSide());
+        return new ContainerLocator(Type.PART, -1, pos.getWorld(), pos.getBlockPos(), part.getSide());
     }
 
     public boolean hasItemIndex() {

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

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);
-            initialDataDeserializer.deserializeInitialData(host, container, packetBuf);
-            return container;
+            return factory.create(windowId, inv, host);
         }
         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 -> {
-            locator.write(buffer);
-            initialDataSerializer.serializeInitialData(accessInterface, buffer);
-        });
+        NetworkHooks.openGui((ServerPlayerEntity) player, container, locator::write);
 
         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 ICraftingCPU selectedCpu;
-
+    private final ArrayList<CraftingCPURecord> cpus = new ArrayList<>();
     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 cycleSelectedCPU(final boolean next) {
-        this.cpuCycler.cycleCpu(next);
+    public void cycleCpu(final boolean next) {
+        if (next) {
+            this.setSelectedCpu(this.getSelectedCpu() + 1);
+        } else {
+            this.setSelectedCpu(this.getSelectedCpu() - 1);
+        }
+
+        if (this.getSelectedCpu() < -1) {
+            this.setSelectedCpu(this.cpus.size() - 1);
+        } else if (this.getSelectedCpu() >= this.cpus.size()) {
+            this.setSelectedCpu(-1);
+        }
+
+        if (this.getSelectedCpu() == -1) {
+            this.setCpuAvailableBytes(0);
+            this.setCpuCoProcessors(0);
+            this.setName(null);
+        } else {
+            CraftingCPURecord cpu = this.cpus.get(this.getSelectedCpu());
+            this.setName(cpu.getName());
+            this.setCpuAvailableBytes(cpu.getSize());
+            this.setCpuCoProcessors(cpu.getProcessors());
+        }
     }
 
     @Override
     public void 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)
-                    .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;
-                    });
+            CraftingCPUContainer::new, CraftingTileEntity.class, SecurityPermissions.CRAFT);
 
     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();
-        } else {
-            this.network = null;
+            this.setNetwork(host.getActionableNode().getGrid());
         }
 
         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 (isServer() && network != null) {
-            cpuCycler.detectAndSendChanges(network);
+        if (Platform.isServer() && this.getNetwork() != null) {
+            final ICraftingGrid cc = this.getNetwork().getCache(ICraftingGrid.class);
+            final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
+
+            int matches = 0;
+            boolean changed = false;
+            for (final ICraftingCPU c : cpuSet) {
+                boolean found = false;
+                for (final CraftingCPURecord ccr : this.cpus) {
+                    if (ccr.getCpu() == c) {
+                        found = true;
+                    }
+                }
+
+                final boolean matched = this.cpuMatches(c);
+
+                if (matched) {
+                    matches++;
+                }
+
+                if (found == !matched) {
+                    changed = true;
+                }
+            }
+
+            if (changed || this.cpus.size() != matches) {
+                this.cpus.clear();
+                for (final ICraftingCPU c : cpuSet) {
+                    if (this.cpuMatches(c)) {
+                        this.cpus.add(new CraftingCPURecord(c.getAvailableStorage(), c.getCoProcessors(), c));
+                    }
+                }
+
+                this.sendCPUs();
+            }
+
+            this.noCPU = this.cpus.isEmpty();
         }
 
         super.detectAndSendChanges();
@@ -72,20 +113,52 @@ public class CraftingStatusContainer extends CraftingCPUContainer implements Cra
         return c.isBusy();
     }
 
-    private void onCPUSelectionChanged(CraftingCPURecord cpuRecord, boolean cpusAvailable) {
-        noCPU = !cpusAvailable;
-        if (cpuRecord == null) {
-            cpuName = null;
-            setCPU(null);
+    private void sendCPUs() {
+        Collections.sort(this.cpus);
+
+        if (this.selectedCpu >= this.cpus.size()) {
+            this.selectedCpu = -1;
+            this.myName = null;
+        } else if (this.selectedCpu != -1) {
+            this.myName = this.cpus.get(this.selectedCpu).getName();
+        }
+
+        if (this.selectedCpu == -1 && this.cpus.size() > 0) {
+            this.selectedCpu = 0;
+        }
+
+        if (this.selectedCpu != -1) {
+            if (this.cpus.get(this.selectedCpu).getCpu() != this.getMonitor()) {
+                this.setCPU(this.cpus.get(this.selectedCpu).getCpu());
+            }
         } else {
-            cpuName = cpuRecord.getName();
-            setCPU(cpuRecord.getCpu());
+            this.setCPU(null);
         }
     }
 
-    @Override
-    public void cycleSelectedCPU(boolean forward) {
-        this.cpuCycler.cycleCpu(forward);
-    }
+    public void cycleCpu(final boolean next) {
+        if (next) {
+            this.selectedCpu++;
+        } else {
+            this.selectedCpu--;
+        }
 
+        if (this.selectedCpu < -1) {
+            this.selectedCpu = this.cpus.size() - 1;
+        } else if (this.selectedCpu >= this.cpus.size()) {
+            this.selectedCpu = -1;
+        }
+
+        if (this.selectedCpu == -1 && this.cpus.size() > 0) {
+            this.selectedCpu = 0;
+        }
+
+        if (this.selectedCpu == -1) {
+            this.myName = null;
+            this.setCPU(null);
+        } else {
+            this.myName = this.cpus.get(this.selectedCpu).getName();
+            this.setCPU(this.cpus.get(this.selectedCpu).getCpu());
+        }
+    }
 }

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

@@ -42,7 +42,7 @@ import appeng.api.networking.security.IActionHost;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.MEInterfaceUpdatePacket;
+import appeng.core.sync.packets.CompressedNBTPacket;
 import appeng.helpers.DualityInterface;
 import appeng.helpers.IInterfaceHost;
 import appeng.helpers.InventoryAction;
@@ -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;
         }
 
@@ -176,7 +177,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {
 
         if (!this.data.isEmpty()) {
             try {
-                NetworkHandler.instance().sendTo(new MEInterfaceUpdatePacket(this.data),
+                NetworkHandler.instance().sendTo(new CompressedNBTPacket(this.data),
                         (ServerPlayerEntity) this.getPlayerInv().player);
             } catch (final IOException e) {
                 // :P

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) -> {
-            container.reportingValue = buffer.readVarLong();
-        });
+        return helper.fromNetwork(windowId, inv, buf);
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator, (host, buffer) -> {
-            buffer.writeVarLong(host.getReportingValue());
-        });
+        return helper.open(player, locator);
     }
 
     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() {
-        return reportingValue;
+    @OnlyIn(Dist.CLIENT)
+    public void setTextField(final NumberEntryWidget level) {
+        this.textField = level;
+        this.textField.setValue(this.EmitterValue);
     }
 
-    public void setReportingValue(long reportingValue) {
-        if (isClient()) {
-            if (reportingValue != this.reportingValue) {
-                this.reportingValue = reportingValue;
-                NetworkHandler.instance()
-                        .sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(reportingValue)));
-            }
-        } else {
-            this.lvlEmitter.setReportingValue(reportingValue);
-        }
+    public void setLevel(final long l, final PlayerEntity player) {
+        this.lvlEmitter.setReportingValue(l);
+        this.EmitterValue = l;
     }
 
     @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

@@ -73,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> {
@@ -121,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
@@ -182,7 +183,7 @@ 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);
@@ -286,7 +287,7 @@ public class MEMonitorableContainer 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 {
                 MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket();
                 final IItemList<IAEItemStack> monitorCache = this.monitor.getStorageList();
@@ -355,7 +356,7 @@ public class MEMonitorableContainer extends AEBaseContainer
 
     @Override
     public IConfigManager getConfigManager() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             return this.serverCM;
         }
         return this.clientCM;

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

@@ -41,6 +41,7 @@ import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
 import appeng.items.misc.EncodedPatternItem;
 import appeng.tile.crafting.MolecularAssemblerTileEntity;
+import appeng.util.Platform;
 
 public class MolecularAssemblerContainer extends UpgradeableContainer implements IProgressProvider {
 
@@ -146,7 +147,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.setRedStoneMode(
                     (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting(Settings.REDSTONE_CONTROLLED));
         }

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

@@ -43,6 +43,7 @@ import appeng.container.guisync.GuiSync;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
+import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 
 public class NetworkStatusContainer extends AEBaseContainer {
@@ -82,7 +83,7 @@ public class NetworkStatusContainer extends AEBaseContainer {
             }
         }
 
-        if (this.network == null && isServer()) {
+        if (this.network == null && Platform.isServer()) {
             this.setValidContainer(false);
         }
     }
@@ -99,7 +100,7 @@ public class NetworkStatusContainer extends AEBaseContainer {
     @Override
     public void detectAndSendChanges() {
         this.delay++;
-        if (isServer() && this.delay > 15 && this.network != null) {
+        if (Platform.isServer() && this.delay > 15 && this.network != null) {
             this.delay = 0;
 
             final IEnergyGrid eg = this.network.getCache(IEnergyGrid.class);

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

@@ -261,19 +261,13 @@ public class PatternTermContainer extends MEMonitorableContainer
                 return new ItemStack[] { out };
             }
         } else {
-            boolean hasValue = false;
             final ItemStack[] list = new ItemStack[3];
 
             for (int i = 0; i < this.outputSlots.length; i++) {
                 final ItemStack out = this.outputSlots[i].getStack();
                 list[i] = out;
-                if (!out.isEmpty()) {
-                    hasValue = true;
-                }
-            }
-            if (hasValue) {
-                return list;
             }
+            return list;
         }
 
         return null;
@@ -291,9 +285,9 @@ public class PatternTermContainer extends MEMonitorableContainer
     @Override
     public boolean isSlotEnabled(final int idx) {
         if (idx == 1) {
-            return isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode();
+            return Platform.isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode();
         } else if (idx == 2) {
-            return isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode();
+            return Platform.isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode();
         } else {
             return false;
         }
@@ -395,7 +389,7 @@ public class PatternTermContainer extends MEMonitorableContainer
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
-        if (isServer()) {
+        if (Platform.isServer()) {
             if (this.isCraftingMode() != this.getPatternTerminal().isCraftingRecipe()) {
                 this.setCraftingMode(this.getPatternTerminal().isCraftingRecipe());
                 this.updateOrderOfOutputSlots();
@@ -417,7 +411,7 @@ public class PatternTermContainer extends MEMonitorableContainer
 
     @Override
     public void onSlotChange(final Slot s) {
-        if (s == this.patternSlotOUT && isServer()) {
+        if (s == this.patternSlotOUT && Platform.isServer()) {
             for (final IContainerListener listener : this.listeners) {
                 for (final Slot slot : this.inventorySlots) {
                     if (slot instanceof OptionalFakeSlot || slot instanceof FakeCraftingMatrixSlot) {
@@ -431,7 +425,7 @@ public class PatternTermContainer extends MEMonitorableContainer
             this.detectAndSendChanges();
         }
 
-        if (s == this.craftSlot && isClient()) {
+        if (s == this.craftSlot && Platform.isClient()) {
             this.getAndUpdateOutput();
         }
     }

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

@@ -23,14 +23,17 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.parts.IPart;
+import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.ConfigValuePacket;
+import appeng.container.guisync.GuiSync;
 import appeng.helpers.IPriorityHost;
+import appeng.util.Platform;
 
 public class PriorityContainer extends AEBaseContainer {
 
@@ -40,53 +43,60 @@ public class PriorityContainer extends AEBaseContainer {
             PriorityContainer::new, IPriorityHost.class, SecurityPermissions.BUILD);
 
     public static PriorityContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) {
-        return helper.fromNetwork(windowId, inv, buf, (host, container, buffer) -> {
-            container.priorityValue = buffer.readVarInt();
-        });
+        return helper.fromNetwork(windowId, inv, buf);
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator, (host, buffer) -> buffer.writeVarInt(host.getPriority()));
+        return helper.open(player, locator);
     }
 
     private final IPriorityHost priHost;
 
-    private int priorityValue;
+    @OnlyIn(Dist.CLIENT)
+    private NumberEntryWidget textField;
+
+    @GuiSync(2)
+    public long PriorityValue = -1;
 
     public PriorityContainer(int id, final PlayerInventory ip, final IPriorityHost te) {
         super(TYPE, id, ip, (TileEntity) (te instanceof TileEntity ? te : null),
                 (IPart) (te instanceof IPart ? te : null));
         this.priHost = te;
-        this.priorityValue = te.getPriority();
     }
 
-    public void setPriority(final int newValue) {
-        if (newValue != priorityValue) {
-            if (isClient()) {
-                // If for whatever reason the client enters the value first, do not update based
-                // on incoming server data
-                this.priorityValue = newValue;
-                NetworkHandler.instance()
-                        .sendToServer(new ConfigValuePacket("PriorityHost.Priority", String.valueOf(newValue)));
-            } else {
-                this.priHost.setPriority(newValue);
-                this.priorityValue = newValue;
-            }
-        }
+    @OnlyIn(Dist.CLIENT)
+    public void setTextField(final NumberEntryWidget level) {
+        this.textField = level;
+        this.textField.setValue(this.PriorityValue, true);
+    }
+
+    public void setPriority(final int newValue, final PlayerEntity player) {
+        this.priHost.setPriority(newValue);
+        this.PriorityValue = newValue;
     }
 
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
         this.verifyPermissions(SecurityPermissions.BUILD, false);
+
+        if (Platform.isServer()) {
+            this.PriorityValue = this.priHost.getPriority();
+        }
     }
 
-    public int getPriorityValue() {
-        return priorityValue;
+    @Override
+    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
+        if (field.equals("PriorityValue")) {
+            if (this.textField != null) {
+                this.textField.setValue(this.PriorityValue, true);
+            }
+        }
+
+        super.onUpdate(field, oldValue, newValue);
     }
 
     public IPriorityHost getPriorityHost() {
         return this.priHost;
     }
-
 }

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

@@ -38,6 +38,7 @@ import appeng.core.Api;
 import appeng.items.contents.QuartzKnifeObj;
 import appeng.items.materials.MaterialItem;
 import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.util.Platform;
 
 public class QuartzKnifeContainer extends AEBaseContainer {
 
@@ -147,7 +148,7 @@ public class QuartzKnifeContainer extends AEBaseContainer {
         }
 
         private void makePlate() {
-            if (isServer()) {
+            if (Platform.isServer()) {
                 if (!this.getItemHandler().extractItem(0, 1, false).isEmpty()) {
                     final ItemStack item = QuartzKnifeContainer.this.toolInv.getItemStack();
                     final ItemStack before = item.copy();

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

@@ -35,6 +35,7 @@ import appeng.container.guisync.GuiSync;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.tile.spatial.SpatialIOPortTileEntity;
+import appeng.util.Platform;
 
 public class SpatialIOPortContainer extends AEBaseContainer {
 
@@ -64,7 +65,7 @@ public class SpatialIOPortContainer extends AEBaseContainer {
     public SpatialIOPortContainer(int id, final PlayerInventory ip, final SpatialIOPortTileEntity spatialIOPort) {
         super(TYPE, id, ip, spatialIOPort, null);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.network = spatialIOPort.getGridNode(AEPartLocation.INTERNAL).getGrid();
         }
 
@@ -88,7 +89,7 @@ public class SpatialIOPortContainer extends AEBaseContainer {
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.delay++;
             if (this.delay > 15 && this.network != null) {
                 this.delay = 0;

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

@@ -44,6 +44,7 @@ import appeng.container.slot.OptionalTypeOnlyFakeSlot;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
 import appeng.parts.misc.StorageBusPart;
+import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.iterators.NullIterator;
 
@@ -123,7 +124,7 @@ public class StorageBusContainer 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.setReadWriteMode(
                     (AccessRestriction) this.getUpgradeable().getConfigManager().getSetting(Settings.ACCESS));

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

@@ -51,6 +51,7 @@ import appeng.container.slot.RestrictedInputSlot;
 import appeng.items.contents.NetworkToolViewer;
 import appeng.items.tools.NetworkToolItem;
 import appeng.parts.automation.ExportBusPart;
+import appeng.util.Platform;
 
 public class UpgradeableContainer extends AEBaseContainer implements IOptionalSlotHost {
 
@@ -198,7 +199,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl
     public void detectAndSendChanges() {
         this.verifyPermissions(SecurityPermissions.BUILD, false);
 
-        if (isServer()) {
+        if (Platform.isServer()) {
             final IConfigManager cm = this.getUpgradeable().getConfigManager();
             this.loadSettingsFromHost(cm);
         }

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

@@ -29,6 +29,7 @@ import appeng.container.guisync.GuiSync;
 import appeng.container.interfaces.IProgressProvider;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.tile.misc.VibrationChamberTileEntity;
+import appeng.util.Platform;
 
 public class VibrationChamberContainer extends AEBaseContainer implements IProgressProvider {
 
@@ -64,7 +65,7 @@ public class VibrationChamberContainer extends AEBaseContainer implements IProgr
 
     @Override
     public void detectAndSendChanges() {
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.remainingBurnTime = this.vibrationChamber.getMaxBurnTime() <= 0 ? 0
                     : (int) (100.0 * this.vibrationChamber.getBurnTime() / this.vibrationChamber.getMaxBurnTime());
             this.burnSpeed = this.remainingBurnTime <= 0 ? 0 : this.vibrationChamber.getBurnSpeed();

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

@@ -28,6 +28,7 @@ import appeng.container.ContainerLocator;
 import appeng.core.AEConfig;
 import appeng.core.localization.PlayerMessages;
 import appeng.helpers.WirelessTerminalGuiObject;
+import appeng.util.Platform;
 
 public class WirelessTermContainer extends MEPortableCellContainer {
 
@@ -56,7 +57,7 @@ public class WirelessTermContainer extends MEPortableCellContainer {
         super.detectAndSendChanges();
 
         if (!this.wirelessTerminalGUIObject.rangeCheck()) {
-            if (isServer() && this.isValidContainer()) {
+            if (Platform.isServer() && this.isValidContainer()) {
                 this.getPlayerInv().player.sendMessage(PlayerMessages.OutOfRange.get(), Util.DUMMY_UUID);
             }
 

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

@@ -31,8 +31,6 @@ import java.util.Set;
 import java.util.function.DoubleSupplier;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Strings;
 
 import org.apache.commons.lang3.tuple.Pair;
@@ -395,15 +393,6 @@ public final class AEConfig {
         return this.meteoriteDimensionWhitelist;
     }
 
-    @Nullable
-    public String getImprovedFluidTag() {
-        return Strings.emptyToNull(COMMON.improvedFluidTag.get());
-    }
-
-    public float getImprovedFluidMultiplier() {
-        return COMMON.improvedFluidMultiplier.get().floatValue();
-    }
-
     // Setters keep visibility as low as possible.
 
     private static class ClientConfig {
@@ -518,11 +507,6 @@ public final class AEConfig {
         public final ConfigValue<Integer> condenserMatterBallsPower;
         public final ConfigValue<Integer> condenserSingularityPower;
 
-        // In-World Purification
-        // Settings for improved speed depending on fluid the crystal is in
-        public final ConfigValue<String> improvedFluidTag;
-        public final ConfigValue<Double> improvedFluidMultiplier;
-
         public final Map<TickRates, ConfigValue<Integer>> tickRateMin = new HashMap<>();
         public final Map<TickRates, ConfigValue<Integer>> tickRateMax = new HashMap<>();
 
@@ -633,17 +617,6 @@ public final class AEConfig {
                 tickRateMax.put(tickRate, builder.define(tickRate.name() + "Max", tickRate.getDefaultMax()));
             }
             builder.pop();
-
-            builder.comment("Settings for in-world purification of crystals.").push("inWorldPurification");
-
-            improvedFluidTag = builder.comment(
-                    "A fluid tag that identifies fluids that improve crystal purification speed. Does not affect purification with water/lava.")
-                    .define("improvedFluidTag", "");
-            improvedFluidMultiplier = builder
-                    .comment("The speed multiplier to use when the crystals are submerged in the improved fluid.")
-                    .defineInRange("improvedFluidMultiplier", 2.0, 1.0, 10.0);
-
-            builder.pop();
         }
 
     }

src/main/java/appeng/core/AppEng.java

@@ -34,13 +34,12 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.particles.ParticleType;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.structure.Structure;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.DeferredWorkQueue;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
@@ -101,6 +100,7 @@ public final class AppEng {
 
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
         registration = new Registration();
+        modEventBus.addListener(this::bootstrap);
         modEventBus.addGenericListener(Block.class, registration::registerBlocks);
         modEventBus.addGenericListener(Item.class, registration::registerItems);
         modEventBus.addGenericListener(EntityType.class, registration::registerEntities);
@@ -108,9 +108,6 @@ public final class AppEng {
         modEventBus.addGenericListener(TileEntityType.class, registration::registerTileEntities);
         modEventBus.addGenericListener(ContainerType.class, registration::registerContainerTypes);
         modEventBus.addGenericListener(IRecipeSerializer.class, registration::registerRecipeSerializers);
-        modEventBus.addGenericListener(Feature.class, registration::registerFeatures);
-        modEventBus.addGenericListener(Structure.class, registration::registerStructures);
-        modEventBus.addGenericListener(Biome.class, registration::registerBiomes);
 
         modEventBus.addListener(Integrations::enqueueIMC);
         modEventBus.addListener(this::commonSetup);
@@ -129,7 +126,15 @@ public final class AppEng {
         MinecraftForge.EVENT_BUS.register(new PartPlacement());
     }
 
+    private void bootstrap(RegistryEvent.NewRegistry e) {
+        // This has to be here so it's not run in parallel with other registrations
+        AppEngBootstrap.initialize();
+    }
+
     private void commonSetup(FMLCommonSetupEvent event) {
+        // This must run here because the config is not available earlier
+        DeferredWorkQueue.runLater(AppEngBootstrap::enhanceBiomes);
+
         ApiDefinitions definitions = Api.INSTANCE.definitions();
         definitions.getRegistry().getBootstrapComponents(IInitComponent.class)
                 .forEachRemaining(IInitComponent::initialize);

src/main/java/appeng/core/AppEngBootstrap.java

@@ -0,0 +1,135 @@
+package appeng.core;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.WorldGenRegistries;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.gen.GenerationStage;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.OreFeatureConfig;
+import net.minecraft.world.gen.placement.NoPlacementConfig;
+import net.minecraft.world.gen.placement.Placement;
+import net.minecraft.world.gen.placement.TopSolidRangeConfig;
+
+import appeng.api.features.AEFeature;
+import appeng.mixins.feature.ConfiguredFeaturesAccessor;
+import appeng.mixins.structure.ConfiguredStructureFeaturesAccessor;
+import appeng.mixins.structure.StructureFeatureAccessor;
+import appeng.spatial.SpatialStorageChunkGenerator;
+import appeng.spatial.SpatialStorageDimensionIds;
+import appeng.worldgen.BiomeModifier;
+import appeng.worldgen.ChargedQuartzOreConfig;
+import appeng.worldgen.ChargedQuartzOreFeature;
+import appeng.worldgen.meteorite.MeteoriteStructure;
+import appeng.worldgen.meteorite.MeteoriteStructurePiece;
+
+/**
+ * Hooks into the very early bootstrapping phase to register things before the
+ * first dynamic registry manager is created.
+ */
+public final class AppEngBootstrap {
+
+    private static boolean initialized;
+    private static ConfiguredFeature<?, ?> quartzOreFeature;
+    private static ConfiguredFeature<?, ?> chargedQuartzOreFeature;
+
+    private AppEngBootstrap() {
+    }
+
+    public synchronized static void initialize() {
+        if (initialized) {
+            return;
+        }
+        initialized = true;
+
+        registerStructures();
+
+        quartzOreFeature = registerQuartzOreFeature();
+        chargedQuartzOreFeature = registerChargedQuartzOreFeature();
+
+        registerDimension();
+    }
+
+    public synchronized static void enhanceBiomes() {
+        // add to all standard biomes
+        // TODO: This means we'll not add these things to newly created biomes
+        WorldGenRegistries.field_243657_i.forEach(b -> {
+            addMeteoriteWorldGen(b);
+            addQuartzWorldGen(b, quartzOreFeature, chargedQuartzOreFeature);
+        });
+    }
+
+    private static void registerStructures() {
+
+        MeteoriteStructurePiece.register();
+
+        // Registering into the registry alone is INSUFFICIENT!
+        // There's a bidirectional map in the Structure class itself primarily for the
+        // purposes of NBT serialization
+        StructureFeatureAccessor.register(MeteoriteStructure.ID.toString(), MeteoriteStructure.INSTANCE,
+                GenerationStage.Decoration.TOP_LAYER_MODIFICATION);
+
+        ConfiguredStructureFeaturesAccessor.register(MeteoriteStructure.ID.toString(),
+                MeteoriteStructure.CONFIGURED_INSTANCE);
+    }
+
+    private static void addMeteoriteWorldGen(Biome b) {
+        if (!AEConfig.instance().isFeatureEnabled(AEFeature.METEORITE_WORLD_GEN)) {
+            return;
+        }
+
+        if (b.getCategory() == Biome.Category.THEEND || b.getCategory() == Biome.Category.NETHER) {
+            return;
+        }
+
+        BiomeModifier modifier = new BiomeModifier(b);
+        modifier.addStructureFeature(MeteoriteStructure.CONFIGURED_INSTANCE);
+    }
+
+    private static void addQuartzWorldGen(Biome b, ConfiguredFeature<?, ?> quartzOre,
+            ConfiguredFeature<?, ?> chargedQuartz) {
+        if (!AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) {
+            return;
+        }
+
+        BiomeModifier modifier = new BiomeModifier(b);
+
+        modifier.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, quartzOre);
+
+        if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {
+            modifier.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, chargedQuartz);
+        }
+    }
+
+    private static ConfiguredFeature<?, ?> registerQuartzOreFeature() {
+        // Tell Minecraft about our configured quartz ore feature
+        BlockState quartzOreState = Api.instance().definitions().blocks().quartzOre().block().getDefaultState();
+        return ConfiguredFeaturesAccessor.register(AppEng.makeId("quartz_ore").toString(), Feature.ORE
+                .withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.field_241882_a, quartzOreState,
+                        AEConfig.instance().getQuartzOresPerCluster()))
+                .withPlacement(Placement.field_242907_l/* RANGE */.configure(new TopSolidRangeConfig(12, 12, 72)))
+                .func_242728_a/* spreadHorizontally */()
+                .func_242731_b/* repeat */(AEConfig.instance().getQuartzOresClusterAmount()));
+    }
+
+    private static ConfiguredFeature<?, ?> registerChargedQuartzOreFeature() {
+        // Tell Minecraft about our configured charged quartz ore feature
+        Registry.register(Registry.FEATURE, AppEng.makeId("charged_quartz_ore"), ChargedQuartzOreFeature.INSTANCE);
+
+        BlockState quartzOreState = Api.instance().definitions().blocks().quartzOre().block().getDefaultState();
+        BlockState chargedQuartzOreState = Api.instance().definitions().blocks().quartzOreCharged().block()
+                .getDefaultState();
+        return ConfiguredFeaturesAccessor.register(AppEng.makeId("charged_quartz_ore").toString(),
+                ChargedQuartzOreFeature.INSTANCE
+                        .withConfiguration(new ChargedQuartzOreConfig(quartzOreState, chargedQuartzOreState,
+                                AEConfig.instance().getSpawnChargedChance()))
+                        .withPlacement(Placement.NOPE.configure(NoPlacementConfig.field_236556_b_)));
+    }
+
+    private static void registerDimension() {
+        Registry.register(Registry.CHUNK_GENERATOR_CODEC, SpatialStorageDimensionIds.CHUNK_GENERATOR_ID,
+                SpatialStorageChunkGenerator.CODEC);
+    }
+
+}

src/main/java/appeng/core/Registration.java

@@ -34,6 +34,7 @@ import net.minecraft.particles.ParticleType;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.WorldGenRegistries;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.GenerationStage;
@@ -41,7 +42,6 @@ import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.IFeatureConfig;
 import net.minecraft.world.gen.feature.OreFeatureConfig;
 import net.minecraft.world.gen.feature.structure.Structure;
-import net.minecraft.world.gen.placement.CountRangeConfig;
 import net.minecraft.world.gen.placement.IPlacementConfig;
 import net.minecraft.world.gen.placement.Placement;
 import net.minecraftforge.api.distmarker.Dist;
@@ -213,7 +213,6 @@ import appeng.me.cache.PathGridCache;
 import appeng.me.cache.SecurityCache;
 import appeng.me.cache.SpatialPylonCache;
 import appeng.me.cache.TickManagerCache;
-import appeng.mixins.StructureAccessor;
 import appeng.parts.automation.PlaneModelLoader;
 import appeng.recipes.game.DisassembleRecipe;
 import appeng.recipes.game.FacadeRecipe;
@@ -682,73 +681,6 @@ final class Registration {
                     new ResourceLocation(dimension));
         }
 
-        MeteoriteStructurePiece.register();
-
-        ForgeRegistries.BIOMES.forEach(b -> {
-            addMeteoriteWorldGen(b);
-            addQuartzWorldGen(b);
-        });
-
-    }
-
-    private static void addMeteoriteWorldGen(Biome b) {
-        if (!AEConfig.instance().isFeatureEnabled(AEFeature.METEORITE_WORLD_GEN)) {
-            return;
-        }
-
-        if (b.getCategory() == Biome.Category.THEEND || b.getCategory() == Biome.Category.NETHER) {
-            return;
-        }
-
-        b.func_235063_a_(MeteoriteStructure.INSTANCE.func_236391_a_(IFeatureConfig.NO_FEATURE_CONFIG));
-    }
-
-    private static void addQuartzWorldGen(Biome b) {
-        if (!AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) {
-            return;
-        }
-
-        BlockState quartzOre = Api.instance().definitions().blocks().quartzOre().block().getDefaultState();
-        b.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES,
-                Feature.ORE
-                        .withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE,
-                                quartzOre, AEConfig.instance().getQuartzOresPerCluster()))
-                        .withPlacement(Placement.COUNT_RANGE.configure(
-                                new CountRangeConfig(AEConfig.instance().getQuartzOresClusterAmount(), 12, 12, 72))));
-
-        if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {
-
-            BlockState chargedQuartzOre = Api.instance().definitions().blocks().quartzOreCharged().block()
-                    .getDefaultState();
-            b.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION,
-                    ChargedQuartzOreFeature.INSTANCE
-                            .withConfiguration(new ChargedQuartzOreConfig(quartzOre, chargedQuartzOre,
-                                    AEConfig.instance().getSpawnChargedChance()))
-                            .withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG)));
-
-        }
-    }
-
-    public void registerFeatures(RegistryEvent.Register<Feature<?>> evt) {
-        IForgeRegistry<Feature<?>> r = evt.getRegistry();
-
-        r.register(ChargedQuartzOreFeature.INSTANCE.setRegistryName(AppEng.makeId("charged_quartz_ore")));
-    }
-
-    public void registerStructures(RegistryEvent.Register<Structure<?>> evt) {
-        // Registering into the Forge registry is INSUFFICIENT!
-        // There's a bidirectional map in the Structure class itself primarily for the
-        // purposes of NBT serialization
-        StructureAccessor.register(MeteoriteStructure.ID.toString(),
-                MeteoriteStructure.INSTANCE.setRegistryName(MeteoriteStructure.ID),
-                GenerationStage.Decoration.TOP_LAYER_MODIFICATION);
-
-        Registry.register(Registry.CHUNK_GENERATOR_CODEC, SpatialStorageDimensionIds.CHUNK_GENERATOR_ID,
-                SpatialStorageChunkGenerator.CODEC);
-    }
-
-    public void registerBiomes(RegistryEvent.Register<Biome> evt) {
-        evt.getRegistry().register(SpatialStorageBiome.INSTANCE.setRegistryName(SpatialStorageDimensionIds.BIOME_ID));
     }
 
     @OnlyIn(Dist.CLIENT)

src/main/java/appeng/core/api/ApiCrafting.java

@@ -115,12 +115,7 @@ public class ApiCrafting implements ICraftingHelper {
         // We use the shared itemstack for an identity lookup.
         IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(is);
 
-        try {
-            return new CraftingPatternDetails(ais, world);
-        } catch (IllegalStateException e) {
-            AELog.warn("Could not decode an invalid pattern %s: %s", is, e);
-            return null;
-        }
+        return new CraftingPatternDetails(ais, world);
     }
 
     private boolean attemptRecovery(EncodedPatternItem patternItem, ItemStack itemStack, World world) {

src/main/java/appeng/core/api/definitions/ApiBlocks.java

@@ -20,9 +20,7 @@ package appeng.core.api.definitions;
 
 import static appeng.block.AEBaseBlock.defaultProps;
 
-import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.block.SoundType;
@@ -30,7 +28,6 @@ import net.minecraft.block.StairsBlock;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ToolType;
@@ -265,20 +262,18 @@ public final class ApiBlocks implements IBlocks {
         this.chiseledQuartzBlock = deco.block("chiseled_quartz_block", () -> new AEDecorativeBlock(QUARTZ_PROPERTIES))
                 .build();
 
-        AbstractBlock.IExtendedPositionPredicate<EntityType<?>> neverAllowSpawn = (p1, p2, p3, p4) -> false;
-        this.quartzGlass = registry.features(AEFeature.QUARTZ_GLASS).block("quartz_glass", () -> {
-            return new QuartzGlassBlock(defaultProps(Material.GLASS).notSolid().setAllowsSpawn(neverAllowSpawn));
-        }).rendering(new BlockRenderingCustomizer() {
-            @Override
-            @OnlyIn(Dist.CLIENT)
-            public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
-                rendering.renderType(RenderType.getCutout());
-            }
-        }).build();
+        this.quartzGlass = registry.features(AEFeature.QUARTZ_GLASS)
+                .block("quartz_glass", () -> new QuartzGlassBlock(defaultProps(Material.GLASS).notSolid()))
+                .rendering(new BlockRenderingCustomizer() {
+                    @Override
+                    @OnlyIn(Dist.CLIENT)
+                    public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
+                        rendering.renderType(RenderType.getCutout());
+                    }
+                }).build();
         this.quartzVibrantGlass = deco
                 .block("quartz_vibrant_glass",
-                        () -> new QuartzLampBlock(defaultProps(Material.GLASS).setLightLevel(b -> 15).notSolid()
-                                .setAllowsSpawn(neverAllowSpawn)))
+                        () -> new QuartzLampBlock(defaultProps(Material.GLASS).setLightLevel(b -> 15).notSolid()))
                 .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS)
                 .rendering(new BlockRenderingCustomizer() {
                     @Override

src/main/java/appeng/core/api/definitions/ApiItems.java

@@ -56,7 +56,6 @@ import appeng.hooks.BlockToolDispenseItemBehavior;
 import appeng.hooks.MatterCannonDispenseItemBehavior;
 import appeng.items.materials.MaterialType;
 import appeng.items.misc.CrystalSeedItem;
-import appeng.items.misc.CrystalSeedRendering;
 import appeng.items.misc.EncodedPatternItem;
 import appeng.items.misc.PaintBallItem;
 import appeng.items.misc.PaintBallItemRendering;
@@ -300,15 +299,24 @@ public final class ApiItems implements IItems {
         this.certusCrystalSeed = registry
                 .item("certus_crystal_seed",
                         props -> new CrystalSeedItem(props, materials.purifiedCertusQuartzCrystal().item()))
-                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
+                .bootstrap(item -> new IClientSetupComponent() {
+                    @Override
+                    @OnlyIn(Dist.CLIENT)
+                    public void setup() {
+                        // Expose the growth of the seed to the model system
+                        ItemModelsProperties.func_239418_a_(item, new ResourceLocation("appliedenergistics2:growth"),
+                                (is, w, p) -> CrystalSeedItem.getGrowthTicks(is)
+                                        / (float) CrystalSeedItem.GROWTH_TICKS_REQUIRED);
+                    }
+                }).features(AEFeature.CRYSTAL_SEEDS).build();
         this.fluixCrystalSeed = registry
                 .item("fluix_crystal_seed",
                         props -> new CrystalSeedItem(props, materials.purifiedFluixCrystal().item()))
-                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
+                .features(AEFeature.CRYSTAL_SEEDS).build();
         this.netherQuartzSeed = registry
                 .item("nether_quartz_seed",
                         props -> new CrystalSeedItem(props, materials.purifiedNetherQuartzCrystal().item()))
-                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
+                .features(AEFeature.CRYSTAL_SEEDS).build();
 
         GrowingCrystalEntity.TYPE = registry
                 .<GrowingCrystalEntity>entity("growing_crystal", GrowingCrystalEntity::new, EntityClassification.MISC)

src/main/java/appeng/core/features/registries/LocatableRegistry.java

@@ -22,12 +22,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import appeng.api.events.LocatableEventAnnounce;
 import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
 import appeng.api.features.ILocatable;
 import appeng.api.features.ILocatableRegistry;
-import appeng.core.AELog;
 import appeng.util.Platform;
 
 public final class LocatableRegistry implements ILocatableRegistry {
@@ -35,19 +35,18 @@ public final class LocatableRegistry implements ILocatableRegistry {
 
     public LocatableRegistry() {
         this.set = new HashMap<>();
-        MinecraftForge.EVENT_BUS.addListener(this::updateLocatable);
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
-    private void updateLocatable(final LocatableEventAnnounce e) {
+    @SubscribeEvent
+    public void updateLocatable(final LocatableEventAnnounce e) {
         if (Platform.isClient()) {
             return; // IGNORE!
         }
 
         if (e.change == LocatableEvent.REGISTER) {
-            AELog.debug("Registering locatable %s: %s", e.target.getLocatableSerial(), e.target);
             this.set.put(e.target.getLocatableSerial(), e.target);
         } else if (e.change == LocatableEvent.UNREGISTER) {
-            AELog.debug("Unregistering locatable %s: %s", e.target.getLocatableSerial(), e.target);
             this.set.remove(e.target.getLocatableSerial());
         }
     }

src/main/java/appeng/core/features/registries/MovableTileRegistry.java

@@ -51,12 +51,12 @@ public class MovableTileRegistry implements IMovableRegistry {
     private final List<IMovableHandler> handlers = new ArrayList<>();
     private final DefaultSpatialHandler dsh = new DefaultSpatialHandler();
     private final IMovableHandler nullHandler = new DefaultSpatialHandler();
-    private final ITag<Block> blockTagWhiteList;
-    private final ITag<Block> blockTagBlackList;
+    private final ITag.INamedTag<Block> blockTagWhiteList;
+    private final ITag.INamedTag<Block> blockTagBlackList;
 
     public MovableTileRegistry() {
-        this.blockTagWhiteList = BlockTags.getCollection().getOrCreate(TAG_WHITELIST);
-        this.blockTagBlackList = BlockTags.getCollection().getOrCreate(TAG_BLACKLIST);
+        this.blockTagWhiteList = BlockTags.makeWrapperTag(TAG_WHITELIST.toString());
+        this.blockTagBlackList = BlockTags.makeWrapperTag(TAG_BLACKLIST.toString());
     }
 
     @Override

src/main/java/appeng/core/sync/BasePacketHandler.java

@@ -29,6 +29,7 @@ import appeng.core.sync.packets.BlockTransitionEffectPacket;
 import appeng.core.sync.packets.ClickPacket;
 import appeng.core.sync.packets.CompassRequestPacket;
 import appeng.core.sync.packets.CompassResponsePacket;
+import appeng.core.sync.packets.CompressedNBTPacket;
 import appeng.core.sync.packets.ConfigButtonPacket;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.CraftRequestPacket;
@@ -38,7 +39,6 @@ import appeng.core.sync.packets.ItemTransitionEffectPacket;
 import appeng.core.sync.packets.JEIRecipePacket;
 import appeng.core.sync.packets.LightningPacket;
 import appeng.core.sync.packets.MEFluidInventoryUpdatePacket;
-import appeng.core.sync.packets.MEInterfaceUpdatePacket;
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
 import appeng.core.sync.packets.MatterCannonPacket;
 import appeng.core.sync.packets.MockExplosionPacket;
@@ -101,7 +101,7 @@ public class BasePacketHandler {
 
         PACKET_ASSEMBLER_ANIMATION(AssemblerAnimationPacket.class, AssemblerAnimationPacket::new),
 
-        PACKET_ME_INTERFACE_UPDATE(MEInterfaceUpdatePacket.class, MEInterfaceUpdatePacket::new),
+        PACKET_COMPRESSED_NBT(CompressedNBTPacket.class, CompressedNBTPacket::new),
 
         PACKET_PAINTED_ENTITY(PaintedEntityPacket.class, PaintedEntityPacket::new),
 

src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java

@@ -71,7 +71,7 @@ public class BlockTransitionEffectPacket extends BasePacket {
 
         data.writeInt(this.getPacketID());
         data.writeBlockPos(pos);
-        int blockStateId = GameData.getBlockStateIDMap().get(blockState);
+        int blockStateId = GameData.getBlockStateIDMap().getId(blockState);
         if (blockStateId == -1) {
             AELog.warn("Failed to find numeric id for block state %s", blockState);
         }

src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java

@@ -18,7 +18,13 @@
 
 package appeng.core.sync.packets;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 import io.netty.buffer.Unpooled;
 
@@ -26,6 +32,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -34,24 +41,55 @@ import appeng.client.gui.implementations.InterfaceTerminalScreen;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
 
-public class MEInterfaceUpdatePacket extends BasePacket {
+//TODO, this is pointless, NBT is already compressed when written to a PacketBuffer.
+public class CompressedNBTPacket extends BasePacket {
 
     // input.
     private final CompoundNBT in;
     // output...
     private final PacketBuffer data;
+    private final GZIPOutputStream compressFrame;
 
-    public MEInterfaceUpdatePacket(final PacketBuffer stream) {
+    public CompressedNBTPacket(final PacketBuffer stream) {
         this.data = null;
-        this.in = stream.readCompoundTag();
+        this.compressFrame = null;
+
+        try (DataInputStream inStream = new DataInputStream(new GZIPInputStream(new InputStream() {
+
+            @Override
+            public int read() {
+                if (stream.readableBytes() <= 0) {
+                    return -1;
+                }
+
+                return stream.readByte() & 0xff;
+            }
+        }))) {
+            this.in = CompressedStreamTools.read(inStream);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to decompress packet.", e);
+        }
     }
 
     // api
-    public MEInterfaceUpdatePacket(final CompoundNBT din) throws IOException {
-        this.in = null;
+    public CompressedNBTPacket(final CompoundNBT din) throws IOException {
+
         this.data = new PacketBuffer(Unpooled.buffer(2048));
         this.data.writeInt(this.getPacketID());
-        this.data.writeCompoundTag(din);
+
+        this.in = din;
+
+        this.compressFrame = new GZIPOutputStream(new OutputStream() {
+
+            @Override
+            public void write(final int value) {
+                CompressedNBTPacket.this.data.writeByte(value);
+            }
+        });
+
+        CompressedStreamTools.write(din, new DataOutputStream(this.compressFrame));
+        this.compressFrame.close();
+
         this.configureWrite(this.data);
     }
 

src/main/java/appeng/core/sync/packets/ConfigValuePacket.java

@@ -37,7 +37,7 @@ import appeng.container.AEBaseContainer;
 import appeng.container.implementations.CellWorkbenchContainer;
 import appeng.container.implementations.CraftConfirmContainer;
 import appeng.container.implementations.CraftingCPUContainer;
-import appeng.container.implementations.CraftingCPUCyclingContainer;
+import appeng.container.implementations.CraftingStatusContainer;
 import appeng.container.implementations.LevelEmitterContainer;
 import appeng.container.implementations.NetworkToolContainer;
 import appeng.container.implementations.PatternTermContainer;
@@ -98,9 +98,12 @@ public class ConfigValuePacket extends BasePacket {
             final ItemStack is = player.getHeldItem(hand);
             final IMouseWheelItem si = (IMouseWheelItem) is.getItem();
             si.onWheel(is, this.Value.equals("WheelUp"));
-        } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftingCPUCyclingContainer) {
-            final CraftingCPUCyclingContainer qk = (CraftingCPUCyclingContainer) c;
-            qk.cycleSelectedCPU(this.Value.equals("Next"));
+        } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftingStatusContainer) {
+            final CraftingStatusContainer qk = (CraftingStatusContainer) c;
+            qk.cycleCpu(this.Value.equals("Next"));
+        } else if (this.Name.equals("Terminal.Cpu") && c instanceof CraftConfirmContainer) {
+            final CraftConfirmContainer qk = (CraftConfirmContainer) c;
+            qk.cycleCpu(this.Value.equals("Next"));
         } else if (this.Name.equals("Terminal.Start") && c instanceof CraftConfirmContainer) {
             final CraftConfirmContainer qk = (CraftConfirmContainer) c;
             qk.startJob();
@@ -115,13 +118,13 @@ public class ConfigValuePacket extends BasePacket {
             sc.toggleSetting(this.Value, player);
         } else if (this.Name.equals("PriorityHost.Priority") && c instanceof PriorityContainer) {
             final PriorityContainer pc = (PriorityContainer) c;
-            pc.setPriority(Integer.parseInt(this.Value));
+            pc.setPriority(Integer.parseInt(this.Value), player);
         } else if (this.Name.equals("LevelEmitter.Value") && c instanceof LevelEmitterContainer) {
             final LevelEmitterContainer lvc = (LevelEmitterContainer) c;
-            lvc.setReportingValue(Long.parseLong(this.Value));
+            lvc.setLevel(Long.parseLong(this.Value), player);
         } else if (this.Name.equals("FluidLevelEmitter.Value") && c instanceof FluidLevelEmitterContainer) {
             final FluidLevelEmitterContainer lvc = (FluidLevelEmitterContainer) c;
-            lvc.setReportingValue(Long.parseLong(this.Value));
+            lvc.setLevel(Long.parseLong(this.Value), player);
         } else if (this.Name.startsWith("PatternTerminal.") && c instanceof PatternTermContainer) {
             final PatternTermContainer cpt = (PatternTermContainer) c;
             if (this.Name.equals("PatternTerminal.CraftMode")) {
@@ -189,7 +192,9 @@ public class ConfigValuePacket extends BasePacket {
     public void clientPacketData(final INetworkInfo network, final PlayerEntity player) {
         final Container c = player.openContainer;
 
-        if (this.Name.startsWith("SyncDat.")) {
+        if (this.Name.equals("CustomName") && c instanceof AEBaseContainer) {
+            ((AEBaseContainer) c).setCustomName(this.Value);
+        } else if (this.Name.startsWith("SyncDat.")) {
             ((AEBaseContainer) c).stringSync(Integer.parseInt(this.Name.substring(8)), this.Value);
         } else if (this.Name.equals("CraftingStatus") && this.Value.equals("Clear")) {
             final Screen gs = Minecraft.getInstance().currentScreen;

src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java

@@ -19,9 +19,13 @@
 package appeng.core.sync.packets;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.BufferOverflowException;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 import javax.annotation.Nullable;
 
@@ -37,6 +41,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkDirection;
 
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.core.AELog;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.fluids.client.gui.FluidTerminalScreen;
@@ -50,6 +55,8 @@ import appeng.fluids.util.AEFluidStack;
 public class MEFluidInventoryUpdatePacket extends BasePacket {
     private static final int UNCOMPRESSED_PACKET_BYTE_LIMIT = 16 * 1024 * 1024;
     private static final int OPERATION_BYTE_LIMIT = 2 * 1024;
+    private static final int TEMP_BUFFER_SIZE = 1024;
+    private static final int STREAM_MASK = 0xff;
 
     // input.
     @Nullable
@@ -59,18 +66,47 @@ public class MEFluidInventoryUpdatePacket extends BasePacket {
 
     @Nullable
     private final PacketBuffer data;
+    @Nullable
+    private final GZIPOutputStream compressFrame;
 
     private int writtenBytes = 0;
     private boolean empty = true;
 
     public MEFluidInventoryUpdatePacket(final PacketBuffer stream) {
         this.data = null;
+        this.compressFrame = null;
         this.list = new LinkedList<>();
         this.ref = stream.readByte();
 
-        while (stream.readableBytes() > 0) {
-            this.list.add(AEFluidStack.fromPacket(stream));
+        try (final GZIPInputStream gzReader = new GZIPInputStream(new InputStream() {
+            @Override
+            public int read() {
+                if (stream.readableBytes() <= 0) {
+                    return -1;
+                }
+
+                return stream.readByte() & STREAM_MASK;
+            }
+        })) {
+
+            final PacketBuffer uncompressed = new PacketBuffer(Unpooled.buffer(stream.readableBytes()));
+            final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
+
+            while (gzReader.available() != 0) {
+                final int bytes = gzReader.read(tmp);
+
+                if (bytes > 0) {
+                    uncompressed.writeBytes(tmp, 0, bytes);
+                }
+            }
+
+            while (uncompressed.readableBytes() > 0) {
+                this.list.add(AEFluidStack.fromPacket(uncompressed));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to decompress packet.", e);
         }
+
         this.empty = this.list.isEmpty();
     }
 
@@ -85,6 +121,14 @@ public class MEFluidInventoryUpdatePacket extends BasePacket {
         this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
         this.data.writeInt(this.getPacketID());
         this.data.writeByte(this.ref);
+
+        this.compressFrame = new GZIPOutputStream(new OutputStream() {
+            @Override
+            public void write(final int value) {
+                MEFluidInventoryUpdatePacket.this.data.writeByte(value);
+            }
+        });
+
         this.list = null;
     }
 
@@ -101,19 +145,28 @@ public class MEFluidInventoryUpdatePacket extends BasePacket {
     @Nullable
     @Override
     public IPacket<?> toPacket(NetworkDirection direction) {
-        this.configureWrite(this.data);
-        return super.toPacket(direction);
+        try {
+            this.compressFrame.close();
+
+            this.configureWrite(this.data);
+            return super.toPacket(direction);
+        } catch (final IOException e) {
+            AELog.debug(e);
+        }
+
+        return null;
     }
 
     public void appendFluid(final IAEFluidStack fs) throws IOException, BufferOverflowException {
         final PacketBuffer tmp = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
         fs.writeToPacket(tmp);
 
+        this.compressFrame.flush();
         if (this.writtenBytes + tmp.readableBytes() > UNCOMPRESSED_PACKET_BYTE_LIMIT) {
             throw new BufferOverflowException();
         } else {
             this.writtenBytes += tmp.readableBytes();
-            this.data.writeBytes(tmp.array(), 0, tmp.readableBytes());
+            this.compressFrame.write(tmp.array(), 0, tmp.readableBytes());
             this.empty = false;
         }
     }

src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java

@@ -19,10 +19,12 @@
 package appeng.core.sync.packets;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.BufferOverflowException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import javax.annotation.Nullable;
@@ -43,6 +45,7 @@ import appeng.client.gui.implementations.CraftConfirmScreen;
 import appeng.client.gui.implementations.CraftingCPUScreen;
 import appeng.client.gui.implementations.MEMonitorableScreen;
 import appeng.client.gui.implementations.NetworkStatusScreen;
+import appeng.core.AELog;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.item.AEItemStack;
@@ -50,6 +53,8 @@ import appeng.util.item.AEItemStack;
 public class MEInventoryUpdatePacket extends BasePacket {
     private static final int UNCOMPRESSED_PACKET_BYTE_LIMIT = 16 * 1024 * 1024;
     private static final int OPERATION_BYTE_LIMIT = 2 * 1024;
+    private static final int TEMP_BUFFER_SIZE = 1024;
+    private static final int STREAM_MASK = 0xff;
 
     // input.
     @Nullable
@@ -59,18 +64,48 @@ public class MEInventoryUpdatePacket extends BasePacket {
 
     @Nullable
     private final PacketBuffer data;
+    @Nullable
+    private final GZIPOutputStream compressFrame;
 
     private int writtenBytes = 0;
     private boolean empty = true;
 
     public MEInventoryUpdatePacket(final PacketBuffer stream) {
         this.data = null;
+        this.compressFrame = null;
         this.list = new ArrayList<>();
         this.ref = stream.readByte();
 
-        while (stream.readableBytes() > 0) {
-            this.list.add(AEItemStack.fromPacket(stream));
+        // int originalBytes = stream.readableBytes();
+
+        try (GZIPInputStream gzReader = new GZIPInputStream(new InputStream() {
+            @Override
+            public int read() {
+                if (stream.readableBytes() <= 0) {
+                    return -1;
+                }
+
+                return stream.readByte() & STREAM_MASK;
+            }
+        })) {
+            final PacketBuffer uncompressed = new PacketBuffer(Unpooled.buffer(stream.readableBytes()));
+            final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
+
+            while (gzReader.available() != 0) {
+                final int bytes = gzReader.read(tmp);
+
+                if (bytes > 0) {
+                    uncompressed.writeBytes(tmp, 0, bytes);
+                }
+            }
+
+            while (uncompressed.readableBytes() > 0) {
+                this.list.add(AEItemStack.fromPacket(uncompressed));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to decompress packet.", e);
         }
+
         this.empty = this.list.isEmpty();
     }
 
@@ -85,6 +120,14 @@ public class MEInventoryUpdatePacket extends BasePacket {
         this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
         this.data.writeInt(this.getPacketID());
         this.data.writeByte(this.ref);
+
+        this.compressFrame = new GZIPOutputStream(new OutputStream() {
+            @Override
+            public void write(final int value) {
+                MEInventoryUpdatePacket.this.data.writeByte(value);
+            }
+        });
+
         this.list = null;
     }
 
@@ -113,19 +156,28 @@ public class MEInventoryUpdatePacket extends BasePacket {
     @Nullable
     @Override
     public IPacket<?> toPacket(NetworkDirection direction) {
-        this.configureWrite(this.data);
-        return super.toPacket(direction);
+        try {
+            this.compressFrame.close();
+
+            this.configureWrite(this.data);
+            return super.toPacket(direction);
+        } catch (final IOException e) {
+            AELog.debug(e);
+        }
+
+        return null;
     }
 
     public void appendItem(final IAEItemStack is) throws IOException, BufferOverflowException {
         final PacketBuffer tmp = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
         is.writeToPacket(tmp);
 
+        this.compressFrame.flush();
         if (this.writtenBytes + tmp.readableBytes() > UNCOMPRESSED_PACKET_BYTE_LIMIT) {
             throw new BufferOverflowException();
         } else {
             this.writtenBytes += tmp.readableBytes();
-            this.data.writeBytes(tmp.array(), 0, tmp.readableBytes());
+            this.compressFrame.write(tmp.array(), 0, tmp.readableBytes());
             this.empty = false;
         }
     }

src/main/java/appeng/debug/MeteoritePlacerItem.java

@@ -129,7 +129,7 @@ public class MeteoritePlacerItem extends AEBaseItem {
         // is a debug tool, we'll not care about being terribly efficient here
         ChunkPos.getAllInBox(new ChunkPos(spawned.getPos()), 1).forEach(cp -> {
             Chunk c = world.getChunk(cp.x, cp.z);
-            player.connection.sendPacket(new SChunkDataPacket(c, 65535, false)); // 65535 == full chunk
+            player.connection.sendPacket(new SChunkDataPacket(c, 65535)); // 65535 == full chunk
         });
 
         return ActionResultType.SUCCESS;

src/main/java/appeng/decorative/solid/QuartzGlassBlock.java

@@ -20,8 +20,11 @@ package appeng.decorative.solid;
 
 import net.minecraft.block.AbstractGlassBlock;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.material.Material;
 import net.minecraft.util.Direction;
 
+import appeng.helpers.AEMaterials;
+
 public class QuartzGlassBlock extends AbstractGlassBlock {
 
     public QuartzGlassBlock(Properties props) {
@@ -30,7 +33,8 @@ public class QuartzGlassBlock extends AbstractGlassBlock {
 
     @Override
     public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) {
-        if (adjacentBlockState.getBlock() instanceof QuartzGlassBlock) {
+        final Material mat = adjacentBlockState.getMaterial();
+        if (mat == Material.GLASS || mat == AEMaterials.GLASS) {
             if (adjacentBlockState.getRenderType() == state.getRenderType()) {
                 return true;
             }

src/main/java/appeng/decorative/solid/SkyStoneBlock.java

@@ -29,6 +29,7 @@ import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.ToolType;
 import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import appeng.block.AEBaseBlock;
 import appeng.core.worlddata.WorldData;
@@ -42,10 +43,11 @@ public class SkyStoneBlock extends AEBaseBlock {
         super(props);
         this.type = type;
 
-        MinecraftForge.EVENT_BUS.addListener(this::breakFaster);
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
-    private void breakFaster(final PlayerEvent.BreakSpeed event) {
+    @SubscribeEvent
+    public void breakFaster(final PlayerEvent.BreakSpeed event) {
         if (event.getState().getBlock() == this && event.getPlayer() != null) {
             final ItemStack is = event.getPlayer().getItemStackFromSlot(EquipmentSlotType.MAINHAND);
             int level = -1;

src/main/java/appeng/entity/GrowingCrystalEntity.java

@@ -19,14 +19,13 @@
 package appeng.entity;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 
 import appeng.api.features.AEFeature;
@@ -36,27 +35,12 @@ import appeng.client.EffectType;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
 import appeng.items.misc.CrystalSeedItem;
+import appeng.util.Platform;
 
 public final class GrowingCrystalEntity extends AEBaseItemEntity {
 
     public static EntityType<GrowingCrystalEntity> TYPE;
 
-    // Growth tick progress per tick by number of adjacent accelerators
-    // Expressed as 1/1000th of a growth tick, applied to progress_1000
-    // each time this entity ticks.
-    private static final int[] GROWTH_TICK_PROGRESS = { 1, // no accelerators
-            40, // 1 accelerator
-            92, // 2 accelerators
-            159, // 3 accelerators
-            247, // 4 accelerators
-            361, // 5 accelerators
-            509 // 6 accelerators
-    };
-
-    /**
-     * The accumulated progress towards a single growth tick of the crystal in
-     * 1/1000th of a growth tick.
-     */
     private int progress_1000 = 0;
 
     public GrowingCrystalEntity(EntityType<? extends GrowingCrystalEntity> type, World world) {
@@ -72,140 +56,126 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity {
     public void tick() {
         super.tick();
 
-        final ItemStack is = this.getItem();
-        final Item gc = is.getItem();
-
-        if (!(gc instanceof IGrowableCrystal)) {
-            return;
-        }
-
-        applyGrowthTick((IGrowableCrystal) gc, is);
-    }
-
-    private void applyGrowthTick(IGrowableCrystal cry, ItemStack is) {
         if (!AEConfig.instance().isFeatureEnabled(AEFeature.IN_WORLD_PURIFICATION)) {
             return;
         }
 
-        final int x = MathHelper.floor(this.getPosX());
-        final int y = MathHelper.floor((this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D);
-        final int z = MathHelper.floor(this.getPosZ());
+        final ItemStack is = this.getItem();
+        final Item gc = is.getItem();
 
-        BlockPos pos = new BlockPos(x, y, z);
-        final BlockState state = this.world.getBlockState(pos);
+        if (gc instanceof IGrowableCrystal) // if it changes this just stops being an issue...
+        {
+            final int j = MathHelper.floor(this.getPosX());
+            final int i = MathHelper.floor((this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D);
+            final int k = MathHelper.floor(this.getPosZ());
 
-        final float multiplier = cry.getMultiplier(state, world, pos);
+            final BlockState state = this.world.getBlockState(new BlockPos(j, i, k));
+            final Material mat = state.getMaterial();
+            final IGrowableCrystal cry = (IGrowableCrystal) is.getItem();
 
-        if (multiplier <= 0) {
-            // Crystal is in unsuitable material, reset progress and quit
-            this.progress_1000 = 0;
-            return;
-        }
+            final float multiplier = cry.getMultiplier(state.getBlock(), mat);
+            final int speed = (int) Math.max(1, this.getSpeed(j, i, k) * multiplier);
 
-        final int progressPerTick = (int) Math.max(1, this.getSpeed(pos) * multiplier);
+            final boolean isClient = Platform.isClient();
 
-        if (world.isRemote()) {
-            // On the client, we reuse the growth-tick-progress
-            // as a tick-counter for particle effects
-            int len = getTicksBetweenParticleEffects(progressPerTick);
-            if (++this.progress_1000 >= len) {
+            if (mat.isLiquid()) {
+                if (isClient) {
+                    this.progress_1000++;
+                } else {
+                    this.progress_1000 += speed;
+                }
+            } else {
                 this.progress_1000 = 0;
-                AppEng.proxy.spawnEffect(EffectType.Vibrant, this.world, this.getPosX(), this.getPosY() + 0.2,
-                        this.getPosZ(), null);
             }
-        } else {
-            this.progress_1000 += progressPerTick;
 
-            if (this.progress_1000 >= 1000) {
-                // We need to copy the stack or the change detection will not work and not sync
-                // this new stack to the client
-                ItemStack newItem = is.copy();
+            if (isClient) {
+                int len = 40;
 
-                // If we did not use a while loop here, the fastest growth for a crystal
-                // would be limited to a minimum of 30 seconds (based on 600 required growth
-                // ticks).
-                // Should a crystal decide to use a high multiplier for a certain material,
-                // it should be possible to go faster.
-                do {
-                    newItem = cry.triggerGrowth(newItem);
+                if (speed > 2) {
+                    len = 20;
+                }
+
+                if (speed > 90) {
+                    len = 15;
+                }
+
+                if (speed > 150) {
+                    len = 10;
+                }
+
+                if (speed > 240) {
+                    len = 7;
+                }
+
+                if (speed > 360) {
+                    len = 3;
+                }
+
+                if (speed > 500) {
+                    len = 1;
+                }
+
+                if (this.progress_1000 >= len) {
+                    this.progress_1000 = 0;
+                    AppEng.proxy.spawnEffect(EffectType.Vibrant, this.world, this.getPosX(), this.getPosY() + 0.2,
+                            this.getPosZ(), null);
+                }
+            } else {
+                if (this.progress_1000 > 1000) {
                     this.progress_1000 -= 1000;
-                    // We assume that if the item changes, the process is complete and we can break
-                } while (this.progress_1000 >= 1000 && newItem.getItem() == is.getItem());
-
-                this.setItem(newItem);
+                    // We need to copy the stack or the change detection will not work and not sync
+                    // this new stack to the client
+                    ItemStack newItem = cry.triggerGrowth(is.copy());
+                    this.setItem(newItem);
+                }
             }
         }
     }
 
-    private static int getTicksBetweenParticleEffects(int progressPerTick) {
-        if (progressPerTick > 500) {
-            return 1; // 20 times per second
-        } else if (progressPerTick > 360) {
-            return 3;
-        } else if (progressPerTick > 240) {
-            return 7;
-        } else if (progressPerTick > 150) {
-            return 10;
-        } else if (progressPerTick > 90) {
-            return 15;
-        } else if (progressPerTick > 2) {
-            return 20;
-        } else {
-            return 40; // Every 2 seconds
-        }
-    }
+    private int getSpeed(final int x, final int y, final int z) {
+        final int per = 80;
+        final float mul = 0.3f;
 
-    /**
-     * Gets the extra progress per tick in 1/1000th of a growth tick based on the
-     * surrounding accelerators.
-     */
-    private int getSpeed(BlockPos pos) {
-        int acceleratorCount = getAcceleratorCount(pos);
+        int qty = 0;
 
-        if (acceleratorCount < 0) {
-            return GROWTH_TICK_PROGRESS[0];
-        } else if (acceleratorCount >= GROWTH_TICK_PROGRESS.length) {
-            return GROWTH_TICK_PROGRESS[GROWTH_TICK_PROGRESS.length - 1];
-        } else {
-            return GROWTH_TICK_PROGRESS[acceleratorCount];
-        }
-    }
-
-    private int getAcceleratorCount(BlockPos pos) {
-        int count = 0;
-
-        BlockPos.Mutable testPos = new BlockPos.Mutable();
-        for (Direction direction : Direction.values()) {
-            if (this.isPoweredAccelerator(testPos.func_239622_a_(pos, direction))) {
-                count++;
-            }
+        if (this.isAccelerated(x + 1, y, z)) {
+            qty += per + qty * mul;
         }
 
-        return count;
+        if (this.isAccelerated(x, y + 1, z)) {
+            qty += per + qty * mul;
+        }
+
+        if (this.isAccelerated(x, y, z + 1)) {
+            qty += per + qty * mul;
+        }
+
+        if (this.isAccelerated(x - 1, y, z)) {
+            qty += per + qty * mul;
+        }
+
+        if (this.isAccelerated(x, y - 1, z)) {
+            qty += per + qty * mul;
+        }
+
+        if (this.isAccelerated(x, y, z - 1)) {
+            qty += per + qty * mul;
+        }
+
+        return qty;
     }
 
-    private boolean isPoweredAccelerator(BlockPos pos) {
-        final TileEntity te = this.world.getTileEntity(pos);
+    private boolean isAccelerated(final int x, final int y, final int z) {
+        final TileEntity te = this.world.getTileEntity(new BlockPos(x, y, z));
 
         return te instanceof ICrystalGrowthAccelerator && ((ICrystalGrowthAccelerator) te).isPowered();
     }
 
+    // Don't let seeds "float" on water surface
     @Override
     protected void applyFloatMotion() {
         ItemStack item = getItem();
-
-        // Make ungrown seeds sink, and fully grown seeds bouyant allowing for
-        // automation based around dropping seeds between 5 CGAs, then catchiung
-        // them on their way up.
         if (item.getItem() instanceof CrystalSeedItem) {
-            Vector3d v = this.getMotion();
-
-            // Apply a much smaller acceleration to make them slowly sink
-            double yAccel = this.hasNoGravity() ? 0 : -0.002;
-
-            // Apply the x/z slow-down, and the y acceleration
-            this.setMotion(v.x * 0.99, v.y + yAccel, v.z * 0.99);
-
             return;
         }
         super.applyFloatMotion();

src/main/java/appeng/entity/TinyTNTPrimedEntity.java

@@ -140,8 +140,8 @@ public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAddit
             return;
         }
 
-        final Explosion ex = new Explosion(this.world, this, null, null, this.getPosX(), this.getPosY(), this.getPosZ(),
-                0.2f, false, Explosion.Mode.BREAK);
+        final Explosion ex = new Explosion(this.world, this, this.getPosX(), this.getPosY(), this.getPosZ(), 0.2f,
+                false, Mode.BREAK);
         final AxisAlignedBB area = new AxisAlignedBB(this.getPosX() - 1.5, this.getPosY() - 1.5f, this.getPosZ() - 1.5,
                 this.getPosX() + 1.5, this.getPosY() + 1.5, this.getPosZ() + 1.5);
         final List<Entity> list = this.world.getEntitiesWithinAABBExcludingEntity(this, area);

src/main/java/appeng/facade/FacadeContainer.java

@@ -37,18 +37,15 @@ public class FacadeContainer implements IFacadeContainer {
 
     private final int facades = 6;
     private final CableBusStorage storage;
-    private final Runnable changeCallback;
 
-    public FacadeContainer(final CableBusStorage cbs, Runnable changeCallback) {
+    public FacadeContainer(final CableBusStorage cbs) {
         this.storage = cbs;
-        this.changeCallback = changeCallback;
     }
 
     @Override
     public boolean addFacade(final IFacadePart a) {
         if (this.getFacade(a.getSide()) == null) {
             this.storage.setFacade(a.getSide().ordinal(), a);
-            this.notifyChange();
             return true;
         }
         return false;
@@ -59,7 +56,6 @@ public class FacadeContainer implements IFacadeContainer {
         if (side != null && side != AEPartLocation.INTERNAL) {
             if (this.storage.getFacade(side.ordinal()) != null) {
                 this.storage.setFacade(side.ordinal(), null);
-                this.notifyChange();
                 if (host != null) {
                     host.markForUpdate();
                 }
@@ -88,7 +84,6 @@ public class FacadeContainer implements IFacadeContainer {
         for (int x = 0; x < this.facades; x++) {
             this.storage.setFacade(x, newFacades[x]);
         }
-        this.notifyChange();
     }
 
     @Override
@@ -180,9 +175,4 @@ public class FacadeContainer implements IFacadeContainer {
         }
         return true;
     }
-
-    private void notifyChange() {
-        this.changeCallback.run();
-    }
-
 }

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

@@ -13,6 +13,8 @@ import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.core.localization.GuiText;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.fluids.client.gui.widgets.FluidSlotWidget;
 import appeng.fluids.container.FluidLevelEmitterContainer;
 
@@ -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/fluids/client/gui/FluidTerminalScreen.java

@@ -176,7 +176,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
                 list.add(new StringTextComponent(formattedAmount));
                 list.add(new StringTextComponent(modName));
 
-                this.renderTooltip(matrixStack, list, mouseX, mouseY);
+                this.func_243308_b(matrixStack, list, mouseX, mouseY);
 
                 return;
             }

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

@@ -71,7 +71,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/fluids/container/FluidInterfaceContainer.java

@@ -81,7 +81,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/fluids/container/FluidLevelEmitterContainer.java

@@ -4,14 +4,16 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Settings;
+import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.ContainerLocator;
+import appeng.container.guisync.GuiSync;
 import appeng.container.implementations.ContainerHelper;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.fluids.parts.FluidLevelEmitterPart;
 import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
@@ -23,41 +25,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) -> {
-            container.reportingValue = buffer.readVarLong();
-        });
+        return helper.fromNetwork(windowId, inv, buf);
     }
 
     public static boolean open(PlayerEntity player, ContainerLocator locator) {
-        return helper.open(player, locator, (host, buffer) -> {
-            buffer.writeVarLong(host.getReportingValue());
-        });
+        return helper.open(player, locator);
     }
 
     private final FluidLevelEmitterPart lvlEmitter;
 
-    // Only synced once on container-open, and only used on client
-    private long reportingValue;
+    @OnlyIn(Dist.CLIENT)
+    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() {
-        return reportingValue;
+    @OnlyIn(Dist.CLIENT)
+    public void setTextField(final NumberEntryWidget level) {
+        this.textField = level;
+        this.textField.setValue(this.EmitterValue);
     }
 
-    public void setReportingValue(long reportingValue) {
-        if (isClient()) {
-            if (reportingValue != this.reportingValue) {
-                this.reportingValue = reportingValue;
-                NetworkHandler.instance()
-                        .sendToServer(new ConfigValuePacket("FluidLevelEmitter.Value", String.valueOf(reportingValue)));
-            }
-        } else {
-            this.lvlEmitter.setReportingValue(reportingValue);
-        }
+    public void setLevel(final long l, final PlayerEntity player) {
+        this.lvlEmitter.setReportingValue(l);
+        this.EmitterValue = l;
     }
 
     @Override
@@ -79,7 +74,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 +83,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/fluids/container/FluidStorageBusContainer.java

@@ -128,7 +128,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/fluids/container/FluidTerminalContainer.java

@@ -119,7 +119,7 @@ public class FluidTerminalContainer extends AEBaseContainer
         this.clientCM.registerSetting(Settings.SORT_BY, SortOrder.NAME);
         this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
         this.clientCM.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
-        if (isServer()) {
+        if (Platform.isServer()) {
             this.serverCM = terminal.getConfigManager();
             this.monitor = terminal
                     .getInventory(Api.instance().storage().getStorageChannel(IFluidStorageChannel.class));
@@ -191,7 +191,7 @@ public class FluidTerminalContainer extends AEBaseContainer
     }
 
     private void queueInventory(final IContainerListener c) {
-        if (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 +216,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 +246,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);