Refactored crafting patterns (#4458)

* Deduplicate crafting patterns internals

This should save a bit memory for duplicate patterns as well as speed up
loading new patterns on reloading chunks.

* Encode recipe id in pattern
* Use the recipe id directly for looking it up
* Slightly refactored how patterns encode whether they are crafting patterns or not.
* Renamed PatternHelper.
* Added APIs to encode patterns. (#4463)
* Removed ICraftingPatternItem.
* Renamed isCrafting to isCraftable

Co-authored-by: shartte <shartte@users.noreply.github.com>

.github/workflows/branches.yml

@@ -21,9 +21,13 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Validate no assets
+        run: test ! -d ./src/generated
       - name: Generate assets
         uses: GabrielBB/xvfb-action@v1.2
         with:
           run: ./gradlew runData --no-daemon
+      - name: Validate assets
+        run: test -d ./src/generated
       - name: Build with Gradle
         run: ./gradlew build --no-daemon

.github/workflows/master.yml

@@ -21,9 +21,13 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Validate no assets
+        run: test ! -d ./src/generated
       - name: Generate assets
         uses: GabrielBB/xvfb-action@v1.2
         with:
           run: ./gradlew runData --no-daemon
+      - name: Validate assets
+        run: test -d ./src/generated
       - name: Build with Gradle
         run: ./gradlew build --no-daemon

.github/workflows/pull_requests.yml

@@ -21,10 +21,14 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Validate no assets
+        run: test ! -d ./src/generated
       - name: Generate assets
         uses: GabrielBB/xvfb-action@v1.2
         with:
           run: ./gradlew runData --no-daemon
+      - name: Validate assets
+        run: test -d ./src/generated
       - name: Build with Gradle
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: 'Release'
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   build:
@@ -11,8 +11,16 @@ jobs:
     steps:
       - name: Validate semver
         env:
-          RELEASE: ${{ github.event.release.tag_name }}
-        run: echo $RELEASE | grep -oP '^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
+          TAG: ${{ github.event.release.tag_name }}
+        run: |
+          echo $TAG | grep -oP '^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
+          echo "::set-env name=RELEASE::${TAG:1}"
+      - name: Export keystore
+        env:
+          KEY_STORE: ${{ secrets.KEY_STORE }}
+        run: |
+          echo $KEY_STORE | base64 -d > $HOME/keystore.jks
+          echo "::set-env name=KEY_STORE_FILE::$HOME/keystore.jks"
       - uses: actions/checkout@v2
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
@@ -20,23 +28,47 @@ jobs:
           java-version: 1.8
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Use gradle cache for faster builds
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Validate no assets
+        run: test ! -d ./src/generated
       - name: Generate assets
         uses: GabrielBB/xvfb-action@v1.2
-        env:
-          RELEASE: ${{ github.event.release.tag_name }}
         with:
           run: ./gradlew runData --no-daemon
+      - name: Validate assets
+        run: test -d ./src/generated
       - name: Build with Gradle
         env:
-          RELEASE: ${{ github.event.release.tag_name }}
+          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
+          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
+          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build --no-daemon
-      - name: Publish package
+      - name: Upload to curseforge
+        env:
+          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
+          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
+          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
+          CHANGELOG: ${{ github.event.release.body }}
+          CURSEFORGE: ${{ secrets.CURSEFORGE }}
+        run: ./gradlew curseforge --no-daemon
+      - name: Publish to github packages
+        env:
+          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
+          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
+          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew publish --no-daemon
+      - name: Prepare artifact metadata
+        id: prepare_artifact_metadata
+        run: |
+          echo ::set-output name=ARTIFACT_PATH::./build/libs/appliedenergistics2-${RELEASE}.jar
+          echo ::set-output name=ARTIFACT_NAME::appliedenergistics2-${RELEASE}.jar
+      - name: Upload Release Artifact
+        uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE: ${{ github.event.release.tag_name }}
-        run: ./gradlew publish --no-daemon
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ steps.prepare_artifact_metadata.outputs.ARTIFACT_PATH }}
+          asset_name: ${{ steps.prepare_artifact_metadata.outputs.ARTIFACT_NAME }}
+          asset_content_type: application/zip

README.md

@@ -1,5 +1,6 @@
 [![Build master](https://img.shields.io/github/workflow/status/AppliedEnergistics/Applied-Energistics-2/Build%20master?style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/actions?query=workflow%3A%22Build+master%22)
-[![Latest Release](https://img.shields.io/github/v/release/AppliedEnergistics/Applied-Energistics-2?label=Latest%20Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
+[![Latest Release](https://img.shields.io/github/v/release/AppliedEnergistics/Applied-Energistics-2?style=flat-square&label=Release)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
+[![Latest PreRelease](https://img.shields.io/github/v/release/AppliedEnergistics/Applied-Energistics-2?include_prereleases&style=flat-square&label=Pre)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
 
 # Applied Energistics 2
 
@@ -11,10 +12,9 @@
 * [Downloads](#downloads)
 * [Installation](#installation)
 * [Issues](#issues)
+* [API](#applied-energistics-2-api)
 * [Building](#building)
 * [Contribution](#contribution)
-* [API](#applied-energistics-2-api)
-* [CraftTweaker](#applied-energistics-2-crafttweaker)
 * [Localization](#applied-energistics-2-localization)
 * [Credits](#credits)
 
@@ -66,6 +66,38 @@ Providing as many details as possible does help us to find and resolve the issue
 
 Please note that we might close any issue not matching these requirements. 
 
+## Applied Energistics 2 API
+
+The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general.
+
+### Maven
+
+We use Github Packages as maven repository now. You can use the following snippet as example on how to add a repository to your gradle build file.
+
+    repositories {
+        maven {
+            name "AE2"
+            url "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
+        }
+    }
+
+When compiling against the AE2 API you can use gradle dependencies, just add
+
+    dependencies {
+        compileOnly "appeng:appliedenergistics2:VERSION:api"
+    }
+
+or add the `compileOnly` line to your existing dependencies task to your build.gradle.
+
+Replace `VERSION` with the desired one. With 1.15+ we switched to using [semver](https://semver.org/). 
+It is highly recommended following its specification and further considering an upper bound for the dependency version.
+A change of the `MAJOR` version will be an API break and can lead to various crashes. Better to inform a player about the addon not supporting the new version until it could be tested or updated.
+
+An example string would be `appeng:appliedenergistics2:7.0.0-alpha.6:api` for the API only or `appeng:appliedenergistics2:7.0.0-alpha.6` for the whole mod.
+
+Builds obtained [here](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases) or via [maven](https://github.com/AppliedEnergistics/Applied-Energistics-2/packages) should work in a development environment.
+However the dependency might need to be wrapped in `fg.deobf()` like `runtimeOnly fg.deobf("appeng:appliedenergistics2:VERSION:api")`
+
 ## Building
 
 1. Clone this repository via 
@@ -109,66 +141,6 @@ Here are a few things to keep in mind that will help get your PR approved.
 
 If you are only doing single file pull requests, GitHub supports using a quick way without the need of cloning your fork. Also read up about [synching](https://help.github.com/articles/syncing-a-fork) if you plan to contribute on regular basis.
 
-## Applied Energistics 2 API
-
-The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general.
-
-Universal builds obtained [Here](http://ae2.ae-mod.info/Downloads/) should work in a development environment.
-
-### Maven
-
-When compiling against the AE2 API you can use gradle dependencies, just add
-
-    dependencies {
-        compile "appeng:appliedenergistics2:rv_-_____-__:api"
-    }
-
-or add the compile line to your existing dependencies task to your build.gradle
-
-Where the __ are filled in with the correct version criteria; AE2 is available from the default forge maven so no additional repositories are necessary.
-
-An example string would be `appeng:appliedenergistics2:rv5-stable-1:api` for the API only or `appeng:appliedenergistics2:rv5-stable-1`  for the whole mod.
-
-## Applied Energistics 2 CraftTweaker
-
-### Inscriber
-
-The inscriber uses the vanilla recipe system with a custom `type` of `appliedenergistics2:inscriber`.
-See the [inscriber recipe folder](src/main/resources/data/appliedenergistics2/recipes/inscriber) for some examples.
-
-### Grindstone
-
-The grindstone uses the vanilla recipe system with a custom `type` of `appliedenergistics2:grinder`.
-See the [grinder recipe folder](src/main/resources/data/appliedenergistics2/recipes/grinder) for some examples.
-
-### Spatial
-Whitelist a TileEntity class for Spatial IO.
-
-	mods.appliedenergistics2.Spatial.whitelistEntity( String fullEntityClassName );
-
-### Attunement
-Attune a ItemStack or ModID to a specific P2P-Tunnel type. ModID's are used as fallback when no ItemStack was found.
-
-	mods.appliedenergistics2.Attunement.attuneME( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneME( String modID );
-	mods.appliedenergistics2.Attunement.attuneItem( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneItem( String modID );
-	mods.appliedenergistics2.Attunement.attuneFluid( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneFluid( String modID );
-	mods.appliedenergistics2.Attunement.attuneRedstone( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneRedstone( String modID );
-	mods.appliedenergistics2.Attunement.attuneRF( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneRF( String modID );
-	mods.appliedenergistics2.Attunement.attuneIC2( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneIC2( String modID );
-	mods.appliedenergistics2.Attunement.attuneLight( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneLight( String modID );
-
-### Cannon
-Add ammo types for the matter cannon.
-
-	mods.appliedenergistics2.Cannon.registerAmmo( ItemStack itemStack, double weight );
-
 ## Applied Energistics 2 Localization
 
 ### English Text

build.gradle

@@ -30,6 +30,7 @@ buildscript {
 plugins {
   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"
 }
@@ -69,7 +70,7 @@ if (ext.branch) {
 
 ext.release = System.getenv('RELEASE') ?: ""
 if (ext.release) {
-  version = ext.release.substring(1)
+  version = ext.release
 }
 
 
@@ -142,7 +143,30 @@ minecraft {
     }
 }
 
+def signProps = [:]
+if (System.getenv("KEY_STORE_FILE")) {
+    signProps['keyStore'] = System.getenv("KEY_STORE_FILE")
+    signProps['storePass'] = System.getenv("KEY_STORE_PASS")
+    signProps['alias'] = System.getenv("KEY_STORE_ALIAS")
+    signProps['keyPass'] = System.getenv("KEY_STORE_KEY_PASS")
+}
+
+task signJar(type: net.minecraftforge.gradle.common.task.SignJar, dependsOn: 'reobfJar') {
+    onlyIf { !signProps.isEmpty() }
+
+    if (!signProps.isEmpty()) {
+        keyStore = signProps.keyStore
+        alias = signProps.alias
+        storePass = signProps.storePass
+        keyPass = signProps.keyPass
+
+        inputFile = jar.archivePath
+        outputFile = jar.archivePath
+    }
+}
+
 apply from: 'gradle/scripts/artifacts.gradle'
+apply from: 'gradle/scripts/curseforge.gradle'
 
 publishing {
     publications {
@@ -151,6 +175,9 @@ publishing {
             artifactId = project.archivesBaseName
             version = project.version
             from components.java
+            artifact sourcesJar
+            artifact javadocJar
+            artifact apiJar
         }
     }
     repositories {

gradle.properties

@@ -10,7 +10,7 @@ artifact_basename=appliedenergistics2
 #########################################################
 minecraft_release=1.15
 minecraft_version=1.15.2
-mcp_mappings=20200613-1.15.1
+mcp_mappings=20200701-1.15.1
 forge_version=31.2.20
 
 #########################################################
@@ -26,6 +26,7 @@ ctm_version=MC1.15.2-1.1.0.9
 #########################################################
 website_version=1.15.2
 curse_versions=1.15.2
+curseforge_project=223794
 
 #########################################################
 # Gradle                                                #

gradle/scripts/artifacts.gradle

@@ -21,6 +21,9 @@ processResources {
 }
 
 jar {
+    finalizedBy 'reobfJar'
+    finalizedBy 'signJar'
+
     from sourceSets.main.output.classesDirs
     from sourceSets.api.output.classesDirs
     from sourceSets.main.output.resourcesDir

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
+    }
+  }
+}

src/api/java/appeng/api/AEAddon.java

@@ -26,12 +26,16 @@ import java.lang.annotation.Target;
 
 /**
  * Use this annotation on a class in your Mod to have it instantiated during the
- * initialization phase of Applied Energistics. AE expects your class to have a
- * single constructor and can supply certain arguments to your constructor using
- * dependency injection.
+ * initialization phase of Applied Energistics.
+ * 
+ * The class also needs to implement {@link IAEAddon}.
+ * 
+ * AE expects your class to have a single constructor without any parameters.
+ * 
+ * This is the only way to get access to the public {@link IAppEngApi} instance.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 @Documented
-public @interface AEPlugin {
+public @interface AEAddon {
 }

src/api/java/appeng/api/AEApi.java

@@ -1,67 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api;
-
-import java.lang.reflect.Field;
-
-import appeng.api.exceptions.CoreInaccessibleException;
-
-/**
- * Entry point for api.
- */
-public enum AEApi {
-    ;
-
-    private static final String CORE_API_FQN = "appeng.core.Api";
-    private static final String CORE_API_FIELD = "INSTANCE";
-    private static final IAppEngApi HELD_API;
-
-    static {
-        try {
-            final Class<?> apiClass = Class.forName(CORE_API_FQN);
-            final Field apiField = apiClass.getField(CORE_API_FIELD);
-
-            HELD_API = (IAppEngApi) apiField.get(apiClass);
-        } catch (final ClassNotFoundException e) {
-            throw new CoreInaccessibleException(
-                    "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared.");
-        } catch (final NoSuchFieldException e) {
-            throw new CoreInaccessibleException("AE2 API tried to access the " + CORE_API_FIELD + " field in "
-                    + CORE_API_FQN + " without it being declared.");
-        } catch (final IllegalAccessException e) {
-            throw new CoreInaccessibleException("AE2 API tried to access the " + CORE_API_FIELD + " field in "
-                    + CORE_API_FQN + " without enough access permissions.");
-        }
-    }
-
-    /**
-     * API Entry Point.
-     *
-     * @return the {@link IAppEngApi}
-     */
-    public static IAppEngApi instance() {
-        return HELD_API;
-    }
-
-}

src/api/java/appeng/api/AEInjectable.java

@@ -1,33 +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.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks interfaces that can be used as injectable constructor arguments for an
- * {@link AEPlugin}.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface AEInjectable {
-}

src/api/java/appeng/api/IAEAddon.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2013 AlgorithmX2
+ * Copyright (c) 2020 TeamAppliedEnergistics
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,23 +21,30 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package appeng.api.implementations.items;
+package appeng.api;
 
-import java.util.Set;
-
-import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 
 /**
- * Lets you specify the name of the group of items this falls under.
+ * Every AE2 addon requiring access to {@link IAppEngApi}, needs to provide at
+ * least one class implementing this interface.
+ * 
+ * Further it requires the class to be annotated with {@link AEAddon}.
+ * 
  */
-public interface IItemGroup {
+public interface IAEAddon {
 
     /**
-     * returning null, is the same as not implementing the interface at all.
-     *
-     * @param is item
-     *
-     * @return an unlocalized string to use for the items group name.
+     * This gets called once the API is successfully constructed and ready to be
+     * used.
+     * 
+     * For now this happens during {@link FMLCommonSetupEvent}.
+     * 
+     * Each addon is responsible to maintain a reference to {@link IAppEngApi} for
+     * future use. Otherwise there is no alternative to access it later.
+     * 
+     * @param api The API instance when ready.
      */
-    String getUnlocalizedGroupName(Set<ItemStack> otherItems, ItemStack is);
+    void onAPIAvailable(IAppEngApi api);
+
 }

src/api/java/appeng/api/IAppEngApi.java

@@ -23,16 +23,22 @@
 
 package appeng.api;
 
+import appeng.api.client.IClientHelper;
+import appeng.api.crafting.ICraftingHelper;
 import appeng.api.definitions.IDefinitions;
 import appeng.api.features.IRegistryContainer;
 import appeng.api.networking.IGridHelper;
 import appeng.api.networking.IGridNode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.storage.IStorageHelper;
-import appeng.api.util.IClientHelper;
 
-@AEInjectable
 public interface IAppEngApi {
+
+    /**
+     * @return An accessible list of all AE definitions
+     */
+    IDefinitions definitions();
+
     /**
      * @return Registry Container for the numerous registries in AE2.
      */
@@ -43,6 +49,11 @@ public interface IAppEngApi {
      */
     IStorageHelper storage();
 
+    /**
+     * @return A helper for working with crafting related tasks.
+     */
+    ICraftingHelper crafting();
+
     /**
      * @return A helper to create {@link IGridNode} and other grid related objects.
      */
@@ -53,11 +64,6 @@ public interface IAppEngApi {
      */
     IPartHelper partHelper();
 
-    /**
-     * @return An accessible list of all AE definitions
-     */
-    IDefinitions definitions();
-
     /**
      * @return Utility methods primarily useful for client side stuff
      */

src/api/java/appeng/api/client/ICellModelRegistry.java

@@ -0,0 +1,88 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 TeamAppliedEnergistics
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.client;
+
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import net.minecraft.client.renderer.model.ModelBakery;
+import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * A registry for 3D models used to render storage cells in the world, when they
+ * are inserted into a drive or similar machines.
+ */
+public interface ICellModelRegistry {
+
+    /**
+     * Register a new model for a storage cell item.
+     * 
+     * <p>
+     * You are responsible for ensuring that the given model is actually loaded by
+     * the game. See
+     * {@see net.minecraftforge.client.model.ModelLoader#addSpecialModel}.
+     * 
+     * This method only maps an {@link Item} to a {@link ResourceLocation} which can
+     * be looked up from the {@link ModelBakery}. No validation about missing models
+     * will be done.
+     * 
+     * Will throw an exception in case a model is already registered for an item.
+     * 
+     * For examples look at our cell part models within the drive model directory.
+     * 
+     * @param item  The cell item
+     * @param model The {@link ResourceLocation} representing the model.
+     * @return
+     */
+    void registerModel(@Nonnull Item item, @Nonnull ResourceLocation model);
+
+    /**
+     * The {@link ResourceLocation} of the model used to render the given storage
+     * cell {@link Item} when inserted into a drive or similar.
+     * 
+     * @param item
+     * @return null, if no model is registered.
+     */
+    @Nullable
+    ResourceLocation model(@Nonnull Item item);
+
+    /**
+     * An unmodifiable map of all registered mappings.
+     * 
+     * @return
+     */
+    @Nonnull
+    Map<Item, ResourceLocation> models();
+
+    /**
+     * Returns the default model, which can be used when no explicit model is
+     * registered.
+     */
+    @Nonnull
+    ResourceLocation getDefaultModel();
+
+}

src/api/java/appeng/api/client/IClientHelper.java

@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package appeng.api.util;
+package appeng.api.client;
 
 import java.util.List;
 
@@ -39,4 +39,11 @@ public interface IClientHelper {
      */
     <T extends IAEStack<T>> void addCellInformation(ICellInventoryHandler<T> handler, List<ITextComponent> lines);
 
+    /**
+     * A helper to work with clientside related tasks for cells.
+     * 
+     * @return
+     */
+    ICellModelRegistry cells();
+
 }

src/api/java/appeng/api/config/Upgrades.java

@@ -23,12 +23,22 @@
 
 package appeng.api.config;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import net.minecraft.item.ItemStack;
+import javax.annotation.Nullable;
 
-import appeng.api.definitions.IItemDefinition;
+import com.google.common.base.Preconditions;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.util.IItemProvider;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
 
 public enum Upgrades {
     /**
@@ -42,7 +52,8 @@ public enum Upgrades {
     FUZZY(1), SPEED(1), INVERTER(1);
 
     private final int tier;
-    private final Map<ItemStack, Integer> supportedMax = new HashMap<>();
+    private final List<Supported> supported = new ArrayList<>();
+    private List<ITextComponent> supportedTooltipLines;
 
     Upgrades(final int tier) {
         this.tier = tier;
@@ -52,8 +63,12 @@ public enum Upgrades {
      * @return list of Items/Blocks that support this upgrade, and how many it
      *         supports.
      */
-    public Map<ItemStack, Integer> getSupported() {
-        return this.supportedMax;
+    public List<Supported> getSupported() {
+        return this.supported;
+    }
+
+    public void registerItem(final IItemProvider item, final int maxSupported) {
+        this.registerItem(item, maxSupported, null);
     }
 
     /**
@@ -61,24 +76,98 @@ public enum Upgrades {
      *
      * @param item         machine in which this upgrade can be installed
      * @param maxSupported amount how many upgrades can be installed
+     * @param tooltipGroup If more than one item of the same group are supported,
+     *                     the tooltip will show this translation key instead. If
+     *                     the items have different maxSupported values, the highest
+     *                     will be shown.
      */
-    public void registerItem(final IItemDefinition item, final int maxSupported) {
-        item.maybeStack(1).ifPresent(is -> this.registerItem(is, maxSupported));
+    public void registerItem(final IItemProvider item, final int maxSupported, @Nullable String tooltipGroup) {
+        Preconditions.checkNotNull(item);
+        this.supported.add(new Supported(item.asItem(), maxSupported, tooltipGroup));
+        supportedTooltipLines = null; // Reset tooltip
     }
 
-    /**
-     * Registers a specific amount of this upgrade into a specific machine
-     *
-     * @param stack        machine in which this upgrade can be installed
-     * @param maxSupported amount how many upgrades can be installed
-     */
-    public void registerItem(final ItemStack stack, final int maxSupported) {
-        if (stack != null) {
-            this.supportedMax.put(stack, maxSupported);
+    public List<ITextComponent> getTooltipLines() {
+        if (supportedTooltipLines == null) {
+            supported.sort(Comparator.comparingInt(o -> o.maxCount));
+            supportedTooltipLines = new ArrayList<>(supported.size());
+
+            // Use a separate set because the final text will include numbers
+            Set<ITextComponent> namesAdded = new HashSet<>();
+
+            for (int i = 0; i < supported.size(); i++) {
+                Supported supported = this.supported.get(i);
+                ITextComponent name = supported.item.getName();
+
+                // If the group was already added by a previous item, skip this
+                if (supported.getTooltipGroup() != null && namesAdded.contains(supported.getTooltipGroup())) {
+                    continue;
+                }
+
+                // If any of the following items would be of the same group, use the group name
+                // instead
+                if (supported.getTooltipGroup() != null) {
+                    for (int j = i + 1; j < this.supported.size(); j++) {
+                        ITextComponent otherGroup = this.supported.get(j).getTooltipGroup();
+                        if (supported.getTooltipGroup().equals(otherGroup)) {
+                            name = supported.getTooltipGroup();
+                            break;
+                        }
+                    }
+                }
+
+                if (namesAdded.add(name)) {
+                    // append the supported count only if its > 1
+                    if (supported.maxCount > 1) {
+                        name = name.deepCopy().appendText(" (" + supported.maxCount + ")");
+                    }
+                    supportedTooltipLines.add(name);
+                }
+            }
         }
+
+        return supportedTooltipLines;
     }
 
     public int getTier() {
         return this.tier;
     }
+
+    public static class Supported {
+        private final Item item;
+        private final Block block;
+        private final int maxCount;
+        // Translation key of the tooltip group
+        @Nullable
+        private final String tooltipGroup;
+
+        public Supported(Item item, int maxCount, @Nullable String tooltipGroup) {
+            this.item = item;
+            if (item.getItem() instanceof BlockItem) {
+                this.block = ((BlockItem) item.getItem()).getBlock();
+            } else {
+                this.block = null;
+            }
+            this.maxCount = maxCount;
+            this.tooltipGroup = tooltipGroup;
+        }
+
+        public int getMaxCount() {
+            return maxCount;
+        }
+
+        public boolean isSupported(Block block) {
+            return block != null && this.block == block;
+        }
+
+        public boolean isSupported(Item item) {
+            return item != null && this.item == item;
+        }
+
+        public ITextComponent getTooltipGroup() {
+            return this.tooltipGroup != null ? new TranslationTextComponent(this.tooltipGroup) : null;
+        }
+
+    }
+
 }

src/api/java/appeng/api/crafting/ICraftingHelper.java

@@ -0,0 +1,108 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 TeamAppliedEnergistics
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package appeng.api.crafting;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.ICraftingRecipe;
+import net.minecraft.world.World;
+
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.api.storage.data.IAEItemStack;
+
+public interface ICraftingHelper {
+
+    /**
+     * Checks that the given item stack is an encoded pattern.
+     */
+    boolean isEncodedPattern(@Nullable IAEItemStack item);
+
+    /**
+     * Checks that the given item stack is an encoded pattern.
+     */
+    boolean isEncodedPattern(ItemStack item);
+
+    /**
+     * Encodes a processing pattern which represents the ability to convert the
+     * given inputs into the given outputs using some process external to the ME
+     * system.
+     *
+     * @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.
+     * @return A new encoded pattern, or the given stack with the pattern encoded in
+     *         it.
+     */
+    ItemStack encodeProcessingPattern(@Nullable ItemStack stack, ItemStack[] in, ItemStack[] out);
+
+    /**
+     * Encodes a crafting pattern which represents a Vanilla crafting recipe.
+     *
+     * @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.
+     * @param recipe           The Vanilla crafting recipe to be encoded.
+     * @param in               The items in the crafting grid, which are used to
+     *                         determine what items are supplied from the ME system
+     *                         to craft using this pattern.
+     * @param out              What is to be expected as the result of this crafting
+     *                         operation by the ME system.
+     * @param allowSubstitutes Controls whether the ME system will allow the use of
+     *                         equivalent items to craft this recipe.
+     */
+    ItemStack encodeCraftingPattern(@Nullable ItemStack stack, ICraftingRecipe recipe, ItemStack[] in, ItemStack out,
+            boolean allowSubstitutes);
+
+    /**
+     * Same as {@link #decodePattern(ItemStack, World, boolean)} with no auto
+     * recovery of changed recipe ids.
+     */
+    @Nullable
+    default ICraftingPatternDetails decodePattern(@Nonnull ItemStack itemStack, @Nonnull World world) {
+        return decodePattern(itemStack, world, false);
+    }
+
+    /**
+     * Decodes an encoded crafting pattern and returns the pattern details.
+     * <p>
+     * The item backing the {@link ItemStack} needs to be an item returned by the
+     * encode methods of this class.
+     *
+     * @param itemStack    pattern
+     * @param world        world used to access the
+     *                     {@link net.minecraft.item.crafting.RecipeManager}.
+     * @param autoRecovery If true, the method will try to recover from changed
+     *                     recipe ids by searching the entire recipe manager for a
+     *                     recipe matching the inputs. If this is successful, the
+     *                     given item stack will be changed to reflect the new
+     *                     recipe id.
+     * @return The pattern details if the pattern could be decoded. Otherwise null.
+     */
+    @Nullable
+    ICraftingPatternDetails decodePattern(@Nonnull ItemStack itemStack, @Nonnull World world, boolean autoRecovery);
+
+}

src/api/java/appeng/api/definitions/IItemDefinition.java

@@ -30,10 +30,11 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IItemProvider;
 
 import appeng.api.features.AEFeature;
 
-public interface IItemDefinition extends IComparableDefinition {
+public interface IItemDefinition extends IComparableDefinition, IItemProvider {
     /**
      * @return the unique name of the definition which will be used to register the
      *         underlying structure. Will never be null
@@ -63,4 +64,10 @@ public interface IItemDefinition extends IComparableDefinition {
      * @return an immutable set of the features of this item
      */
     Set<AEFeature> features();
+
+    @Override
+    default Item asItem() {
+        return item();
+    }
+
 }

src/api/java/appeng/api/features/IRegistryContainer.java

@@ -23,7 +23,6 @@
 
 package appeng.api.features;
 
-import appeng.api.AEInjectable;
 import appeng.api.movable.IMovableRegistry;
 import appeng.api.networking.IGridCacheRegistry;
 import appeng.api.parts.IPartModels;
@@ -36,7 +35,6 @@ import appeng.api.storage.ICellRegistry;
  * @version 7
  * @since rv0
  */
-@AEInjectable
 public interface IRegistryContainer {
 
     /**

src/api/java/appeng/api/implementations/ICraftingPatternItem.java

@@ -1,46 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.implementations;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import appeng.api.networking.crafting.ICraftingPatternDetails;
-
-/**
- * Implemented on {@link Item}
- */
-public interface ICraftingPatternItem {
-
-    /**
-     * Access Details about a pattern
-     *
-     * @param is pattern
-     * @param w  crafting world
-     *
-     * @return details of pattern
-     */
-    ICraftingPatternDetails getPatternForItem(ItemStack is, World w);
-}

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

@@ -28,18 +28,25 @@ import javax.annotation.Nonnull;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.storage.IStorageChannel;
+import appeng.api.storage.cells.ICellHandler;
+import appeng.api.storage.cells.ICellInventory;
 import appeng.api.storage.cells.ICellWorkbenchItem;
 import appeng.api.storage.data.IAEStack;
 
 /**
  * Any item which implements this can be treated as an IMEInventory via
- * Util.getCell / Util.isCell It automatically handles the internals and NBT
- * data, which is both nice, and bad for you!
+ * {@link ICellHandler#getCellInventory(ItemStack, appeng.api.storage.cells.ISaveProvider, IStorageChannel)}
+ * or {@link ICellHandler#isCell(ItemStack)}. It automatically handles the
+ * internals and NBT data, which is both nice, and bad for you!
  *
  * Good cause it means you don't have to do anything, bad because you have
  * little to no control over it.
- *
- * The standard AE implementation only provides 1-63 Types
+ * 
+ * Limited to {@link Integer} internally for most calculations. E.g. if the used
+ * or remaining bytes would overflow {@link Integer#MAX_VALUE} the behaviour is
+ * no longer specified. Even if {@link ICellInventory} is using {@link Long}.
+ * 
+ * The standard AE implementation also only provides 1-63 Types.
  */
 public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem {
 

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

@@ -91,16 +91,6 @@ public interface IGridBlock {
      */
     void onGridNotification(@Nonnull GridNotification notification);
 
-    /**
-     * Update Blocks network/connection/booting status. grid,
-     *
-     * @param grid          grid
-     * @param channelsInUse used channels
-     * @deprecated to be removed in rv7
-     */
-    @Deprecated
-    void setNetworkStatus(IGrid grid, int channelsInUse);
-
     /**
      * Determine which sides of the block can be connected too, only used when
      * isWorldAccessible returns true, not used for {@link IPart} implementations.

src/api/java/appeng/api/networking/IGridCacheFactory.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2013 - 2015 AlgorithmX2
+ * Copyright (c) 2013 AlgorithmX2
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,20 +21,23 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package appeng.api.recipes;
-
-import java.io.BufferedReader;
+package appeng.api.networking;
 
 import javax.annotation.Nonnull;
 
-@Deprecated
-public interface IRecipeLoader {
+/**
+ * A factory for grid cache implementations.
+ */
+@FunctionalInterface
+public interface IGridCacheFactory<T extends IGridCache> {
+
     /**
-     * @param filePath the path to the to be loaded file
+     * Creates a grid cache for the given grid.
      *
-     * @return reader handler of the file
-     *
-     * @throws Exception if reading goes wrong
+     * @param grid The grid for which the cache should be created.
+     * @return A new grid cache instance.
      */
-    BufferedReader getFile(@Nonnull String filePath) throws Exception;
+    @Nonnull
+    T createCache(IGrid grid);
+
 }

src/api/java/appeng/api/networking/IGridCacheRegistry.java

@@ -36,10 +36,10 @@ public interface IGridCacheRegistry {
      * Register a new grid cache for use during operation, must be called during the
      * loading phase.
      *
-     * @param iface grid cache class
+     * @param iface   grid cache class
+     * @param factory Factory for creating a new instance for each constructed grid
      */
-    void registerGridCache(@Nonnull Class<? extends IGridCache> iface,
-            @Nonnull Class<? extends IGridCache> implementation);
+    <T extends IGridCache> void registerGridCache(@Nonnull Class<T> iface, @Nonnull IGridCacheFactory<T> factory);
 
     /**
      * requests a new INSTANCE of a grid cache for use, used internally

src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java

@@ -27,18 +27,19 @@ import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import appeng.api.implementations.ICraftingPatternItem;
 import appeng.api.storage.data.IAEItemStack;
 
 /**
- * do not implement provided by {@link ICraftingPatternItem}
- *
- * caching this INSTANCE will increase performance of validation and checks.
+ * Describes a crafting or processing pattern decoded by
+ * {@link appeng.api.crafting.ICraftingHelper}.
+ * <p>
+ * Do not cache instances of this class unless you handle recipe reloads on the
+ * server and client correctly.
  */
 public interface ICraftingPatternDetails {
 
     /**
-     * @return source item.
+     * @return encodes this crafting pattern into a new item stack.
      */
     ItemStack getPattern();
 
@@ -52,7 +53,9 @@ public interface ICraftingPatternDetails {
     boolean isValidItemForSlot(int slotIndex, ItemStack itemStack, World world);
 
     /**
-     * @return if this pattern is a crafting pattern ( work bench )
+     * @return if this pattern is for a Vanilla
+     *         {@link net.minecraft.item.crafting.IRecipeType#CRAFTING crafting
+     *         recipe}.
      */
     boolean isCraftable();
 

src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java

@@ -23,6 +23,7 @@
 
 package appeng.api.networking.crafting;
 
+import appeng.api.crafting.ICraftingHelper;
 import appeng.api.storage.data.IAEItemStack;
 
 /**
@@ -33,6 +34,9 @@ public interface ICraftingProviderHelper {
 
     /**
      * Add new Pattern to AE's crafting cache.
+     * 
+     * This will only accept instances created by
+     * {@link ICraftingHelper#decodePattern(net.minecraft.item.ItemStack, net.minecraft.world.World)}
      */
     void addCraftingOption(ICraftingMedium medium, ICraftingPatternDetails api);
 

src/api/java/appeng/api/networking/security/IActionHost.java

@@ -23,7 +23,6 @@
 
 package appeng.api.networking.security;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import appeng.api.networking.IGridNode;

src/api/java/appeng/api/parts/ICustomCableConnection.java

@@ -31,6 +31,6 @@ public interface ICustomCableConnection {
      * @return This controls the cable connection to the node. -1 to render
      *         connection yourself.
      */
-    public float getCableConnectionLength(AECableType cable);
+    float getCableConnectionLength(AECableType cable);
 
 }

src/api/java/appeng/api/parts/IFacadePart.java

@@ -24,7 +24,6 @@
 package appeng.api.parts;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 

src/api/java/appeng/api/parts/IPart.java

@@ -32,6 +32,7 @@ import javax.annotation.Nonnull;
 import com.mojang.blaze3d.matrix.MatrixStack;
 
 import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.crash.CrashReportCategory;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -278,7 +279,7 @@ public interface IPart extends ICustomCableConnection {
      *         the node. -1 to render connection yourself.
      */
     @Override
-    public float getCableConnectionLength(AECableType cable);
+    float getCableConnectionLength(AECableType cable);
 
     /**
      * same as Block.animateTick, for but parts.
@@ -371,4 +372,14 @@ public interface IPart extends ICustomCableConnection {
      */
     void getBoxes(final IPartCollisionHelper bch);
 
+    /**
+     * This will be used by the core to add information about this part to a crash
+     * report if it is attached to a host that caused a crash during tick
+     * processing.
+     *
+     * @param section The crash report section the information will be added to.
+     */
+    default void addEntityCrashInfo(final CrashReportCategory section) {
+    }
+
 }

src/api/java/appeng/api/parts/IPartModels.java

@@ -23,13 +23,10 @@ import java.util.Collection;
 
 import net.minecraft.util.ResourceLocation;
 
-import appeng.api.AEInjectable;
-
 /**
  * Allows registration of part models that can then be used in
  * {@link IPart#getStaticModels()}.
  */
-@AEInjectable
 public interface IPartModels {
 
     /**

src/api/java/appeng/api/recipes/ICraftHandler.java

@@ -1,54 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.recipes;
-
-import java.util.List;
-
-import appeng.api.exceptions.MissingIngredientException;
-import appeng.api.exceptions.RecipeException;
-import appeng.api.exceptions.RegistrationException;
-
-@Deprecated
-public interface ICraftHandler {
-
-    /**
-     * Called when your recipe handler receives a newly parsed list of
-     * inputs/outputs.
-     *
-     * @param input  parsed inputs
-     * @param output parsed outputs
-     *
-     * @throws RecipeException
-     */
-    void setup(List<List<IIngredient>> input, List<List<IIngredient>> output) throws RecipeException;
-
-    /**
-     * called when all recipes are parsed, and your required to register your
-     * recipe.
-     *
-     * @throws RegistrationException
-     * @throws MissingIngredientException
-     */
-    void register() throws RegistrationException, MissingIngredientException;
-}

src/api/java/appeng/api/recipes/IIngredient.java

@@ -1,92 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.recipes;
-
-import net.minecraft.item.ItemStack;
-
-import appeng.api.exceptions.MissingIngredientException;
-import appeng.api.exceptions.RegistrationException;
-
-@Deprecated
-public interface IIngredient {
-
-    /**
-     * Acquire a single input stack for the current recipe, if more then one
-     * ItemStack is possible a RegistrationError exception will be thrown, ignore
-     * these and let the system handle the error.
-     *
-     * @return a single ItemStack for the recipe handler.
-     *
-     * @throws RegistrationException
-     * @throws MissingIngredientException
-     */
-    ItemStack getItemStack() throws RegistrationException, MissingIngredientException;
-
-    /**
-     * Acquire a list of all the input stacks for the current recipe, this is for
-     * handlers that support multiple inputs per slot.
-     *
-     * @return an array of ItemStacks for the recipe handler.
-     *
-     * @throws RegistrationException
-     * @throws MissingIngredientException
-     */
-    ItemStack[] getItemStackSet() throws RegistrationException, MissingIngredientException;
-
-    /**
-     * If you wish to support air, you must test before getting the ItemStack, or
-     * ItemStackSet
-     *
-     * @return true if this slot contains no ItemStack, this is passed as "_"
-     */
-    boolean isAir();
-
-    /**
-     * @return The Name Space of the item. Prefer getItemStack or getItemStackSet
-     */
-    String getNameSpace();
-
-    /**
-     * @return The Name of the item. Prefer getItemStack or getItemStackSet
-     */
-    String getItemName();
-
-    /**
-     * @return The Damage Value of the item. Prefer getItemStack or getItemStackSet
-     */
-    int getDamageValue();
-
-    /**
-     * @return The Damage Value of the item. Prefer getItemStack or getItemStackSet
-     */
-    int getQty();
-
-    /**
-     * Bakes the lists in for faster runtime look-ups.
-     *
-     * @throws MissingIngredientException
-     * @throws RegistrationException
-     */
-    void bake() throws RegistrationException, MissingIngredientException;
-}

src/api/java/appeng/api/recipes/IRecipeHandler.java

@@ -1,44 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.recipes;
-
-/**
- * Represents the AE2 Recipe Loading/Reading Class
- */
-@Deprecated
-public interface IRecipeHandler {
-
-    /**
-     * Call when you want to read recipes in from a file based on a loader
-     *
-     * @param loader recipe loader
-     * @param path   path of file
-     */
-    void parseRecipes(IRecipeLoader loader, String path);
-
-    /**
-     * this loads the read recipes into minecraft, should be called in Init.
-     */
-    void injectRecipes();
-}

src/api/java/appeng/api/recipes/ResolverResult.java

@@ -1,45 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.recipes;
-
-import net.minecraft.nbt.CompoundNBT;
-
-public class ResolverResult {
-
-    public final String itemName;
-    public final int damageValue;
-    public final CompoundNBT compound;
-
-    public ResolverResult(final String name, final int damage) {
-        this.itemName = name;
-        this.damageValue = damage;
-        this.compound = null;
-    }
-
-    public ResolverResult(final String name, final int damage, final CompoundNBT data) {
-        this.itemName = name;
-        this.damageValue = damage;
-        this.compound = data;
-    }
-}

src/api/java/appeng/api/recipes/ResolverResultSet.java

@@ -1,40 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2013 AlgorithmX2
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package appeng.api.recipes;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-
-public class ResolverResultSet {
-
-    public final String name;
-    public final List<ItemStack> results;
-
-    public ResolverResultSet(final String myName, final ItemStack... set) {
-        this.results = Arrays.asList(set);
-        this.name = myName;
-    }
-}

src/api/java/appeng/api/storage/cells/CellState.java

@@ -50,5 +50,5 @@ public enum CellState {
     /**
      * Full cell, technically could have free types
      */
-    FULL,
+    FULL;
 }

src/api/java/appeng/api/storage/data/IAEItemStack.java

@@ -106,4 +106,13 @@ public interface IAEItemStack extends IAEStack<IAEItemStack> {
      * @return definition stack
      */
     ItemStack getDefinition();
+
+    /**
+     * Compare this AE item stack to another item stack, but ignores the amount. It
+     * checks the item type, NBT and damage values.
+     *
+     * @param is An item stack
+     */
+    boolean equals(ItemStack is);
+
 }

src/api/java/appeng/api/storage/data/IAEStack.java

@@ -179,17 +179,7 @@ public interface IAEStack<T extends IAEStack<T>> {
     T empty();
 
     /**
-     * @return true if the stack is a {@link IAEItemStack}
-     */
-    boolean isItem();
-
-    /**
-     * @return true if the stack is a {@link IAEFluidStack}
-     */
-    boolean isFluid();
-
-    /**
-     * @return ITEM or FLUID
+     * @return The {@link IStorageChannel} backing this stack.
      */
     IStorageChannel<T> getChannel();
 

src/main/java/appeng/block/AEBaseBlock.java

@@ -18,22 +18,14 @@
 
 package appeng.block;
 
-import javax.annotation.Nullable;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.material.MaterialColor;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
@@ -41,13 +33,11 @@ import net.minecraftforge.common.ToolType;
 
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
-import appeng.helpers.AEGlassMaterial;
+import appeng.helpers.AEMaterials;
 import appeng.util.Platform;
 
 public abstract class AEBaseBlock extends Block {
 
-    private boolean isOpaque = true;
-    private boolean isFullSize = true;
     private boolean isInventory = false;
 
     protected AEBaseBlock(final Block.Properties props) {
@@ -74,7 +64,7 @@ public abstract class AEBaseBlock extends Block {
     }
 
     private static SoundType getDefaultSoundByMaterial(Material mat) {
-        if (mat == AEGlassMaterial.INSTANCE || mat == Material.GLASS) {
+        if (mat == AEMaterials.GLASS || mat == Material.GLASS) {
             return SoundType.GLASS;
         } else if (mat == Material.ROCK) {
             return SoundType.STONE;
@@ -85,11 +75,6 @@ public abstract class AEBaseBlock extends Block {
         }
     }
 
-    @Override
-    public boolean isNormalCube(BlockState state, IBlockReader worldIn, BlockPos pos) {
-        return this.isFullSize() && this.isOpaque();
-    }
-
     @Override
     public boolean hasComparatorInputOverride(BlockState state) {
         return this.isInventory();
@@ -129,11 +114,6 @@ public abstract class AEBaseBlock extends Block {
         return false;
     }
 
-    public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand,
-            final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) {
-        return ActionResultType.PASS;
-    }
-
     public final Direction mapRotation(final IOrientable ori, final Direction dir) {
         // case DOWN: return bottomIcon;
         // case UP: return blockIcon;
@@ -219,24 +199,6 @@ public abstract class AEBaseBlock extends Block {
         return true;
     }
 
-    protected boolean isOpaque() {
-        return this.isOpaque;
-    }
-
-    protected boolean setOpaque(final boolean isOpaque) {
-        this.isOpaque = isOpaque;
-        return isOpaque;
-    }
-
-    protected boolean isFullSize() {
-        return this.isFullSize;
-    }
-
-    protected boolean setFullSize(final boolean isFullSize) {
-        this.isFullSize = isFullSize;
-        return isFullSize;
-    }
-
     protected boolean isInventory() {
         return this.isInventory;
     }

src/main/java/appeng/block/AEBaseBlockItem.java

@@ -129,7 +129,7 @@ public class AEBaseBlockItem extends BlockItem {
         }
 
         ActionResultType result = super.tryPlace(context);
-        if (result != ActionResultType.SUCCESS) {
+        if (!result.isSuccessOrConsume()) {
             return result;
         }
 
@@ -139,7 +139,7 @@ public class AEBaseBlockItem extends BlockItem {
             ori = tile;
 
             if (tile == null) {
-                return ActionResultType.SUCCESS;
+                return result;
             }
 
             if (ori.canBeRotated() && !this.blockType.hasCustomRotation()) {
@@ -155,7 +155,7 @@ public class AEBaseBlockItem extends BlockItem {
             ori.setOrientation(forward, up);
         }
 
-        return ActionResultType.SUCCESS;
+        return result;
 
     }
 }

src/main/java/appeng/block/AEBaseBlockItemChargeable.java

@@ -32,12 +32,12 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerUnits;
 import appeng.api.definitions.IBlockDefinition;
 import appeng.api.implementations.items.IAEItemPowerStorage;
+import appeng.core.Api;
 import appeng.core.localization.GuiText;
 
 public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEItemPowerStorage {
@@ -123,7 +123,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte
 
     private double getMaxEnergyCapacity() {
         final Block blockID = Block.getBlockFromItem(this);
-        final IBlockDefinition energyCell = AEApi.instance().definitions().blocks().energyCell();
+        final IBlockDefinition energyCell = Api.instance().definitions().blocks().energyCell();
 
         return energyCell.maybeBlock().map(block -> {
             if (blockID == block) {

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

@@ -278,6 +278,11 @@ public abstract class AEBaseTileBlock<T extends AEBaseTileEntity> extends AEBase
         return this.onActivated(world, pos, player, hand, player.getHeldItem(hand), hit);
     }
 
+    public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand,
+            final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) {
+        return ActionResultType.PASS;
+    }
+
     @Override
     public IOrientable getOrientable(final IBlockReader w, final BlockPos pos) {
         return this.getTileEntity(w, pos);

src/main/java/appeng/block/crafting/CraftingStorageItem.java

@@ -21,10 +21,10 @@ package appeng.block.crafting;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
-import appeng.api.AEApi;
 import appeng.api.features.AEFeature;
 import appeng.block.AEBaseBlockItem;
 import appeng.core.AEConfig;
+import appeng.core.Api;
 
 public class CraftingStorageItem extends AEBaseBlockItem {
 
@@ -34,7 +34,7 @@ public class CraftingStorageItem extends AEBaseBlockItem {
 
     @Override
     public ItemStack getContainerItem(final ItemStack itemStack) {
-        return AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1).orElse(ItemStack.EMPTY);
+        return Api.instance().definitions().blocks().craftingUnit().maybeStack(1).orElse(ItemStack.EMPTY);
     }
 
     @Override

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

@@ -49,13 +49,13 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.api.AEApi;
 import appeng.api.util.AEAxisAlignedBB;
 import appeng.block.AEBaseTileBlock;
 import appeng.client.render.effects.ParticleTypes;
 import appeng.client.render.renderable.ItemRenderable;
 import appeng.client.render.tesr.ModularTESR;
 import appeng.core.AEConfig;
+import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.tile.misc.ChargerTileEntity;
 import appeng.util.Platform;
@@ -64,8 +64,6 @@ public class ChargerBlock extends AEBaseTileBlock<ChargerTileEntity> {
 
     public ChargerBlock() {
         super(defaultProps(Material.IRON).notSolid());
-
-        this.setFullSize(this.setOpaque(false));
     }
 
     @Override
@@ -103,7 +101,7 @@ public class ChargerBlock extends AEBaseTileBlock<ChargerTileEntity> {
 
         final ChargerTileEntity tile = this.getTileEntity(w, pos);
         if (tile != null) {
-            if (AEApi.instance().definitions().materials().certusQuartzCrystalCharged()
+            if (Api.instance().definitions().materials().certusQuartzCrystalCharged()
                     .isSameAs(tile.getInternalInventory().getStackInSlot(0))) {
                 final double xOff = 0.0;
                 final double yOff = 0.0;

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

@@ -81,7 +81,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock
 
     public QuartzFixtureBlock() {
         super(defaultProps(Material.MISCELLANEOUS).doesNotBlockMovement().hardnessAndResistance(0).lightValue(14)
-                .sound(SoundType.GLASS));
+                .sound(SoundType.GLASS).notSolid());
 
         this.setDefaultState(getDefaultState().with(FACING, Direction.UP).with(ODD, false));
     }
@@ -199,9 +199,4 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock
         return new MetaRotation(w, pos, FACING);
     }
 
-    @Override
-    public boolean isOpaque() {
-        return false;
-    }
-
 }

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

@@ -18,10 +18,9 @@
 
 package appeng.block.misc;
 
-import javax.annotation.Nullable;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -52,8 +51,7 @@ public class TinyTNTBlock extends AEBaseBlock {
             .create(new AxisAlignedBB(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f));
 
     public TinyTNTBlock(Block.Properties props) {
-        super(props);
-        setFullSize(setOpaque(false));
+        super(defaultProps(Material.TNT).notSolid());
     }
 
     @Override
@@ -67,17 +65,18 @@ public class TinyTNTBlock extends AEBaseBlock {
     }
 
     @Override
-    public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand,
-            final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) {
-        if (heldItem != null && heldItem.getItem() == Items.FLINT_AND_STEEL) {
-            this.startFuse(w, pos, player);
-            w.removeBlock(pos, false);
+    public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player,
+            Hand handIn, BlockRayTraceResult hit) {
+        ItemStack heldItem = player.getHeldItem(handIn);
+        if (!heldItem.isEmpty() && heldItem.getItem() == Items.FLINT_AND_STEEL) {
+            this.startFuse(world, pos, player);
+            world.removeBlock(pos, false);
             heldItem.damageItem(1, player, p -> {
-                p.sendBreakAnimation(hand);
+                p.sendBreakAnimation(handIn);
             }); // FIXME Check if onBroken is equivalent
             return ActionResultType.SUCCESS;
         } else {
-            return super.onActivated(w, pos, player, hand, heldItem, hit);
+            return super.onBlockActivated(state, world, pos, player, handIn, hit);
         }
     }
 

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

@@ -18,7 +18,6 @@
 
 package appeng.block.networking;
 
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 
@@ -44,8 +43,11 @@ import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.*;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.RayTraceResult.Type;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.shapes.ISelectionContext;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
@@ -68,7 +70,7 @@ import appeng.client.render.cablebus.CableBusBreakingParticle;
 import appeng.client.render.cablebus.CableBusRenderState;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ClickPacket;
-import appeng.helpers.AEGlassMaterial;
+import appeng.helpers.AEMaterials;
 import appeng.integration.abstraction.IAEFacade;
 import appeng.parts.ICableBusContainer;
 import appeng.parts.NullCableBusContainer;
@@ -81,7 +83,7 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
     private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
 
     public CableBusBlock() {
-        super(defaultProps(AEGlassMaterial.INSTANCE).notSolid().noDrops());
+        super(defaultProps(AEMaterials.GLASS).notSolid().noDrops().variableOpacity());
     }
 
     @Override
@@ -158,11 +160,12 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
     @Override
     public boolean canConnectRedstone(final BlockState state, final IBlockReader w, final BlockPos pos,
             Direction side) {
+        // TODO: Verify this.
         if (side == null) {
-            side = Direction.UP;
+            return false;
         }
 
-        return this.cb(w, pos).canConnectRedstone(EnumSet.of(side));
+        return this.cb(w, pos).canConnectRedstone(side.getOpposite());
     }
 
     @Override

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

@@ -19,12 +19,12 @@
 package appeng.block.networking;
 
 import appeng.block.AEBaseTileBlock;
-import appeng.helpers.AEGlassMaterial;
+import appeng.helpers.AEMaterials;
 import appeng.tile.networking.CreativeEnergyCellTileEntity;
 
 public class CreativeEnergyCellBlock extends AEBaseTileBlock<CreativeEnergyCellTileEntity> {
 
     public CreativeEnergyCellBlock() {
-        super(defaultProps(AEGlassMaterial.INSTANCE));
+        super(defaultProps(AEMaterials.GLASS));
     }
 }

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

@@ -30,7 +30,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.block.AEBaseTileBlock;
-import appeng.helpers.AEGlassMaterial;
+import appeng.helpers.AEMaterials;
 import appeng.tile.networking.EnergyCellTileEntity;
 
 public class EnergyCellBlock extends AEBaseTileBlock<EnergyCellTileEntity> {
@@ -38,7 +38,7 @@ public class EnergyCellBlock extends AEBaseTileBlock<EnergyCellTileEntity> {
     public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, 7);
 
     public EnergyCellBlock() {
-        super(defaultProps(AEGlassMaterial.INSTANCE));
+        super(defaultProps(AEMaterials.GLASS));
     }
 
     @Override

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

@@ -40,7 +40,7 @@ import appeng.block.AEBaseTileBlock;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.implementations.WirelessContainer;
-import appeng.helpers.AEGlassMaterial;
+import appeng.helpers.AEMaterials;
 import appeng.tile.networking.WirelessTileEntity;
 import appeng.util.Platform;
 
@@ -58,9 +58,7 @@ public class WirelessBlock extends AEBaseTileBlock<WirelessTileEntity> {
     public static final EnumProperty<State> STATE = EnumProperty.create("state", State.class);
 
     public WirelessBlock() {
-        super(defaultProps(AEGlassMaterial.INSTANCE).notSolid());
-        this.setFullSize(false);
-        this.setOpaque(false);
+        super(defaultProps(AEMaterials.GLASS).notSolid());
         this.setDefaultState(this.getDefaultState().with(STATE, State.OFF));
     }
 

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

@@ -42,9 +42,7 @@ import appeng.util.Platform;
 
 public class PaintSplotchesBlock extends AEBaseTileBlock<PaintSplotchesTileEntity> {
     public PaintSplotchesBlock() {
-        super(defaultProps(Material.WATER, MaterialColor.AIR));
-        this.setFullSize(false);
-        this.setOpaque(false);
+        super(defaultProps(Material.WATER, MaterialColor.AIR).notSolid());
     }
 
     @Override

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

@@ -25,8 +25,8 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.data.IDynamicBakedModel;
 import net.minecraftforge.client.model.data.IModelData;
 
-import appeng.api.AEApi;
 import appeng.client.render.cablebus.CubeBuilder;
+import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.tile.qnb.QuantumBridgeTileEntity;
 
@@ -73,7 +73,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
         this.coveredCableTexture = bakedTextureGetter.apply(TEXTURE_COVERED_CABLE);
         this.lightTexture = bakedTextureGetter.apply(TEXTURE_RING_LIGHT);
         this.lightCornerTexture = bakedTextureGetter.apply(TEXTURE_RING_LIGHT_CORNER);
-        this.linkBlock = AEApi.instance().definitions().blocks().quantumLink().maybeBlock().orElse(null);
+        this.linkBlock = Api.instance().definitions().blocks().quantumLink().maybeBlock().orElse(null);
     }
 
     @Override

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

@@ -46,7 +46,6 @@ public abstract class QuantumBaseBlock extends AEBaseTileBlock<QuantumBridgeTile
 
     public QuantumBaseBlock(Block.Properties props) {
         super(props);
-        this.setFullSize(this.setOpaque(false));
         this.setDefaultState(this.getDefaultState().with(FORMED, false));
     }
 

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

@@ -41,7 +41,7 @@ import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.implementations.QNBContainer;
 import appeng.core.AppEng;
-import appeng.helpers.AEGlassMaterial;
+import appeng.helpers.AEMaterials;
 import appeng.tile.qnb.QuantumBridgeTileEntity;
 import appeng.util.Platform;
 
@@ -56,7 +56,7 @@ public class QuantumLinkChamberBlock extends QuantumBaseBlock {
     }
 
     public QuantumLinkChamberBlock() {
-        super(defaultProps(AEGlassMaterial.INSTANCE));
+        super(defaultProps(AEMaterials.GLASS));
     }
 
     @Override

src/main/java/appeng/block/spatial/SpatialPylonBlock.java

@@ -25,13 +25,13 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
 import appeng.block.AEBaseTileBlock;
-import appeng.helpers.AEGlassMaterial;
+import appeng.helpers.AEMaterials;
 import appeng.tile.spatial.SpatialPylonTileEntity;
 
 public class SpatialPylonBlock extends AEBaseTileBlock<SpatialPylonTileEntity> {
 
     public SpatialPylonBlock() {
-        super(defaultProps(AEGlassMaterial.INSTANCE));
+        super(defaultProps(AEMaterials.GLASS));
     }
 
     @Override

src/main/java/appeng/block/storage/DriveSlotCellType.java

@@ -1,45 +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.block.storage;
-
-import net.minecraft.util.IStringSerializable;
-
-/**
- * Describes the type of cell present in a slot.
- */
-public enum DriveSlotCellType implements IStringSerializable {
-
-    EMPTY("empty"),
-
-    ITEM("item"),
-
-    FLUID("fluid");
-
-    private final String name;
-
-    DriveSlotCellType(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-}

src/main/java/appeng/block/storage/DriveSlotState.java

@@ -37,6 +37,9 @@ public enum DriveSlotState implements IStringSerializable {
     // Online and free space
     ONLINE("online"),
 
+    // Online and not space
+    NOT_EMPTY("not_empty"),
+
     // Types full, space left
     TYPES_FULL("types_full"),
 
@@ -60,8 +63,9 @@ public enum DriveSlotState implements IStringSerializable {
             case ABSENT:
                 return DriveSlotState.EMPTY;
             case EMPTY:
-            case NOT_EMPTY:
                 return DriveSlotState.ONLINE;
+            case NOT_EMPTY:
+                return DriveSlotState.NOT_EMPTY;
             case TYPES_FULL:
                 return DriveSlotState.TYPES_FULL;
             case FULL:

src/main/java/appeng/capabilities/Capabilities.java

@@ -25,7 +25,6 @@ import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.energy.IEnergyStorage;
 
-import appeng.api.storage.ISpatialDimension;
 import appeng.api.storage.IStorageMonitorableAccessor;
 
 /**
@@ -38,8 +37,6 @@ public final class Capabilities {
 
     public static Capability<IStorageMonitorableAccessor> STORAGE_MONITORABLE_ACCESSOR;
 
-    public static Capability<ISpatialDimension> SPATIAL_DIMENSION;
-
     public static Capability<IEnergyStorage> FORGE_ENERGY;
 
     /**
@@ -48,7 +45,6 @@ public final class Capabilities {
     public static void register() {
         CapabilityManager.INSTANCE.register(IStorageMonitorableAccessor.class, createNullStorage(),
                 NullMENetworkAccessor::new);
-        CapabilityManager.INSTANCE.register(ISpatialDimension.class, createNullStorage(), NullSpatialDimension::new);
     }
 
     @CapabilityInject(IStorageMonitorableAccessor.class)
@@ -56,11 +52,6 @@ public final class Capabilities {
         STORAGE_MONITORABLE_ACCESSOR = cap;
     }
 
-    @CapabilityInject(ISpatialDimension.class)
-    private static void capISpatialDimensionRegistered(Capability<ISpatialDimension> cap) {
-        SPATIAL_DIMENSION = cap;
-    }
-
     @CapabilityInject(IEnergyStorage.class)
     private static void capIEnergyStorageRegistered(Capability<IEnergyStorage> cap) {
         FORGE_ENERGY = cap;

src/main/java/appeng/capabilities/NullSpatialDimension.java

@@ -1,63 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2017, 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.capabilities;
-
-import java.util.List;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.world.dimension.DimensionType;
-import net.minecraft.world.server.ServerWorld;
-
-import appeng.api.storage.ISpatialDimension;
-
-class NullSpatialDimension implements ISpatialDimension {
-    @Override
-    public DimensionType createNewCellDimension(BlockPos size) {
-        return null;
-    }
-
-    @Override
-    public void deleteCellDimension(DimensionType cellStorageId) {
-    }
-
-    @Override
-    public BlockPos getCellDimensionOrigin(DimensionType cellStorageId) {
-        return null;
-    }
-
-    @Override
-    public BlockPos getCellDimensionSize(DimensionType cellDim) {
-        return BlockPos.ZERO;
-    }
-
-    @Override
-    public void addCellDimensionTooltip(DimensionType cellDim, List<ITextComponent> tooltip) {
-    }
-
-    @Override
-    public ServerWorld getWorld(DimensionType cellStorageId) {
-        return null;
-    }
-
-    @Override
-    public boolean isCellDimension(DimensionType cellDimID) {
-        return false;
-    }
-}

src/main/java/appeng/client/ClientHelper.java

@@ -39,7 +39,10 @@ import net.minecraftforge.fml.client.registry.ClientRegistry;
 
 import appeng.api.parts.CableRenderMode;
 import appeng.block.AEBaseBlock;
-import appeng.client.render.effects.*;
+import appeng.client.render.effects.EnergyParticleData;
+import appeng.client.render.effects.LightningArcFX;
+import appeng.client.render.effects.LightningFX;
+import appeng.client.render.effects.ParticleTypes;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;

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

@@ -8,7 +8,6 @@ import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.item.ItemStack;
 
-import appeng.api.AEApi;
 import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.IParts;
 import appeng.client.gui.AEBaseScreen;
@@ -18,6 +17,7 @@ import appeng.container.implementations.CraftingTermContainer;
 import appeng.container.implementations.MEMonitorableContainer;
 import appeng.container.implementations.PatternTermContainer;
 import appeng.container.implementations.WirelessTermContainer;
+import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
 import appeng.helpers.IPriorityHost;
@@ -44,7 +44,7 @@ final class AESubScreen {
     public AESubScreen(AEBaseScreen<?> gui, Object containerTarget) {
         this.gui = gui;
 
-        final IDefinitions definitions = AEApi.instance().definitions();
+        final IDefinitions definitions = Api.instance().definitions();
         final IParts parts = definitions.parts();
 
         if (containerTarget instanceof ChestTileEntity) {

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

@@ -33,13 +33,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
-import appeng.api.AEApi;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.widgets.Scrollbar;
 import appeng.container.implementations.CraftConfirmContainer;
+import appeng.core.Api;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
@@ -51,11 +51,11 @@ public class CraftConfirmScreen extends AEBaseScreen<CraftConfirmContainer> {
 
     private final int rows = 5;
 
-    private final IItemList<IAEItemStack> storage = AEApi.instance().storage()
+    private final IItemList<IAEItemStack> storage = Api.instance().storage()
             .getStorageChannel(IItemStorageChannel.class).createList();
-    private final IItemList<IAEItemStack> pending = AEApi.instance().storage()
+    private final IItemList<IAEItemStack> pending = Api.instance().storage()
             .getStorageChannel(IItemStorageChannel.class).createList();
-    private final IItemList<IAEItemStack> missing = AEApi.instance().storage()
+    private final IItemList<IAEItemStack> missing = Api.instance().storage()
             .getStorageChannel(IItemStorageChannel.class).createList();
 
     private final List<IAEItemStack> visual = new ArrayList<>();

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

@@ -34,7 +34,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
-import appeng.api.AEApi;
 import appeng.api.config.SortDir;
 import appeng.api.config.SortOrder;
 import appeng.api.config.ViewItems;
@@ -47,6 +46,7 @@ import appeng.client.gui.widgets.ISortSource;
 import appeng.client.gui.widgets.Scrollbar;
 import appeng.container.implementations.CraftingCPUContainer;
 import appeng.core.AEConfig;
+import appeng.core.Api;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
@@ -79,11 +79,11 @@ public class CraftingCPUScreen<T extends CraftingCPUContainer> extends AEBaseScr
     private static final int ITEMSTACK_LEFT_OFFSET = 9;
     private static final int ITEMSTACK_TOP_OFFSET = 22;
 
-    private IItemList<IAEItemStack> storage = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+    private IItemList<IAEItemStack> storage = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
             .createList();
-    private IItemList<IAEItemStack> active = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+    private IItemList<IAEItemStack> active = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
             .createList();
-    private IItemList<IAEItemStack> pending = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+    private IItemList<IAEItemStack> pending = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
             .createList();
 
     private List<IAEItemStack> visual = new ArrayList<>();
@@ -100,9 +100,9 @@ public class CraftingCPUScreen<T extends CraftingCPUContainer> extends AEBaseScr
     }
 
     public void clearItems() {
-        this.storage = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
-        this.active = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
-        this.pending = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
+        this.storage = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
+        this.active = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
+        this.pending = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
         this.visual = new ArrayList<>();
     }
 

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

@@ -21,7 +21,6 @@ package appeng.client.gui.implementations;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
-import appeng.api.AEApi;
 import appeng.api.config.FullnessMode;
 import appeng.api.config.OperationMode;
 import appeng.api.config.RedstoneMode;
@@ -30,6 +29,7 @@ import appeng.api.definitions.IDefinitions;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.container.implementations.IOPortContainer;
+import appeng.core.Api;
 import appeng.core.localization.GuiText;
 
 public class IOPortScreen extends UpgradeableScreen<IOPortContainer> {
@@ -78,7 +78,7 @@ public class IOPortScreen extends UpgradeableScreen<IOPortContainer> {
     public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) {
         super.drawBG(offsetX, offsetY, mouseX, mouseY, partialTicks);
 
-        final IDefinitions definitions = AEApi.instance().definitions();
+        final IDefinitions definitions = Api.instance().definitions();
 
         definitions.items().cell1k().maybeStack(1)
                 .ifPresent(cell1kStack -> this.drawItem(offsetX + 66 - 8, offsetY + 17, cell1kStack));

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

@@ -40,7 +40,6 @@ import net.minecraft.nbt.ListNBT;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
-import appeng.api.AEApi;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.client.ActionKey;
 import appeng.client.gui.AEBaseScreen;
@@ -49,6 +48,7 @@ import appeng.client.gui.widgets.Scrollbar;
 import appeng.client.me.ClientDCInternalInv;
 import appeng.client.me.SlotDisconnected;
 import appeng.container.implementations.InterfaceTerminalContainer;
+import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
 import appeng.util.Platform;
@@ -321,7 +321,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
 
             final ItemStack parsedItemStack = ItemStack.read(outTag.getCompound(i));
             if (!parsedItemStack.isEmpty()) {
-                final String displayName = Platform.getItemDisplayName(AEApi.instance().storage()
+                final String displayName = Platform.getItemDisplayName(Api.instance().storage()
                         .getStorageChannel(IItemStorageChannel.class).createStack(parsedItemStack)).getString()
                         .toLowerCase();
                 if (displayName.contains(searchTerm)) {

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

@@ -28,7 +28,12 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 
-import appeng.api.config.*;
+import appeng.api.config.SearchBoxMode;
+import appeng.api.config.Settings;
+import appeng.api.config.SortDir;
+import appeng.api.config.SortOrder;
+import appeng.api.config.TerminalStyle;
+import appeng.api.config.ViewItems;
 import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.api.implementations.tiles.IMEChest;
 import appeng.api.implementations.tiles.IViewCellStorage;
@@ -37,7 +42,11 @@ import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;
 import appeng.client.ActionKey;
 import appeng.client.gui.AEBaseMEScreen;
-import appeng.client.gui.widgets.*;
+import appeng.client.gui.widgets.AETextField;
+import appeng.client.gui.widgets.ISortSource;
+import appeng.client.gui.widgets.Scrollbar;
+import appeng.client.gui.widgets.SettingToggleButton;
+import appeng.client.gui.widgets.TabButton;
 import appeng.client.me.InternalSlotME;
 import appeng.client.me.ItemRepo;
 import appeng.container.implementations.CraftingStatusContainer;

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

@@ -27,8 +27,6 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.util.text.ITextComponent;
 
-import appeng.api.AEApi;
-import appeng.api.config.Settings;
 import appeng.api.config.SortOrder;
 import appeng.api.config.ViewItems;
 import appeng.api.config.YesNo;
@@ -38,6 +36,7 @@ import appeng.api.storage.data.IItemList;
 import appeng.client.gui.widgets.IScrollSource;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.core.AEConfig;
+import appeng.core.Api;
 import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
 import appeng.util.prioritylist.IPartitionList;
@@ -48,8 +47,8 @@ import appeng.util.prioritylist.IPartitionList;
  * @since rv6 22/05/2018
  */
 public class FluidRepo {
-    private final IItemList<IAEFluidStack> list = AEApi.instance().storage()
-            .getStorageChannel(IFluidStorageChannel.class).createList();
+    private final IItemList<IAEFluidStack> list = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)
+            .createList();
     private final ArrayList<IAEFluidStack> view = new ArrayList<>();
     private final IScrollSource src;
     private final ISortSource sortSrc;

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

@@ -28,7 +28,6 @@ import javax.annotation.Nonnull;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 
-import appeng.api.AEApi;
 import appeng.api.config.SearchBoxMode;
 import appeng.api.config.SortOrder;
 import appeng.api.config.ViewItems;
@@ -39,6 +38,7 @@ import appeng.api.storage.data.IItemList;
 import appeng.client.gui.widgets.IScrollSource;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.core.AEConfig;
+import appeng.core.Api;
 import appeng.integration.abstraction.JEIFacade;
 import appeng.items.storage.ViewCellItem;
 import appeng.util.ItemSorters;
@@ -47,7 +47,7 @@ import appeng.util.prioritylist.IPartitionList;
 
 public class ItemRepo {
 
-    private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+    private final IItemList<IAEItemStack> list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
             .createList();
     private final ArrayList<IAEItemStack> view = new ArrayList<>();
     private final IScrollSource src;

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

@@ -24,7 +24,12 @@ import java.util.function.Function;
 
 import com.mojang.datafixers.util.Pair;
 
-import net.minecraft.client.renderer.model.*;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.client.renderer.model.IModelTransform;
+import net.minecraft.client.renderer.model.IUnbakedModel;
+import net.minecraft.client.renderer.model.ItemOverrideList;
+import net.minecraft.client.renderer.model.Material;
+import net.minecraft.client.renderer.model.ModelBakery;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModelConfiguration;

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

@@ -49,8 +49,8 @@ import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.client.model.data.IModelData;
 
-import appeng.api.AEApi;
 import appeng.api.util.AEAxisAlignedBB;
+import appeng.core.Api;
 import appeng.parts.misc.CableAnchorPart;
 import appeng.thirdparty.codechicken.lib.model.CachedFormat;
 import appeng.thirdparty.codechicken.lib.model.Quad;
@@ -108,7 +108,7 @@ public class FacadeBuilder {
             Function<ResourceLocation, IBakedModel> modelLookup) {
         BakedPipeline pipeline = this.pipelines.get();
         Quad collectorQuad = this.collectors.get();
-        boolean transparent = AEApi.instance().partHelper().getCableRenderMode().transparentFacades;
+        boolean transparent = Api.instance().partHelper().getCableRenderMode().transparentFacades;
         Map<Direction, FacadeRenderState> facadeStates = renderState.getFacades();
         List<AxisAlignedBB> partBoxes = renderState.getBoundingBoxes();
         Set<Direction> sidesWithParts = renderState.getAttachments().keySet();

src/main/java/appeng/client/render/effects/ChargedOreFX.java

@@ -28,8 +28,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.core.AppEng;
-
 @OnlyIn(Dist.CLIENT)
 public class ChargedOreFX extends RedstoneParticle {
 

src/main/java/appeng/client/render/effects/CraftingFx.java

@@ -34,8 +34,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.core.AppEng;
-
 @OnlyIn(Dist.CLIENT)
 public class CraftingFx extends SpriteTexturedParticle {
 

src/main/java/appeng/client/render/effects/EnergyFx.java

@@ -20,15 +20,17 @@ package appeng.client.render.effects;
 
 import com.mojang.blaze3d.vertex.IVertexBuilder;
 
-import net.minecraft.client.particle.*;
+import net.minecraft.client.particle.IAnimatedSprite;
+import net.minecraft.client.particle.IParticleFactory;
+import net.minecraft.client.particle.IParticleRenderType;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.particle.SpriteTexturedParticle;
 import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.core.AppEng;
-
 @OnlyIn(Dist.CLIENT)
 public class EnergyFx extends SpriteTexturedParticle {
 

src/main/java/appeng/client/render/effects/LightningArcFX.java

@@ -28,8 +28,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.core.AppEng;
-
 @OnlyIn(Dist.CLIENT)
 public class LightningArcFX extends LightningFX {
 

src/main/java/appeng/client/render/effects/LightningFX.java

@@ -37,8 +37,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.core.AppEng;
-
 @OnlyIn(Dist.CLIENT)
 public class LightningFX extends SpriteTexturedParticle {
 

src/main/java/appeng/client/render/effects/MatterCannonFX.java

@@ -18,14 +18,17 @@
 
 package appeng.client.render.effects;
 
-import net.minecraft.client.particle.*;
+import net.minecraft.client.particle.IAnimatedSprite;
+import net.minecraft.client.particle.IParticleFactory;
+import net.minecraft.client.particle.IParticleRenderType;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.particle.SpriteTexturedParticle;
 import net.minecraft.particles.BasicParticleType;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.AEPartLocation;
-import appeng.core.AppEng;
 
 public class MatterCannonFX extends SpriteTexturedParticle {
 

src/main/java/appeng/client/render/effects/VibrantFX.java

@@ -28,8 +28,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.core.AppEng;
-
 @OnlyIn(Dist.CLIENT)
 public class VibrantFX extends SpriteTexturedParticle {
 

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

@@ -31,22 +31,22 @@ import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.item.Item;
+import net.minecraft.item.Items;
 import net.minecraft.util.Direction;
 import net.minecraftforge.client.model.data.IModelData;
 import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
 
-import appeng.api.definitions.IItems;
-import appeng.block.storage.DriveSlotCellType;
 import appeng.block.storage.DriveSlotsState;
 import appeng.client.render.DelegateBakedModel;
-import appeng.core.Api;
 
 public class DriveBakedModel extends DelegateBakedModel {
-    private final Map<DriveSlotCellType, IBakedModel> bakedCells;
+    private final Map<Item, IBakedModel> bakedCells;
+    private final IBakedModel defaultCell;
 
-    public DriveBakedModel(IBakedModel bakedBase, Map<DriveSlotCellType, IBakedModel> bakedCells) {
+    public DriveBakedModel(IBakedModel bakedBase, Map<Item, IBakedModel> cellModels, IBakedModel defaultCell) {
         super(bakedBase);
-        this.bakedCells = bakedCells;
+        this.bakedCells = cellModels;
+        this.defaultCell = defaultCell;
     }
 
     @Nonnull
@@ -63,7 +63,7 @@ public class DriveBakedModel extends DelegateBakedModel {
 
         DriveSlotsState slotsState = driveModelData.getSlotsState();
 
-        if (side == null && slotsState != null) {
+        if (slotsState != null) {
             for (int row = 0; row < 5; row++) {
                 for (int col = 0; col < 2; col++) {
                     Matrix4f transform = new Matrix4f();
@@ -80,7 +80,7 @@ public class DriveBakedModel extends DelegateBakedModel {
                     // Add the drive chassis
                     Item cell = slotsState.getCell(slot);
                     IBakedModel cellChassisModel = getCellChassisModel(cell);
-                    addModel(state, rand, extraData, result, cellChassisModel, transform);
+                    addModel(state, rand, extraData, result, side, cellChassisModel, transform);
                 }
             }
         }
@@ -92,29 +92,24 @@ public class DriveBakedModel extends DelegateBakedModel {
     public boolean isAmbientOcclusion() {
         // We have faces inside the chassis that are facing east, but should not receive
         // ambient occlusion from the east-side, but sadly this cannot be fine-tuned on
-        // a
-        // face-by-face basis.
+        // a face-by-face basis.
         return false;
     }
 
     // Determine which drive chassis to show based on the used cell
     private IBakedModel getCellChassisModel(Item cell) {
-        IItems items = Api.INSTANCE.definitions().items();
         if (cell == null) {
-            return bakedCells.get(DriveSlotCellType.EMPTY);
-        } else if (items.fluidCell1k().item() == cell || items.fluidCell4k().item() == cell
-                || items.fluidCell16k().item() == cell || items.fluidCell64k().item() == cell) {
-            return bakedCells.get(DriveSlotCellType.FLUID);
-        } else {
-            // Fall back to an item model
-            return bakedCells.get(DriveSlotCellType.ITEM);
+            return bakedCells.get(Items.AIR);
         }
+        final IBakedModel model = bakedCells.get(cell);
+
+        return model != null ? model : defaultCell;
     }
 
     private static void addModel(@Nullable BlockState state, @Nonnull Random rand, @Nonnull IModelData extraData,
-            List<BakedQuad> result, IBakedModel bakedCell, Matrix4f transform) {
+            List<BakedQuad> result, Direction side, IBakedModel bakedCell, Matrix4f transform) {
         MatrixVertexTransformer transformer = new MatrixVertexTransformer(transform);
-        for (BakedQuad bakedQuad : bakedCell.getQuads(state, null, rand, extraData)) {
+        for (BakedQuad bakedQuad : bakedCell.getQuads(state, side, rand, extraData)) {
             BakedQuadBuilder builder = new BakedQuadBuilder();
             transformer.setParent(builder);
             transformer.setVertexFormat(builder.getVertexFormat());

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

@@ -20,13 +20,12 @@ package appeng.client.render.model;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Function;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.mojang.datafixers.util.Pair;
 
 import net.minecraft.client.renderer.model.IBakedModel;
@@ -36,39 +35,41 @@ import net.minecraft.client.renderer.model.ItemOverrideList;
 import net.minecraft.client.renderer.model.Material;
 import net.minecraft.client.renderer.model.ModelBakery;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.item.Item;
+import net.minecraft.item.Items;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModelConfiguration;
 import net.minecraftforge.client.model.geometry.IModelGeometry;
 
-import appeng.block.storage.DriveSlotCellType;
+import appeng.api.client.ICellModelRegistry;
+import appeng.core.Api;
 
 public class DriveModel implements IModelGeometry<DriveModel> {
 
     private static final ResourceLocation MODEL_BASE = new ResourceLocation(
             "appliedenergistics2:block/drive/drive_base");
-
-    private static final Map<DriveSlotCellType, ResourceLocation> MODELS_CELLS = ImmutableMap.of(
-            DriveSlotCellType.EMPTY, new ResourceLocation("appliedenergistics2:block/drive/drive_cell_empty"),
-            DriveSlotCellType.ITEM, new ResourceLocation("appliedenergistics2:block/drive/drive_cell_items"),
-            DriveSlotCellType.FLUID, new ResourceLocation("appliedenergistics2:block/drive/drive_cell_fluids"));
-
-    public static final Set<ResourceLocation> DEPENDENCIES = ImmutableSet.<ResourceLocation>builder()
-            .addAll(MODELS_CELLS.values()).add(MODEL_BASE).build();
+    private static final ResourceLocation MODEL_CELL_EMPTY = new ResourceLocation(
+            "appliedenergistics2:block/drive/drive_cell_empty");
 
     @Override
     public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery,
             Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
             ItemOverrideList overrides, ResourceLocation modelLocation) {
-        EnumMap<DriveSlotCellType, IBakedModel> cellModels = new EnumMap<>(DriveSlotCellType.class);
+        final ICellModelRegistry cellRegistry = Api.instance().client().cells();
+        final Map<Item, IBakedModel> cellModels = new IdentityHashMap<>();
 
-        // Load the base model and the model for each cell state.
-        for (DriveSlotCellType cellType : MODELS_CELLS.keySet()) {
-            IBakedModel cellModel = bakery.getBakedModel(MODELS_CELLS.get(cellType), modelTransform, spriteGetter);
-            cellModels.put(cellType, cellModel);
+        // Load the base model and the model for each cell model.
+        for (Entry<Item, ResourceLocation> entry : cellRegistry.models().entrySet()) {
+            IBakedModel cellModel = bakery.getBakedModel(entry.getValue(), modelTransform, spriteGetter);
+            cellModels.put(entry.getKey(), cellModel);
         }
 
-        IBakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter);
-        return new DriveBakedModel(baseModel, cellModels);
+        final IBakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter);
+        final IBakedModel defaultCell = bakery.getBakedModel(cellRegistry.getDefaultModel(), modelTransform,
+                spriteGetter);
+        cellModels.put(Items.AIR, bakery.getBakedModel(MODEL_CELL_EMPTY, modelTransform, spriteGetter));
+
+        return new DriveBakedModel(baseModel, cellModels, defaultCell);
     }
 
     @Override

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

@@ -19,14 +19,12 @@
 package appeng.client.render.spatial;
 
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
 import appeng.bootstrap.IItemRendering;
-import appeng.core.AppEng;
 
 public class SpatialPylonRendering extends BlockRenderingCustomizer {
 

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

@@ -6,7 +6,6 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
 
 import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.RenderState;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.Vector3f;
 import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
@@ -14,7 +13,6 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 
 import appeng.block.storage.DriveSlotState;
 import appeng.client.render.FacingToRotation;
@@ -35,7 +33,8 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer<DriveTileEnti
         STATE_COLORS = new EnumMap<>(DriveSlotState.class);
         STATE_COLORS.put(DriveSlotState.OFFLINE, new Vector3f(0, 0, 0));
         STATE_COLORS.put(DriveSlotState.ONLINE, new Vector3f(0, 1, 0));
-        STATE_COLORS.put(DriveSlotState.TYPES_FULL, new Vector3f(0, 0.667f, 0));
+        STATE_COLORS.put(DriveSlotState.NOT_EMPTY, new Vector3f(0f, 0.667f, 1));
+        STATE_COLORS.put(DriveSlotState.TYPES_FULL, new Vector3f(1, 0.667f, 0));
         STATE_COLORS.put(DriveSlotState.FULL, new Vector3f(1, 0, 0));
     }
 
@@ -80,10 +79,6 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer<DriveTileEnti
         FacingToRotation.get(drive.getForward(), drive.getUp()).push(ms);
         ms.translate(-0.5, -0.5, -0.5);
 
-        RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = ObfuscationReflectionHelper
-                .getPrivateValue(RenderState.class, null, "field_228515_g_");
-        RenderType rt = RenderType.makeType("ae_drive_leds", DefaultVertexFormats.POSITION_COLOR, 7, 32565, false, true,
-                RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).build(false));
         IVertexBuilder buffer = buffers.getBuffer(STATE);
 
         for (int row = 0; row < 5; row++) {
@@ -116,7 +111,6 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer<DriveTileEnti
         }
 
         ms.pop();
-
     }
 
     private Vector3f getColorForSlot(DriveTileEntity drive, int slot, float partialTicks) {
@@ -125,6 +119,10 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer<DriveTileEnti
             return null;
         }
 
+        if (!drive.isPowered()) {
+            return STATE_COLORS.get(DriveSlotState.OFFLINE);
+        }
+
         Vector3f col = STATE_COLORS.get(state);
         if (drive.isCellBlinking(slot)) {
             // 200 ms interval (100ms to get to red, then 100ms back)

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

@@ -37,7 +37,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.PlayerInvWrapper;
 
-import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.implementations.guiobjects.IGuiItemObject;
@@ -64,6 +63,7 @@ import appeng.container.slot.InaccessibleSlot;
 import appeng.container.slot.PlayerHotBarSlot;
 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;
@@ -658,7 +658,7 @@ public abstract class AEBaseContainer extends Container {
                 final ItemStack isg = player.inventory.getItemStack();
 
                 if (!isg.isEmpty() && releaseQty > 0) {
-                    IAEItemStack ais = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+                    IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
                             .createStack(isg);
                     ais.setStackSize(1);
                     final IAEItemStack extracted = ais.copy();
@@ -737,7 +737,7 @@ public abstract class AEBaseContainer extends Container {
                         this.updateHeld(player);
                     }
                 } else {
-                    IAEItemStack ais = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+                    IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
                             .createStack(player.inventory.getItemStack());
                     ais = Platform.poweredInsert(this.getPowerSource(), this.getCellInventory(), ais,
                             this.getActionSource());
@@ -777,7 +777,7 @@ public abstract class AEBaseContainer extends Container {
                         this.updateHeld(player);
                     }
                 } else {
-                    IAEItemStack ais = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+                    IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
                             .createStack(player.inventory.getItemStack());
                     ais.setStackSize(1);
                     ais = Platform.poweredInsert(this.getPowerSource(), this.getCellInventory(), ais,
@@ -855,7 +855,7 @@ public abstract class AEBaseContainer extends Container {
             return input;
         }
         final IAEItemStack ais = Platform.poweredInsert(this.getPowerSource(), this.getCellInventory(),
-                AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(input),
+                Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(input),
                 this.getActionSource());
         if (ais == null) {
             return ItemStack.EMPTY;

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

@@ -31,7 +31,6 @@ import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.EmptyHandler;
 
-import appeng.api.AEApi;
 import appeng.api.config.CopyMode;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.Settings;
@@ -47,6 +46,7 @@ import appeng.container.guisync.GuiSync;
 import appeng.container.slot.FakeTypeOnlySlot;
 import appeng.container.slot.OptionalRestrictedInputSlot;
 import appeng.container.slot.RestrictedInputSlot;
+import appeng.core.Api;
 import appeng.tile.misc.CellWorkbenchTileEntity;
 import appeng.util.EnumCycler;
 import appeng.util.Platform;
@@ -128,15 +128,6 @@ public class CellWorkbenchContainer extends UpgradeableContainer {
                         upgradeInventory, this, iSLot, 187 + zz * 18, 8 + 18 * z, iSLot, this.getPlayerInventory()));
             }
         }
-        /*
-         * if ( supportCapacity() ) { for (int w = 0; w < 2; w++) for (int z = 0; z < 9;
-         * z++) addSlotToContainer( new OptionalSlotFakeTypeOnly( inv, this, offset++,
-         * x, y, z, w, 1 ) ); for (int w = 0; w < 2; w++) for (int z = 0; z < 9; z++)
-         * addSlotToContainer( new OptionalSlotFakeTypeOnly( inv, this, offset++, x, y,
-         * z, w + 2, 2 ) ); for (int w = 0; w < 2; w++) for (int z = 0; z < 9; z++)
-         * addSlotToContainer( new OptionalSlotFakeTypeOnly( inv, this, offset++, x, y,
-         * z, w + 4, 3 ) ); }
-         */
     }
 
     @Override
@@ -217,9 +208,9 @@ public class CellWorkbenchContainer extends UpgradeableContainer {
         final ItemStack is = this.getUpgradeable().getInventoryByName("cell").getStackInSlot(0);
         final IStorageChannel channel = is.getItem() instanceof IStorageCell
                 ? ((IStorageCell) is.getItem()).getChannel()
-                : AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
+                : Api.instance().storage().getStorageChannel(IItemStorageChannel.class);
 
-        final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory(is, null, channel);
+        final IMEInventory cellInv = Api.instance().registries().cell().getCellInventory(is, null, channel);
 
         Iterator<IAEStack> i = new NullIterator<>();
         if (cellInv != null) {

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

@@ -15,7 +15,6 @@ import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.network.NetworkHooks;
 
-import appeng.api.AEApi;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.implementations.guiobjects.IGuiItem;
@@ -25,6 +24,7 @@ import appeng.api.parts.IPartHost;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.core.AELog;
+import appeng.core.Api;
 import appeng.helpers.ICustomNameObject;
 import appeng.helpers.WirelessTerminalGuiObject;
 import appeng.util.Platform;
@@ -182,7 +182,7 @@ public final class ContainerHelper<C extends AEBaseContainer, I> {
         }
 
         if (interfaceClass.isAssignableFrom(WirelessTerminalGuiObject.class)) {
-            final IWirelessTermHandler wh = AEApi.instance().registries().wireless().getWirelessTerminalHandler(it);
+            final IWirelessTermHandler wh = Api.instance().registries().wireless().getWirelessTerminalHandler(it);
             if (wh != null) {
                 return interfaceClass.cast(new WirelessTerminalGuiObject(wh, it, player, locator.getItemIndex()));
             }

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

@@ -37,7 +37,6 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.World;
 
-import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;
@@ -58,6 +57,7 @@ import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.guisync.GuiSync;
 import appeng.core.AELog;
+import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
 import appeng.helpers.WirelessTerminalGuiObject;
@@ -197,7 +197,7 @@ public class CraftConfirmContainer extends AEBaseContainer {
                     final MEInventoryUpdatePacket c = this.result.isSimulation() ? new MEInventoryUpdatePacket((byte) 2)
                             : null;
 
-                    final IItemList<IAEItemStack> plan = AEApi.instance().storage()
+                    final IItemList<IAEItemStack> plan = Api.instance().storage()
                             .getStorageChannel(IItemStorageChannel.class).createList();
                     this.result.populatePlan(plan);
 
@@ -215,7 +215,7 @@ public class CraftConfirmContainer extends AEBaseContainer {
 
                         final IStorageGrid sg = this.getGrid().getCache(IStorageGrid.class);
                         final IMEInventory<IAEItemStack> items = sg
-                                .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
+                                .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
 
                         IAEItemStack m = null;
                         if (c != null && this.result.isSimulation()) {

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

@@ -28,7 +28,6 @@ import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.text.ITextComponent;
 
-import appeng.api.AEApi;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.crafting.CraftingItemList;
@@ -43,6 +42,7 @@ import appeng.api.storage.data.IItemList;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
+import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
@@ -60,7 +60,7 @@ public class CraftingCPUContainer extends AEBaseContainer
     private static final ContainerHelper<CraftingCPUContainer, CraftingTileEntity> helper = new ContainerHelper<>(
             CraftingCPUContainer::new, CraftingTileEntity.class, SecurityPermissions.CRAFT);
 
-    private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
+    private final IItemList<IAEItemStack> list = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
             .createList();
     private IGrid network;
     private CraftingCPUCluster monitor = null;

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

@@ -26,13 +26,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
 import appeng.api.definitions.IItemDefinition;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 import appeng.container.interfaces.IProgressProvider;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
+import appeng.core.Api;
 import appeng.tile.misc.InscriberRecipes;
 import appeng.tile.misc.InscriberTileEntity;
 import appeng.util.Platform;
@@ -131,7 +131,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres
         final ItemStack bot = this.ti.getInternalInventory().getStackInSlot(1);
 
         if (s == this.middle) {
-            IItemDefinition press = AEApi.instance().definitions().materials().namePress();
+            IItemDefinition press = Api.instance().definitions().materials().namePress();
             if (press.isSameAs(top) || press.isSameAs(bot)) {
                 return !press.isSameAs(is);
             }
@@ -146,7 +146,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres
             }
 
             // name presses
-            final IItemDefinition namePress = AEApi.instance().definitions().materials().namePress();
+            final IItemDefinition namePress = Api.instance().definitions().materials().namePress();
             if (namePress.isSameAs(otherSlot)) {
                 return namePress.isSameAs(is);
             }

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

@@ -32,7 +32,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.tileentity.TileEntity;
 
-import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
 import appeng.api.config.SecurityPermissions;
@@ -67,6 +66,7 @@ import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 import appeng.container.slot.RestrictedInputSlot;
 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.MEInventoryUpdatePacket;
@@ -93,8 +93,8 @@ public class MEMonitorableContainer extends AEBaseContainer
 
     private final RestrictedInputSlot[] cellView = new RestrictedInputSlot[5];
     private final IMEMonitor<IAEItemStack> monitor;
-    private final IItemList<IAEItemStack> items = AEApi.instance().storage()
-            .getStorageChannel(IItemStorageChannel.class).createList();
+    private final IItemList<IAEItemStack> items = Api.instance().storage().getStorageChannel(IItemStorageChannel.class)
+            .createList();
     private final IConfigManager clientCM;
     private final ITerminalHost host;
     @GuiSync(99)
@@ -126,7 +126,7 @@ public class MEMonitorableContainer extends AEBaseContainer
             this.serverCM = monitorable.getConfigManager();
 
             this.monitor = monitorable
-                    .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
+                    .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
             if (this.monitor != null) {
                 this.monitor.addListener(this, null);
 
@@ -185,7 +185,7 @@ public class MEMonitorableContainer extends AEBaseContainer
     public void detectAndSendChanges() {
         if (Platform.isServer()) {
             if (this.monitor != this.host
-                    .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class))) {
+                    .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class))) {
                 this.setValidContainer(false);
             }
 

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

@@ -38,6 +38,7 @@ import appeng.container.slot.AppEngSlot;
 import appeng.container.slot.MolecularAssemblerPatternSlot;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
+import appeng.core.Api;
 import appeng.items.misc.EncodedPatternItem;
 import appeng.tile.crafting.MolecularAssemblerTileEntity;
 import appeng.util.Platform;
@@ -79,8 +80,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements
 
         if (is.getItem() instanceof EncodedPatternItem) {
             final World w = this.getTileEntity().getWorld();
-            final EncodedPatternItem iep = (EncodedPatternItem) is.getItem();
-            final ICraftingPatternDetails ph = iep.getPatternForItem(is, w);
+            final ICraftingPatternDetails ph = Api.instance().crafting().decodePattern(is, w);
             if (ph.isCraftable()) {
                 return ph.isValidItemForSlot(slotIndex, i, w);
             }

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

@@ -27,7 +27,6 @@ import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketBuffer;
 
-import appeng.api.AEApi;
 import appeng.api.implementations.guiobjects.INetworkTool;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridBlock;
@@ -41,6 +40,7 @@ import appeng.api.util.AEPartLocation;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 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;
@@ -115,7 +115,7 @@ public class NetworkStatusContainer extends AEBaseContainer {
                 final MEInventoryUpdatePacket piu = new MEInventoryUpdatePacket();
 
                 for (final Class<? extends IGridHost> machineClass : this.network.getMachinesClasses()) {
-                    final IItemList<IAEItemStack> list = AEApi.instance().storage()
+                    final IItemList<IAEItemStack> list = Api.instance().storage()
                             .getStorageChannel(IItemStorageChannel.class).createList();
                     for (final IGridNode machine : this.network.getMachines(machineClass)) {
                         final IGridBlock blk = machine.getGridBlock();

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

@@ -20,7 +20,6 @@ package appeng.container.implementations;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -32,19 +31,17 @@ import net.minecraft.inventory.container.CraftingResultSlot;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.ICraftingRecipe;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.IRecipeType;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.nbt.INBT;
-import net.minecraft.nbt.ListNBT;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.PlayerInvWrapper;
 
-import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.SecurityPermissions;
+import appeng.api.crafting.ICraftingHelper;
 import appeng.api.definitions.IDefinitions;
 import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.ITerminalHost;
@@ -60,6 +57,7 @@ import appeng.container.slot.OptionalFakeSlot;
 import appeng.container.slot.PatternOutputsSlot;
 import appeng.container.slot.PatternTermSlot;
 import appeng.container.slot.RestrictedInputSlot;
+import appeng.core.Api;
 import appeng.core.sync.packets.PatternSlotPacket;
 import appeng.helpers.IContainerCraftingPacket;
 import appeng.items.storage.ViewCellItem;
@@ -98,8 +96,9 @@ public class PatternTermContainer extends MEMonitorableContainer
     private final PatternTermSlot craftSlot;
     private final RestrictedInputSlot patternSlotIN;
     private final RestrictedInputSlot patternSlotOUT;
+    private final ICraftingHelper craftingHelper = Api.INSTANCE.crafting();
 
-    private IRecipe<CraftingInventory> currentRecipe;
+    private ICraftingRecipe currentRecipe;
     @GuiSync(97)
     public boolean craftingMode = true;
     @GuiSync(96)
@@ -206,17 +205,17 @@ public class PatternTermContainer extends MEMonitorableContainer
         final ItemStack[] out = this.getOutputs();
 
         // if there is no input, this would be silly.
-        if (in == null || out == null) {
+        if (in == null || out == null || isCraftingMode() && currentRecipe == null) {
             return;
         }
 
         // first check the output slots, should either be null, or a pattern
-        if (!output.isEmpty() && !this.isPattern(output)) {
+        if (!output.isEmpty() && !craftingHelper.isEncodedPattern(output)) {
             return;
         } // if nothing is there we should snag a new pattern.
         else if (output.isEmpty()) {
             output = this.patternSlotIN.getStack();
-            if (output.isEmpty() || !this.isPattern(output)) {
+            if (output.isEmpty() || !isPattern(output)) {
                 return; // no blanks.
             }
 
@@ -226,34 +225,17 @@ public class PatternTermContainer extends MEMonitorableContainer
                 this.patternSlotIN.putStack(ItemStack.EMPTY);
             }
 
-            // add a new encoded pattern.
-            Optional<ItemStack> maybePattern = AEApi.instance().definitions().items().encodedPattern().maybeStack(1);
-            if (maybePattern.isPresent()) {
-                output = maybePattern.get();
-                this.patternSlotOUT.putStack(output);
-            }
+            // let the crafting helper create a new encoded pattern
+            output = null;
         }
 
-        // encode the slot.
-        final CompoundNBT encodedValue = new CompoundNBT();
-
-        final ListNBT tagIn = new ListNBT();
-        final ListNBT tagOut = new ListNBT();
-
-        for (final ItemStack i : in) {
-            tagIn.add(this.createItemTag(i));
+        if (this.isCraftingMode()) {
+            output = craftingHelper.encodeCraftingPattern(output, this.currentRecipe, in, out[0], isSubstitute());
+        } else {
+            output = craftingHelper.encodeProcessingPattern(output, in, out);
         }
+        this.patternSlotOUT.putStack(output);
 
-        for (final ItemStack i : out) {
-            tagOut.add(this.createItemTag(i));
-        }
-
-        encodedValue.put("in", tagIn);
-        encodedValue.put("out", tagOut);
-        encodedValue.putBoolean("crafting", this.isCraftingMode());
-        encodedValue.putBoolean("substitute", this.isSubstitute());
-
-        output.setTag(encodedValue);
     }
 
     private ItemStack[] getInputs() {
@@ -307,22 +289,8 @@ public class PatternTermContainer extends MEMonitorableContainer
             return false;
         }
 
-        final IDefinitions definitions = AEApi.instance().definitions();
-
-        boolean isPattern = definitions.items().encodedPattern().isSameAs(output);
-        isPattern |= definitions.materials().blankPattern().isSameAs(output);
-
-        return isPattern;
-    }
-
-    private INBT createItemTag(final ItemStack i) {
-        final CompoundNBT c = new CompoundNBT();
-
-        if (!i.isEmpty()) {
-            i.write(c);
-        }
-
-        return c;
+        final IDefinitions definitions = Api.instance().definitions();
+        return definitions.materials().blankPattern().isSameAs(output);
     }
 
     @Override
@@ -380,7 +348,7 @@ public class PatternTermContainer extends MEMonitorableContainer
             }
 
             final IMEMonitor<IAEItemStack> storage = this.getPatternTerminal()
-                    .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
+                    .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
             final IItemList<IAEItemStack> all = storage.getStorageList();
 
             final ItemStack is = r.getCraftingResult(ic);

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

@@ -30,11 +30,11 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
+import appeng.core.Api;
 import appeng.items.contents.QuartzKnifeObj;
 import appeng.items.materials.MaterialItem;
 import appeng.tile.inventory.AppEngInternalInventory;
@@ -119,7 +119,7 @@ public class QuartzKnifeContainer extends AEBaseContainer {
 
             if (RestrictedInputSlot.isMetalIngot(input)) {
                 if (QuartzKnifeContainer.this.myName.length() > 0) {
-                    return AEApi.instance().definitions().materials().namePress().maybeStack(1).map(namePressStack -> {
+                    return Api.instance().definitions().materials().namePress().maybeStack(1).map(namePressStack -> {
                         final CompoundNBT compound = namePressStack.getOrCreateTag();
                         compound.putString(MaterialItem.TAG_INSCRIBE_NAME, QuartzKnifeContainer.this.myName);
 

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

@@ -26,7 +26,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.features.INetworkEncodable;
 import appeng.api.features.IWirelessTermHandler;
@@ -36,6 +35,7 @@ import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 import appeng.container.slot.OutputSlot;
 import appeng.container.slot.RestrictedInputSlot;
+import appeng.core.Api;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.tile.misc.SecurityStationTileEntity;
 import appeng.util.inv.IAEAppEngInventory;
@@ -150,7 +150,7 @@ public class SecurityStationContainer extends MEMonitorableContainer implements
                     networkEncodable = (INetworkEncodable) term.getItem();
                 }
 
-                final IWirelessTermHandler wTermHandler = AEApi.instance().registries().wireless()
+                final IWirelessTermHandler wTermHandler = Api.instance().registries().wireless()
                         .getWirelessTerminalHandler(term);
                 if (wTermHandler != null) {
                     networkEncodable = wTermHandler;

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

@@ -27,7 +27,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.SecurityPermissions;
@@ -43,6 +42,7 @@ import appeng.container.guisync.GuiSync;
 import appeng.container.slot.FakeTypeOnlySlot;
 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;
@@ -155,7 +155,7 @@ public class StorageBusContainer extends UpgradeableContainer {
         Iterator<IAEItemStack> i = new NullIterator<>();
         if (cellInv != null) {
             final IItemList<IAEItemStack> list = cellInv.getAvailableItems(
-                    AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList());
+                    Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList());
             i = list.iterator();
         }
 

src/main/java/appeng/container/slot/CraftingTermSlot.java

@@ -33,7 +33,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.IActionSource;
@@ -44,6 +43,7 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerNull;
 import appeng.container.implementations.CraftingTermContainer;
+import appeng.core.Api;
 import appeng.helpers.IContainerCraftingPacket;
 import appeng.helpers.InventoryAction;
 import appeng.items.storage.ViewCellItem;
@@ -100,7 +100,7 @@ public class CraftingTermSlot extends AppEngCraftingSlot {
         }
 
         final IMEMonitor<IAEItemStack> inv = this.storage
-                .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
+                .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
         final int howManyPerCraft = this.getStack().getCount();
         int maxTimesToCraft = 0;
 

src/main/java/appeng/container/slot/NullSlot.java

@@ -1,84 +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.container.slot;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.container.Slot;
-import net.minecraft.item.ItemStack;
-
-// FIXME seems unused
-public class NullSlot extends Slot {
-
-    public NullSlot() {
-        super(null, 0, 0, 0);
-    }
-
-    @Override
-    public void onSlotChange(final ItemStack par1ItemStack, final ItemStack par2ItemStack) {
-
-    }
-
-    @Override
-    public ItemStack onTake(final PlayerEntity par1PlayerEntity, final ItemStack par2ItemStack) {
-        return par2ItemStack;
-    }
-
-    @Override
-    public boolean isItemValid(final ItemStack par1ItemStack) {
-        return false;
-    }
-
-    @Override
-    @Nonnull
-    public ItemStack getStack() {
-        return ItemStack.EMPTY;
-    }
-
-    @Override
-    public void putStack(final ItemStack par1ItemStack) {
-
-    }
-
-    @Override
-    public void onSlotChanged() {
-
-    }
-
-    @Override
-    public int getSlotStackLimit() {
-        return 0;
-    }
-
-    @Override
-    public ItemStack decrStackSize(final int par1) {
-        return ItemStack.EMPTY;
-    }
-
-    @Override
-    public boolean canTakeStack(final PlayerEntity par1PlayerEntity) {
-        return false;
-    }
-
-    @Override
-    public int getSlotIndex() {
-        return 0;
-    }
-}

src/main/java/appeng/container/slot/PatternTermSlot.java

@@ -22,11 +22,11 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.IStorageMonitorable;
 import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.core.Api;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.packets.PatternSlotPacket;
 import appeng.helpers.IContainerCraftingPacket;
@@ -48,7 +48,7 @@ public class PatternTermSlot extends CraftingTermSlot {
 
     public BasePacket getRequest(final boolean shift) {
         return new PatternSlotPacket(this.getPattern(),
-                AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(this.getStack()),
+                Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(this.getStack()),
                 shift);
     }
 

src/main/java/appeng/container/slot/RestrictedInputSlot.java

@@ -33,18 +33,18 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
+import appeng.api.crafting.ICraftingHelper;
 import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.IItems;
 import appeng.api.definitions.IMaterials;
 import appeng.api.features.INetworkEncodable;
-import appeng.api.implementations.ICraftingPatternItem;
 import appeng.api.implementations.items.IBiometricCard;
 import appeng.api.implementations.items.ISpatialStorageCell;
 import appeng.api.implementations.items.IStorageComponent;
 import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.storage.cells.ICellWorkbenchItem;
+import appeng.core.Api;
 import appeng.items.misc.EncodedPatternItem;
 import appeng.recipes.handlers.GrinderRecipes;
 import appeng.tile.misc.InscriberRecipes;
@@ -88,10 +88,7 @@ public class RestrictedInputSlot extends AppEngSlot {
 
     public boolean isValid(final ItemStack is, final World theWorld) {
         if (this.which == PlacableItemType.VALID_ENCODED_PATTERN_W_OUTPUT) {
-            final ICraftingPatternDetails ap = is.getItem() instanceof ICraftingPatternItem
-                    ? ((ICraftingPatternItem) is.getItem()).getPatternForItem(is, theWorld)
-                    : null;
-            return ap != null;
+            return Api.instance().crafting().decodePattern(is, theWorld) != null;
         }
         return true;
     }
@@ -123,42 +120,27 @@ public class RestrictedInputSlot extends AppEngSlot {
             return false;
         }
 
-        final IDefinitions definitions = AEApi.instance().definitions();
+        final IDefinitions definitions = Api.instance().definitions();
         final IMaterials materials = definitions.materials();
         final IItems items = definitions.items();
+        final ICraftingHelper crafting = Api.instance().crafting();
 
         switch (this.which) {
             case ENCODED_CRAFTING_PATTERN:
-                if (i.getItem() instanceof ICraftingPatternItem) {
-                    final ICraftingPatternItem b = (ICraftingPatternItem) i.getItem();
-                    final ICraftingPatternDetails de = b.getPatternForItem(i, this.p.player.world);
-                    if (de != null) {
-                        return de.isCraftable();
-                    }
+                final ICraftingPatternDetails de = crafting.decodePattern(i, this.p.player.world);
+                if (de != null) {
+                    return de.isCraftable();
                 }
                 return false;
             case VALID_ENCODED_PATTERN_W_OUTPUT:
             case ENCODED_PATTERN_W_OUTPUT:
-            case ENCODED_PATTERN: {
-                if (i.getItem() instanceof ICraftingPatternItem) {
-                    return true;
-                }
-                // ICraftingPatternDetails pattern = i.getItem() instanceof ICraftingPatternItem
-                // ?
-                // ((ICraftingPatternItem)
-                // i.getItem()).getPatternForItem( i ) : null;
-                return false;// pattern != null;
-            }
+            case ENCODED_PATTERN:
+                return crafting.isEncodedPattern(i);
             case BLANK_PATTERN:
                 return materials.blankPattern().isSameAs(i);
 
             case PATTERN:
-
-                if (i.getItem() instanceof ICraftingPatternItem) {
-                    return true;
-                }
-
-                return materials.blankPattern().isSameAs(i);
+                return materials.blankPattern().isSameAs(i) || crafting.isEncodedPattern(i);
 
             case INSCRIBER_PLATE:
                 if (materials.namePress().isSameAs(i)) {
@@ -195,14 +177,14 @@ public class RestrictedInputSlot extends AppEngSlot {
                 return i.getItem() instanceof ISpatialStorageCell
                         && ((ISpatialStorageCell) i.getItem()).isSpatialStorage(i);
             case STORAGE_CELLS:
-                return AEApi.instance().registries().cell().isCellHandled(i);
+                return Api.instance().registries().cell().isCellHandled(i);
             case WORKBENCH_CELL:
                 return i.getItem() instanceof ICellWorkbenchItem && ((ICellWorkbenchItem) i.getItem()).isEditable(i);
             case STORAGE_COMPONENT:
                 return i.getItem() instanceof IStorageComponent
                         && ((IStorageComponent) i.getItem()).isStorageComponent(i);
             case TRASH:
-                if (AEApi.instance().registries().cell().isCellHandled(i)) {
+                if (Api.instance().registries().cell().isCellHandled(i)) {
                     return false;
                 }
 
@@ -210,7 +192,7 @@ public class RestrictedInputSlot extends AppEngSlot {
                         && ((IStorageComponent) i.getItem()).isStorageComponent(i));
             case ENCODABLE_ITEM:
                 return i.getItem() instanceof INetworkEncodable
-                        || AEApi.instance().registries().wireless().isWirelessTerminal(i);
+                        || Api.instance().registries().wireless().isWirelessTerminal(i);
             case BIOMETRIC_CARD:
                 return i.getItem() instanceof IBiometricCard;
             case UPGRADES: