Fix ConcurrentModificatonException in NetworkEventBus (#3660 )

Fixes #3478 : Changes the way xp drops from Certus Ore blocks (#3482 )
Fixes #3535 : Prevent crash when either quartz types are disabled (#3542 )
2018-08-01 00:35:44 +02:00 · 2018-06-26 23:36:21 +02:00 · 2018-06-26 15:31:03 +02:00 · 2018-06-26 10:33:56 +02:00 · 2018-06-26 10:32:58 +02:00 · 2018-06-26 10:31:17 +02:00
1000 changed files with 12482 additions and 32383 deletions
@@ -1,30 +0,0 @@
---
-name: Bug report
-about: You found a bug or encountered a crash? Please report it here.
-
---
-
-<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
-
-**Describe the bug**
-<!-- Always use the most recent version from ae-mod.info, it might already be fixed. -->
-
-**To Reproduce**
-<!-- Please provide the steps to reproduce it, otherwise we might not be able to fix it. -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Additional context**
-<!-- Screenshots, crashlogs, etc. -->
-<!-- A complete crashlog is required when reporting a crash. No excerpts. -->
-<!-- Please use pastebin or gist for posting the complete crashlog. -->
-
-**Environment**
-<!-- Include as many relevant details about the environment -->
-<!-- Like the used version, SP/MP, other mods and their version -->
-<!-- The following ones are required, please note "latest" is not a version -->
-
- Minecraft Version: 
- AE2 Version: 
- Forge Version:
@@ -1,17 +0,0 @@
---
-name: Feature Request
-about: A feature request or suggestion to improve Applied Energistics 2
-
---
-
-<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
-
-**Describe the feature**
-<!-- Tell us how it should work. -->
-
-**Reasons why it should be considered**
-<!-- This can help us in various degrees, e.g. to determine if it fits our design ideas. -->
-
-**Additional Context**
-<!-- Use this for further details, e.g. screenshots, links to mods for integrations. -->
-<!-- Features will only be considered for the latest/next version. -->
@@ -1,15 +0,0 @@
-name: 'Lock threads'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v2
-        with:
-          github-token: ${{ github.token }}
-          issue-lock-inactive-days: '180'
-          pr-lock-inactive-days: '180'
@@ -7,27 +7,14 @@ jdk:
  - openjdk8

 before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  - rm -f $HOME/.gradle/caches/minecraft/ForgeVersion.json
-  - rm -f $HOME/.gradle/caches/minecraft/ForgeVersion.json.etag
-  - rm -fr $HOME/.gradle/caches/minecraft/deobfedDeps
-  - rm -f $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
-  - rm -f $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
-
+  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar
+  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
 cache:
  directories:
-    - '$HOME/.m2/repository'
-    - '$HOME/.sonar/cache'
-    - '$HOME/.gradle/wrapper'
-    - '$HOME/.gradle/caches'
-
-addons:
-  sonarcloud:
-    organization: "appliedenergistics"
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/

 install: "./gradlew setupCIWorkspace"
-script: 
-  - "./gradlew build"
-  - "./gradlew test"
-  - "./gradlew sonarqube"
+script: "./gradlew build test"
@@ -1,29 +1,239 @@
-This is a fork of AE2 i made for trying to solve issues for the [Omnifactory](https://www.curseforge.com/minecraft/modpacks/omnifactory) modpack.
+[![Travis](https://img.shields.io/travis/AppliedEnergistics/Applied-Energistics-2.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/AppliedEnergistics/Applied-Energistics-2)
+[![Latest Release](https://img.shields.io/github/release/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest%20Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)

-See https://github.com/PrototypeTrousers/Applied-Energistics-2/tree/AE2-Omnifactory branch for commits
-and
-https://github.com/PrototypeTrousers/Applied-Energistics-2/releases for the compiled jars.
+# Applied Energistics 2

-# Applied Energistics 2 (PrototypeTrousers fork for Omnifactory)
+## Table of Contents
+
+* [About](#about)
+* [Contacts](#contacts)
+* [License](#license)
+* [Downloads](#downloads)
+* [Installation](#installation)
+* [Issues](#issues)
+* [Building](#building)
+* [Contribution](#contribution)
+* [API](#applied-energistics-2-api)
+* [CraftTweaker](#applied-energistics-2-crafttweaker)
+* [Localization](#applied-energistics-2-localization)
+* [Credits](#credits)

 ## About

 A Mod about Matter, Energy and using them to conquer the world..

+## Contacts
+
+* [Website](http://ae-mod.info/)
+* [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
+* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
+
 ## License

 * Applied Energistics 2 API
-  - (c) 2013 - 2018 AlgorithmX2 et al
+  - (c) 2013 - 2017 AlgorithmX2 et al
  - [![License](https://img.shields.io/badge/License-MIT-red.svg?style=flat-square)](http://opensource.org/licenses/MIT)
 * Applied Energistics 2
-  - (c) 2013 - 2018 AlgorithmX2 et al
+  - (c) 2013 - 2017 AlgorithmX2 et al
  - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
 * Textures and Models
-  - (c) 2013 - 2018 AlgorithmX2 et al
+  - (c) 2013 - 2017 AlgorithmX2 et al
  - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
 * Text and Translations
  - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)

+## Downloads
+
+Downloads can be found on [CurseForge](http://www.curse.com/mc-mods/minecraft/223794-applied-energistics-2) or on the [official website](http://ae-mod.info/Downloads/).
+
+## Installation
+
+You install this mod by putting it into the `minecraft/mods/` folder. It has no additional hard dependencies.
+
+## Issues
+
+Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!
+
+1. Make sure your issue has not already been answered or fixed and you are using the latest version. Also think about whether your issue is a valid one before submitting it.
+    * If it is already possible with vanilla and AE2 itself, the suggestion will be considered invalid.
+    * Asking for a smaller version, more compact version, or more efficient version of something will also be considered invalid.
+2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
+3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
+    * Do not tag it with something like `[Feature]`, `[Bug]`, or a version.
+    * Restrict it to a single bug or feature, it makes managing them way easier for us.
+    * The following details are required. Also refer to the issue template when creating one.
+        * Forge version
+        * AE2 version
+        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
+            * Never post an excerpt of what you consider important
+            * Always post the full log
+        * Other mods and their version, when reporting an issue between AE and another mod
+            * Also consider updating these before submitting a new issue, it might be already fixed
+        * A detailed description of the bug or feature
+    * To further help in resolving your issues please try to include the follow if applicable:
+        * What was expected?
+        * How to reproduce the problem?
+            * This is usually a great detail and allows us to fix it way faster
+        * Server or Single Player?
+        * Screen shots or Pictures of the problem
+        * Mod Pack using and version?
+            * Keep in mind that some mods might use an outdated version of AE2
+            * If so you should report it to your modpack
+4. Click `Submit New Issue`, and wait for feedback!
+
+Providing as many details as possible does help us to find and resolve the issue faster and also you getting a fixed version as fast as possible.
+
+Please note that we might close any issue not matching these requirements. 
+
+## Building
+
+1. Clone this repository via 
+  - SSH `git clone git@github.com:AppliedEnergistics/Applied-Energistics-2.git` or 
+  - HTTPS `git clone https://github.com/AppliedEnergistics/Applied-Energistics-2.git`
+2. Setup workspace 
+  - Decompiled source `gradlew setupDecompWorkspace`
+  - Obfuscated source `gradlew setupDevWorkspace`
+  - CI server `gradlew setupCIWorkspace`
+3. Build `gradlew build`. Jar will be in `build/libs`
+4. For core developer: Setup IDE
+  - IntelliJ: Import into IDE, execute `gradlew genIntellijRuns` and change RunConfiguration to `*_main` as quickfix for [ForgeGradle](https://github.com/MinecraftForge/ForgeGradle/issues/357)
+  - Eclipse: execute `gradlew eclipse`
+5. For add-on developer: Core-Mod Detection
+  - In order to have FML detect AE from your dev environment, add the following VM Option to your run profile
+  - `-Dfml.coreMods.load=appeng.coremod.AppEngCore`
+
+## Contribution
+
+Before you want to add major changes, you might want to discuss them with us first, before wasting your time.
+If you are still willing to contribute to this project, you can contribute via [Pull-Request](https://help.github.com/articles/creating-a-pull-request).
+
+The [guidelines for contributing](https://github.com/AppliedEnergistics/Applied-Energistics-2/blob/master/.github/CONTRIBUTING.md) contain more detailed information about topics like the used code style and should also be considered.
+
+Here are a few things to keep in mind that will help get your PR approved.
+
+* A PR should be focused on content. Any PRs where the changes are only syntax will be rejected.
+* Use the file you are editing as a style guide.
+* Consider your feature. [Suggestion Guidelines](http://ae-mod.info/Suggestion-Guidelines/)
+  - Is your suggestion already possible using Vanilla + AE2?
+  - Make sure your feature isn't already in the works, or hasn't been rejected previously.
+  - Does your feature simplify another feature of AE2? These changes will not be accepted.
+  - If your feature can be done by any popular mod, discuss with us first.
+
+**Getting Started**
+
+1. Fork this repository
+2. Clone the fork via
+  * SSH `git clone git@github.com:<your username>/Applied-Energistics-2.git` or 
+  * HTTPS `git clone https://github.com/<your username>/Applied-Energistics-2.git`
+3. Change code base
+4. Add changes to git `git add -A`
+5. Commit changes to your clone `git commit -m "<summery of made changes>"`
+6. Push to your fork `git push`
+7. Create a Pull-Request on GitHub
+8. Wait for review
+9. Squash commits for cleaner history
+
+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_-_____-__:dev"
+    }
+
+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:rv2-alpha-30:dev`
+
+## Applied Energistics 2 CraftTweaker
+
+### Inscriber
+Add a recipe. When `inscribe` is true the bottom and top inputs are not consumed.
+
+	mods.appliedenergistics2.Inscriber.addRecipe(ItemStack output, ItemStack input, boolean inscribe, 
+	                                             @Optional ItemStack topInput, @Optional ItemStack bottomInput );
+
+Remove all recipes for this output stack. 
+	                                             
+	mods.appliedenergistics2.Inscriber.removeRecipe(ItemStack output);	
+
+### Grindstone
+Add a recipe.
+
+	mods.appliedenergistics2.Grinder.addRecipe( ItemStack output, ItemStack input, int turns, 
+	                                            @Optional ItemStack secondary1Output, @Optional float secondary1Chance,
+	                                            @Optional ItemStack secondary2Output, @Optional float secondary2Chance);
+	
+Remove recipes for this input.
+
+	mods.appliedenergistics2.Grinder.removeRecipe(ItemStack input);	
+
+### 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
+
+`en_US` is included in this repository, fixes to typos are welcome.
+
+### Encoding
+
+Files must be encoded as UTF-8.
+
+### New or updated Translations
+
+The language files are located in `/src/main/resources/assets/appliedenergistics2/lang/` and use the [appropriate locale code](http://minecraft.gamepedia.com/Language) as name and `.lang` as extension.
+
+To update an translation edit the corresponding file and improve/correct the existing entry. Or copy any entries from `en_US.lang` for missing translation.
+
+To create a new translation, copy the contents of `en_US.lang`, create a new file with appropriate filename, and translate it to your language.
+
+Please keep in mind that we use [String format](https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html) to pass additional data to the text for displaying.
+Therefore you should preserve parts like `%s` or `%1$d%%`, which allows us to replace them with the correct values while you still have the option to change their order for match the rules of grammar.
+This might not be possible for some languages. Should this be the case, please contact us.
+
+### Final Note
+
+If you have have issues localizing something feel free to contact us on IRC, at #AppliedEnergistics on Esper.net
+
+Thanks to everyone helping out to improve localization of AE2.
+
 ## Credits

 Thanks to
@@ -30,13 +30,7 @@ buildscript {
        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
    }
 }
-
-plugins {
-  id "org.sonarqube" version "2.6"
-}
-
 apply plugin: 'net.minecraftforge.gradle.forge'
-apply plugin: 'jacoco'

 repositories {
    mavenLocal()
@@ -57,7 +51,7 @@ tasks.withType(JavaCompile) {
    options.encoding = 'UTF-8'
 }

-version = aeversion + "-" + aechannel + "-" + aebuild + " " + trousers
+version = aeversion + "-" + aechannel + "-" + aebuild
 group = aegroup
 archivesBaseName = aebasename

@@ -118,4 +112,4 @@ processResources

    // move access transformer to META-INF
    rename '(.+_at.cfg)', 'META-INF/$1'
-}
+}
@@ -1,33 +1,30 @@
-aeversion=rv6
-aechannel=stable
-aebuild=7
+aeversion=rv5
+aechannel=alpha
+aebuild=0
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v21b

 #########################################################
 # Versions                                              #
 #########################################################
 minecraft_version=1.12.2
 mcp_mappings=snapshot_20171003
-forge_version=14.23.5.2847
+forge_version=14.23.1.2554

 #########################################################
 # Installable                                           #
 #########################################################
-hwyla_version=1.8.26-B41_1.12.2
+hwyla_version=1.8.20-B35_1.12

 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=4.16.1.302
-tesla_version=1.0.63
-ic2_version=2.8.73-ex112
-top_version=1.12-1.4.23-16
-cofhcore_version=1.12.2-4.5.2.19
-crafttweaker_version=4.1.8.9
-inventorytweaks_version=1.63
-ctm_version=MC1.12.2-0.3.1.16
+jei_version=4.8.0.105
+tesla_version=1.0.61
+ic2_version=2.8.19-ex112
+top_version=1.12-1.4.18-10
+cofhcore_version=1.12-4.+
+crafttweaker_version=4.0.10.310

 #########################################################
 # Deployment                                            #
@@ -24,44 +24,36 @@ allprojects {
 }

 javadoc {
-	options.encoding = 'UTF-8'
-	options.charSet = 'UTF-8'
+    options.encoding = 'UTF-8'
+    options.charSet = 'UTF-8'
 }

 task javadocs(type: Javadoc) {
-	source = sourceSets.api.java
-	include "appeng/api/**"
+    source = sourceSets.api.java
+    include "appeng/api/**"

-	// Due to ForgeGradle having to be a special snowflake,
-	// we have to add some custom configurations to the normal compile configuration and hope it does not break.
-	classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps 
+    // Due to ForgeGradle having to be a special snowflake,
+    // we have to add some custom configurations to the normal compile configuration and hope it does not break.
+    classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps 
 }

 task javadocJar(type: Jar, dependsOn: javadocs) {
 	from javadoc.destinationDir
-
-	classifier = 'javadoc'
+    classifier = 'javadoc'
 }

 task apiJar(type: Jar) {
-	from sourceSets.api.java
-	include "appeng/api/**"
+    from sourceSets.api.java
+    include "appeng/api/**"

-	from sourceSets.api.output
-	include "appeng/api/**"
+    from sourceSets.api.output
+    include "appeng/api/**"

-	classifier = 'api'
-}
-
-task sourceJar(type: Jar, overwrite: true) {
-	from sourceSets.api.allSource
-	from sourceSets.main.allSource
-
-	classifier = 'sources'
+    classifier = 'api'
 }

 artifacts {
-	archives apiJar
-	archives javadocJar
-	archives sourceJar
+    archives apiJar
+    archives javadocJar
+    archives sourceJar
 }
@@ -19,11 +19,6 @@
 repositories {
    mavenLocal()

-    maven {
-        name = "storagedrawers"
-        url = "https://dl.bintray.com/jaquadro/dev/"
-    }
-
    maven {
        name "Mobius"
        url "http://mobiusstrip.eu/maven"
@@ -69,15 +64,10 @@ repositories {
        url "http://maven.blamejared.com/"
    }

-    //maven { // modmaven, maven proxy
-    //    name 'modmaven'
-    //    url "https://modmaven.k-4u.nl/"
-    //}
-
-    maven {
-		name = "CurseForge"
-		url = "https://minecraft.curseforge.com/api/maven/"
-	}
+    maven { // modmaven, maven proxy
+        name 'modmaven'
+        url "https://modmaven.k-4u.nl/"
+    }
 }

 configurations {
@@ -85,9 +75,6 @@ configurations {
 }

 dependencies {
-    compileOnly "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2:api"
-    compileOnly "gregtechce:gregtech:1.12.2:1.12.0.662"
-
    // installable runtime dependencies
    mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
@@ -96,18 +83,14 @@ dependencies {
    // compile against provided APIs
    compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
    compileOnly "mcp.mobius.waila:Hwyla:${hwyla_version}"
-    compileOnly "net.darkhax.tesla:Tesla-1.12.2:${tesla_version}"
+    compileOnly "net.darkhax.tesla:Tesla-1.12:${tesla_version}"
    compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
    compileOnly "mcjty.theoneprobe:TheOneProbe-1.12:${top_version}:api"
    compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
    compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
-	compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api"
-    compileOnly "team.chisel.ctm:CTM:${ctm_version}"

    // at runtime, use the full JEI jar
    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
-    runtime "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2"
-    runtime "com.jaquadro.minecraft.chameleon:Chameleon:1.12-4.1.3"

    // unit test dependencies
    testCompile "junit:junit:4.12"
@@ -1,5 +1,6 @@
+#Tue Jul 04 22:38:49 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash

 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

-warn () {
+warn ( ) {
    echo "$*"
 }

-die () {
+die ( ) {
    echo
    echo "$*"
    echo
@@ -154,19 +154,11 @@ if $cygwin ; then
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -49,6 +49,7 @@ goto fail
@rem Get command-line arguments, handling Windows variants

 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args

 :win9xME_args
@rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute

 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$

 :execute
@rem Setup the command line
@@ -30,7 +30,6 @@ 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
@@ -61,9 +60,4 @@ public interface IAppEngApi
 	 */
 	IDefinitions definitions();

-	/**
-	 * @return Utility methods primarily useful for client side stuff
-	 */
-	IClientHelper client();
-
 }
@@ -26,20 +26,5 @@ package appeng.api.config;

 public enum ActionItems
 {
-	WRENCH,
-	CLOSE,
-	STASH,
-	ENCODE,
-	SUBSTITUTION,
-	MULTIPLY_BY_TWO,
-	MULTIPLY_BY_THREE,
-	INCREASE_BY_ONE,
-	DIVIDE_BY_TWO,
-	DIVIDE_BY_THREE,
-	DECREASE_BY_ONE,
-	MAX_COUNT,
-	FREE_MOLECULAR_SLOT_SHORTCUT,
-	TOGGLE_SHOW_FULL_INTERFACES_ON,
-	TOGGLE_SHOW_FULL_INTERFACES_OFF,
-	HIGHLIGHT_INTERFACE
+	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
 }
@@ -23,38 +23,18 @@

 package appeng.api.config;

-public enum FuzzyMode {
-    /**
-     * Matches any item from undamaged to including 0% durability, but not negative durability (where item damage
-     * exceeds maxdamage).
-     */
-    IGNORE_ALL(-1),
-    /**
-     * Matches items that have less than 100% durability (that is, at least 1 damage point) if a damaged item is used as
-     * the filter, or undamaged items otherwise.
-     */
-    PERCENT_99(0),
-    /**
-     * If an item with less than 75% durability is used as the filter, items with less than 75% durability are matched.
-     * Otherwise items with 75% durability or more are matched.
-     */
-    PERCENT_75(25),
-    /**
-     * If an item with less than 50% durability is used as the filter, items with less than 50% durability are matched.
-     * Otherwise items with 50% durability or more are matched.
-     */
-    PERCENT_50(50),
-    /**
-     * If an item with less than 25% durability is used as the filter, items with less than 50% durability are matched.
-     * Otherwise items with 25% durability or more are matched.
-     */
-    PERCENT_25(75);

-    public final float breakPoint;
-    /**
-     * Note this is percentage "damaged". It's the inverse of percentage durability.
-     */
-    public final float percentage;
+public enum FuzzyMode
+{
+	// Note that percentage damaged, is the inverse of percentage durability.
+	IGNORE_ALL( -1 ),
+	PERCENT_99( 0 ),
+	PERCENT_75( 25 ),
+	PERCENT_50( 50 ),
+	PERCENT_25( 75 );
+
+	public final float breakPoint;
+	public final float percentage;

 	FuzzyMode( final float p )
 	{
@@ -37,16 +37,12 @@ public enum Upgrades
 	/**
 	 * Gold Tier Upgrades.
 	 */
-	CAPACITY( 0 ),
-	REDSTONE( 0 ),
-	CRAFTING( 0 ),
+	CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ),

 	/**
 	 * Diamond Tier Upgrades.
 	 */
-	FUZZY( 1 ),
-	SPEED( 1 ),
-	INVERTER( 1 );
+	FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 );

 	private final int tier;
 	private final Map<ItemStack, Integer> supportedMax = new HashMap<>();
@@ -148,8 +148,6 @@ public interface IBlocks

 	ITileDefinition iface();

-	ITileDefinition fluidIface();
-
 	ITileDefinition cellWorkbench();

 	ITileDefinition iOPort();
@@ -88,14 +88,6 @@ public interface IItems

 	IItemDefinition cell64k();

-	IItemDefinition fluidCell1k();
-
-	IItemDefinition fluidCell4k();
-
-	IItemDefinition fluidCell16k();
-
-	IItemDefinition fluidCell64k();
-
 	IItemDefinition spatialCell2();

 	IItemDefinition spatialCell16();
@@ -134,12 +134,4 @@ public interface IMaterials
 	IItemDefinition qESingularity();

 	IItemDefinition blankPattern();
-
-	IItemDefinition fluidCell1kPart();
-
-	IItemDefinition fluidCell4kPart();
-
-	IItemDefinition fluidCell16kPart();
-
-	IItemDefinition fluidCell64kPart();
 }
@@ -39,7 +39,7 @@ public interface IParts
 	AEColoredItemDefinition cableGlass();

 	AEColoredItemDefinition cableDenseCovered();
-
+	
 	AEColoredItemDefinition cableDenseSmart();

 	AEColoredItemDefinition lumenCableSmart();
@@ -64,8 +64,6 @@ public interface IParts

 	IItemDefinition iface();

-	IItemDefinition fluidIface();
-
 	IItemDefinition levelEmitter();

 	IItemDefinition annihilationPlane();
@@ -109,18 +107,4 @@ public interface IParts
 	IItemDefinition storageMonitor();

 	IItemDefinition conversionMonitor();
-
-	IItemDefinition fluidTerminal();
-
-	IItemDefinition fluidImportBus();
-
-	IItemDefinition fluidExportBus();
-
-	IItemDefinition fluidStorageBus();
-
-	IItemDefinition fluidLevelEmitter();
-
-	IItemDefinition fluidAnnihilationPlane();
-
-	IItemDefinition fluidFormationnPlane();
 }
@@ -47,9 +47,7 @@ public interface IP2PTunnelRegistry
 	 * @param type - the type of tunnel. Nullable, but then ignored
 	 */
 	void addNewAttunement( @Nonnull ItemStack trigger, @Nullable TunnelType type );
-
 	void addNewAttunement( @Nonnull String ModId, @Nullable TunnelType type );
-
 	void addNewAttunement( @Nonnull Capability<?> cap, @Nullable TunnelType type );

 	/**
@@ -35,6 +35,6 @@ import appeng.api.networking.IGridHost;
 public interface INetworkTool extends IGuiItemObject
 {
 	IGridHost getGridHost(); // null for most purposes.
-
+	
 	IItemHandler getInventory();
 }
@@ -28,8 +28,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

-import appeng.api.util.AEColor;
-

 /**
 * Memory Card API
@@ -43,18 +41,13 @@ public interface IMemoryCard
 	 * Configures the data stored on the memory card, the SettingsName, will be
 	 * localized when displayed.
 	 *
-	 * The data can contain an optional string with the key "tooltip", which will be used as
-	 * unlocalized string to display it after the settings name.
-	 *
-	 * The data can contain an optional intArray using "colorCode" to be displayed on the model itself.
-	 * It needs to have exactly 8 elements representing the ordinal of the matching {@link AEColor}.
-	 * The first 4 values represent the top row, left to right. The second 4 the bottom row.
-	 *
 	 * @param is item
-	 * @param settingsName unlocalized string that represents the tile entity.
-	 * @param data the NBT tag, refer to the normal comment for special keys.
+	 * @param SettingsName unlocalized string that represents the tile entity.
+	 * @param data may contain a String called "tooltip" which is is a
+	 * unlocalized string displayed after the settings name, optional
+	 * but can be used to add details to the card for later.
 	 */
-	void setMemoryCardContents( ItemStack is, String settingsName, NBTTagCompound data );
+	void setMemoryCardContents( ItemStack is, String SettingsName, NBTTagCompound data );

 	/**
 	 * returns the settings name provided by a previous call to
@@ -75,17 +68,6 @@ public interface IMemoryCard
 	 */
 	NBTTagCompound getData( ItemStack is );

-	/**
-	 * This represent as 4x2 grid of {@link AEColor} without transparent/fluix color.
-	 *
-	 * First 4 colors are used for the top row, second for the bottom one.
-	 *
-	 * @param is item
-	 *
-	 * @return a hash representation of the memory card content
-	 */
-	AEColor[] getColorCode( ItemStack is );
-
 	/**
 	 * notify the user of a outcome related to the memory card.
 	 *
@@ -24,13 +24,10 @@
 package appeng.api.implementations.items;


-import javax.annotation.Nonnull;
-
 import net.minecraft.item.ItemStack;

 import appeng.api.storage.ICellWorkbenchItem;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEItemStack;


 /**
@@ -43,7 +40,7 @@ import appeng.api.storage.data.IAEStack;
 *
 * The standard AE implementation only provides 1-63 Types
 */
-public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
+public interface IStorageCell extends ICellWorkbenchItem
 {

 	/**
@@ -54,7 +51,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return number of bytes
 	 */
-	int getBytes( @Nonnull ItemStack cellItem );
+	int getBytes( ItemStack cellItem );

 	/**
 	 * Determines the number of bytes used for any type included on the cell.
@@ -63,7 +60,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return number of bytes
 	 */
-	int getBytesPerType( @Nonnull ItemStack cellItem );
+	int getBytesPerType( ItemStack cellItem );

 	/**
 	 * Must be between 1 and 63, indicates how many types you want to store on
@@ -73,7 +70,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return number of types
 	 */
-	int getTotalTypes( @Nonnull ItemStack cellItem );
+	int getTotalTypes( ItemStack cellItem );

 	/**
 	 * Allows you to fine tune which items are allowed on a given cell, if you
@@ -85,7 +82,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return true to preventAdditionOfItem
 	 */
-	boolean isBlackListed( @Nonnull ItemStack cellItem, @Nonnull T requestedAddition );
+	boolean isBlackListed( ItemStack cellItem, IAEItemStack requestedAddition );

 	/**
 	 * Allows you to specify if this storage cell can be stored inside other
@@ -106,16 +103,10 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return if the ItemStack should behavior as a storage cell.
 	 */
-	boolean isStorageCell( @Nonnull ItemStack i );
+	boolean isStorageCell( ItemStack i );

 	/**
 	 * @return drain in ae/t this storage cell will use.
 	 */
 	double getIdleDrain();
-
-	/**
-	 * @return the type of channel your cell should be part of
-	 */
-	@Nonnull
-	IStorageChannel<T> getChannel();
 }
@@ -29,5 +29,5 @@ package appeng.api.implementations.items;
 */
 public enum MemoryCardMessages
 {
-	INVALID_MACHINE, SETTINGS_LOADED, SETTINGS_SAVED, SETTINGS_RESET, SETTINGS_CLEARED
+	INVALID_MACHINE, SETTINGS_LOADED, SETTINGS_SAVED, SETTINGS_CLEARED
 }
@@ -23,7 +23,6 @@

 package appeng.api.implementations.tiles;

-
 import net.minecraftforge.items.IItemHandler;


@@ -23,7 +23,6 @@

 package appeng.api.implementations.tiles;

-
 import net.minecraftforge.items.IItemHandler;


@@ -24,8 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
 import appeng.api.networking.events.MENetworkEvent;
 import appeng.api.util.IReadOnlyCollection;

@@ -45,8 +43,7 @@ public interface IGrid
 	 *
 	 * @return the IGridCache you requested.
 	 */
-	@Nonnull
-	<C extends IGridCache> C getCache( @Nonnull Class<? extends IGridCache> iface );
+	<C extends IGridCache> C getCache( Class<? extends IGridCache> iface );

 	/**
 	 * Post an event into the network event bus.
@@ -55,8 +52,7 @@ public interface IGrid
 	 *
 	 * @return returns ev back to original poster
 	 */
-	@Nonnull
-	MENetworkEvent postEvent( @Nonnull MENetworkEvent ev );
+	MENetworkEvent postEvent( MENetworkEvent ev );

 	/**
 	 * Post an event into the network event bus, but direct it at a single node.
@@ -65,8 +61,7 @@ public interface IGrid
 	 *
 	 * @return returns ev back to original poster
 	 */
-	@Nonnull
-	MENetworkEvent postEventTo( @Nonnull IGridNode node, @Nonnull MENetworkEvent ev );
+	MENetworkEvent postEventTo( IGridNode node, MENetworkEvent ev );

 	/**
 	 * get a list of the diversity of classes, you can use this to better detect which machines your interested in,
@@ -74,7 +69,6 @@ public interface IGrid
 	 *
 	 * @return IReadOnlyCollection of all available host types (Of Type IGridHost).
 	 */
-	@Nonnull
 	IReadOnlyCollection<Class<? extends IGridHost>> getMachinesClasses();

 	/**
@@ -84,13 +78,11 @@ public interface IGrid
 	 *
 	 * @return IMachineSet of all nodes belonging to hosts of specified class.
 	 */
-	@Nonnull
-	IMachineSet getMachines( @Nonnull Class<? extends IGridHost> gridHostClass );
+	IMachineSet getMachines( Class<? extends IGridHost> gridHostClass );

 	/**
 	 * @return IReadOnlyCollection for all nodes on the network, node visitors are preferred.
 	 */
-	@Nonnull
 	IReadOnlyCollection<IGridNode> getNodes();

 	/**
@@ -101,6 +93,5 @@ public interface IGrid
 	/**
 	 * @return the node considered the pivot point of the grid.
 	 */
-	@Nonnull
 	IGridNode getPivot();
 }
@@ -26,9 +26,6 @@ package appeng.api.networking;

 import java.util.EnumSet;

-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;

@@ -52,7 +49,6 @@ public interface IGridBlock
 	 *
 	 * @return ae/t to use.
 	 */
-	@Nonnegative
 	double getIdlePowerUsage();

 	/**
@@ -60,11 +56,10 @@ public interface IGridBlock
 	 *
 	 * @return Set of flags for this IGridBlock
 	 */
-	@Nonnull
 	EnumSet<GridFlags> getFlags();

 	/**
-	 * Generally speaking you will return true for this, the one exception is buses, or worm holes where the node
+	 * generally speaking you will return true for this, the one exception is buses, or worm holes where the node
 	 * represents something that isn't a real connection in the world, but rather one represented internally to the
 	 * block.
 	 *
@@ -73,46 +68,37 @@ public interface IGridBlock
 	boolean isWorldAccessible();

 	/**
-	 * Must not return when {@link #isWorldAccessible()} is true.
-	 * Otherwise the behavior is unspecified.
-	 *
 	 * @return current location of this node
 	 */
-	@Nonnull
 	DimensionalCoord getLocation();

 	/**
 	 * @return Transparent, or a valid color, NULL IS NOT A VALID RETURN
 	 */
-	@Nonnull
 	AEColor getGridColor();

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

 	/**
 	 * @return the IGridHost for the node, this will be an IGridPart or a TileEntity generally speaking.
 	 */
-	@Nonnull
 	IGridHost getMachine();

 	/**
@@ -123,8 +109,7 @@ public interface IGridBlock
 	/**
 	 * Determines what item stack is used to render this node in the GUI.
 	 *
-	 * @return the render item stack to use to render this node. Returning an empty ItemStack will not show this node.
+	 * @return the render item stack to use to render this node, null is valid, and will not show this node.
 	 */
-	@Nonnull
 	ItemStack getMachineRepresentation();
 }
@@ -24,9 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
-
 /**
 * Allows you to create a network wise service, AE2 uses these for providing
 * item, spatial, and tunnel services.
@@ -53,7 +50,7 @@ public interface IGridCache
 	 * @param gridNode removed from that grid
 	 * @param machine to be removed machine
 	 */
-	void removeNode( @Nonnull IGridNode gridNode, @Nonnull IGridHost machine );
+	void removeNode( IGridNode gridNode, IGridHost machine );

 	/**
 	 * informs you cache that a machine was added to the grid.
@@ -65,7 +62,7 @@ public interface IGridCache
 	 * @param gridNode added to grid node
 	 * @param machine to be added machine
 	 */
-	void addNode( @Nonnull IGridNode gridNode, @Nonnull IGridHost machine );
+	void addNode( IGridNode gridNode, IGridHost machine );

 	/**
 	 * Called when a grid splits into two grids, AE will call a split as it
@@ -74,7 +71,7 @@ public interface IGridCache
 	 *
 	 * @param destinationStorage storage which receives half of old grid
 	 */
-	void onSplit( @Nonnull IGridStorage destinationStorage );
+	void onSplit( IGridStorage destinationStorage );

 	/**
 	 * Called when two grids merge into one, AE will call a join as it
@@ -83,12 +80,12 @@ public interface IGridCache
 	 *
 	 * @param sourceStorage old storage
 	 */
-	void onJoin( @Nonnull IGridStorage sourceStorage );
+	void onJoin( IGridStorage sourceStorage );

 	/**
 	 * Called when saving changes,
 	 *
 	 * @param destinationStorage storage
 	 */
-	void populateGridStorage( @Nonnull IGridStorage destinationStorage );
+	void populateGridStorage( IGridStorage destinationStorage );
 }
@@ -24,9 +24,7 @@
 package appeng.api.networking;


-import java.util.Map;
-
-import javax.annotation.Nonnull;
+import java.util.HashMap;


 /**
@@ -40,14 +38,14 @@ public interface IGridCacheRegistry
 	 *
 	 * @param iface grid cache class
 	 */
-	void registerGridCache( @Nonnull Class<? extends IGridCache> iface, @Nonnull Class<? extends IGridCache> implementation );
+	void registerGridCache( Class<? extends IGridCache> iface, Class<? extends IGridCache> implementation );

 	/**
 	 * requests a new INSTANCE of a grid cache for use, used internally
 	 *
 	 * @param grid grid
 	 *
-	 * @return a new Map of IGridCaches from the registry, called from IGrid when constructing a new grid.
+	 * @return a new HashMap of IGridCaches from the registry, called from IGrid when constructing a new grid.
 	 */
-	Map<Class<? extends IGridCache>, IGridCache> createCacheInstance( IGrid grid );
+	HashMap<Class<? extends IGridCache>, IGridCache> createCacheInstance( IGrid grid );
 }
@@ -24,8 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
 import appeng.api.util.AEPartLocation;


@@ -47,7 +45,6 @@ public interface IGridConnection
 	 *
 	 * @return the IGridNode which represents the opposite side of the connection.
 	 */
-	@Nonnull
 	IGridNode getOtherSide( IGridNode gridNode );

 	/**
@@ -57,7 +54,6 @@ public interface IGridConnection
 	 *
 	 * @return the direction of the connection, only valid for in world connections.
 	 */
-	@Nonnull
 	AEPartLocation getDirection( IGridNode gridNode );

 	/**
@@ -69,13 +65,11 @@ public interface IGridConnection
 	/**
 	 * @return node A
 	 */
-	@Nonnull
 	IGridNode a();

 	/**
 	 * @return node B
 	 */
-	@Nonnull
 	IGridNode b();

 	/**
@@ -24,9 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
-
 public interface IGridConnectionVisitor extends IGridVisitor
 {

@@ -35,5 +32,5 @@ public interface IGridConnectionVisitor extends IGridVisitor
 	 *
 	 * @param n the connection.
 	 */
-	void visitConnection( @Nonnull IGridConnection n );
+	void visitConnection( IGridConnection n );
 }
@@ -24,14 +24,12 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
 import appeng.api.exceptions.FailedConnectionException;


 /**
 * A helper responsible for creating new {@link IGridNode}, {@link IGridConnection} or potentially similar tasks.
- *
+ * 
 * @author yueh
 * @version rv5
 * @since rv5
@@ -41,7 +39,7 @@ public interface IGridHelper

 	/**
 	 * Create a grid node for your {@link IGridHost}
-	 *
+	 * 
 	 * The passed {@link IGridBlock} represents the definition for properties like connectable sides.
 	 * Refer to its documentation for further details.
 	 *
@@ -49,20 +47,18 @@ public interface IGridHelper
 	 *
 	 * @return grid node of block
 	 */
-	@Nonnull
-	IGridNode createGridNode( @Nonnull IGridBlock block );
+	IGridNode createGridNode( IGridBlock block );

 	/**
 	 * Create a direct connection between two {@link IGridNode}.
-	 *
+	 * 
 	 * This will be considered as having a distance of 1, regardless of the location of both nodes.
-	 *
+	 * 
 	 * @param a to be connected gridnode
 	 * @param b to be connected gridnode
 	 *
 	 * @throws appeng.api.exceptions.FailedConnectionException
 	 */
-	@Nonnull
-	IGridConnection createGridConnection( @Nonnull IGridNode a, @Nonnull IGridNode b ) throws FailedConnectionException;
+	IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnectionException;

 }
@@ -24,9 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import net.minecraft.tileentity.TileEntity;

 import appeng.api.parts.IPart;
@@ -52,8 +49,7 @@ public interface IGridHost
 	 * @return a new IGridNode, create these with
 	 * AEApi.INSTANCE().createGridNode( MyIGridBlock )
 	 */
-	@Nullable
-	IGridNode getGridNode( @Nonnull AEPartLocation dir );
+	IGridNode getGridNode( AEPartLocation dir );

 	/**
 	 * Determines how cables render when they connect to this block. Priority is
@@ -61,8 +57,7 @@ public interface IGridHost
 	 *
 	 * @param dir direction
 	 */
-	@Nonnull
-	AECableType getCableConnectionType( @Nonnull AEPartLocation dir );
+	AECableType getCableConnectionType( AEPartLocation dir );

 	/**
 	 * break this host, its violating security rules, just break your block, or part.
@@ -26,8 +26,6 @@ package appeng.api.networking;

 import java.util.Iterator;

-import javax.annotation.Nonnull;
-

 /**
 * An extension of IGridBlock, only means something when your getFlags() contains REQUIRE_CHANNEL, when done properly it
@@ -42,6 +40,5 @@ public interface IGridMultiblock extends IGridBlock
 	 *
 	 * @return an iterator that will iterate all the nodes for the multiblock. ( read-only iterator expected. )
 	 */
-	@Nonnull
 	Iterator<IGridNode> getMultiblockNodes();
 }
@@ -26,8 +26,6 @@ package appeng.api.networking;

 import java.util.EnumSet;

-import javax.annotation.Nonnull;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;

@@ -52,7 +50,7 @@ public interface IGridNode
 	 *
 	 * @param visitor visitor
 	 */
-	void beginVisit( @Nonnull IGridVisitor visitor );
+	void beginVisit( IGridVisitor visitor );

 	/**
 	 * inform the node that your IGridBlock has changed its internal state, and force the node to update.
@@ -70,7 +68,6 @@ public interface IGridNode
 	 *
 	 * @return grid host
 	 */
-	@Nonnull
 	IGridHost getMachine();

 	/**
@@ -78,7 +75,6 @@ public interface IGridNode
 	 *
 	 * @return grid
 	 */
-	@Nonnull
 	IGrid getGrid();

 	/**
@@ -90,13 +86,11 @@ public interface IGridNode
 	/**
 	 * @return the world the node is located in
 	 */
-	@Nonnull
 	World getWorld();

 	/**
 	 * @return a set of the connected sides, INTERNAL represents an invisible connection
 	 */
-	@Nonnull
 	EnumSet<AEPartLocation> getConnectedSides();

 	/**
@@ -104,13 +98,11 @@ public interface IGridNode
 	 *
 	 * @return grid connections
 	 */
-	@Nonnull
 	IReadOnlyCollection<IGridConnection> getConnections();

 	/**
 	 * @return the IGridBlock for this node
 	 */
-	@Nonnull
 	IGridBlock getGridBlock();

 	/**
@@ -130,7 +122,7 @@ public interface IGridNode
 	 * @param name nbt name
 	 * @param nodeData to be loaded data
 	 */
-	void loadFromNBT( @Nonnull String name, @Nonnull NBTTagCompound nodeData );
+	void loadFromNBT( String name, NBTTagCompound nodeData );

 	/**
 	 * this should be called for each node you maintain, you can save all your nodes to the same tag with different
@@ -139,7 +131,7 @@ public interface IGridNode
 	 * @param name nbt name
 	 * @param nodeData to be saved data
 	 */
-	void saveToNBT( @Nonnull String name, @Nonnull NBTTagCompound nodeData );
+	void saveToNBT( String name, NBTTagCompound nodeData );

 	/**
 	 * @return if the node's channel requirements are currently met, use this for display purposes, use isActive for
@@ -154,7 +146,7 @@ public interface IGridNode
 	 *
 	 * @return true if has flag
 	 */
-	boolean hasFlag( @Nonnull GridFlags flag );
+	boolean hasFlag( GridFlags flag );

 	/**
 	 * @return the ownerID this represents the person who placed the node.
@@ -24,8 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
 import net.minecraft.nbt.NBTTagCompound;


@@ -35,7 +33,6 @@ public interface IGridStorage
 	/**
 	 * @return an NBTTagCompound that can be read, and written too.
 	 */
-	@Nonnull
 	NBTTagCompound dataObject();

 	/**
@@ -24,9 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
-
 /**
 * Simple Visitor pattern access to network nodes.
 */
@@ -42,5 +39,5 @@ public interface IGridVisitor
 	 *
 	 * @return true to continue visiting nodes beyond this node.
 	 */
-	boolean visitNode( @Nonnull IGridNode n );
+	boolean visitNode( IGridNode n );
 }
@@ -24,8 +24,6 @@
 package appeng.api.networking;


-import javax.annotation.Nonnull;
-
 import appeng.api.util.IReadOnlyCollection;


@@ -35,6 +33,5 @@ public interface IMachineSet extends IReadOnlyCollection<IGridNode>
 	/**
 	 * @return the machine class for this set.
 	 */
-	@Nonnull
 	Class<? extends IGridHost> getMachineClass();
 }
@@ -24,9 +24,6 @@
 package appeng.api.networking.crafting;


-import javax.annotation.Nonnull;
-
-
 public interface ICraftingCallback
 {

@@ -35,5 +32,5 @@ public interface ICraftingCallback
 	 *
 	 * @param job - final job
 	 */
-	void calculationComplete( @Nonnull ICraftingJob job );
+	void calculationComplete( ICraftingJob job );
 }
@@ -99,18 +99,9 @@ public interface ICraftingGrid extends IGridCache
 	/**
 	 * is this item being crafted?
 	 *
-	 * @param what item being crafted
+	 * @param aeStackInSlot item being crafted
 	 *
 	 * @return true if it is being crafting
 	 */
-	boolean isRequesting( IAEItemStack what );
-
-	/**
-	 * The total amount being requested across all crafting cpus of a grid.
-	 *
-	 * @param what item being requested, ignores stacksize
-	 *
-	 * @return The total amount being requested.
-	 */
-	long requesting( IAEItemStack what );
+	boolean isRequesting( IAEItemStack aeStackInSlot );
 }
@@ -24,8 +24,6 @@
 package appeng.api.networking.energy;


-import javax.annotation.Nonnull;
-
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;

@@ -44,7 +42,7 @@ public interface IAEPowerStorage extends IEnergySource
 	 *
 	 * @return amount of power which was unable to be stored
 	 */
-	double injectAEPower( double amt, @Nonnull Actionable mode );
+	double injectAEPower( double amt, Actionable mode );

 	/**
 	 * @return the current maximum power ( this can change :P )
@@ -69,6 +67,5 @@ public interface IAEPowerStorage extends IEnergySource
 	 *
 	 * @return access restriction what the network can do
 	 */
-	@Nonnull
 	AccessRestriction getPowerFlow();
 }
@@ -24,9 +24,6 @@
 package appeng.api.networking.energy;


-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-
 import appeng.api.config.Actionable;
 import appeng.api.networking.IGridCache;
 import appeng.api.networking.events.MENetworkPowerStatusChange;
@@ -41,20 +38,17 @@ public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvi
 	/**
 	 * @return the current calculated idle energy drain each tick, is used internally to drain power for each tick.
 	 */
-	@Nonnegative
 	double getIdlePowerUsage();

 	/**
 	 * @return the average power drain over the past 10 ticks, includes idle usage during this time, and all use of
 	 * extractPower.
 	 */
-	@Nonnegative
 	double getAvgPowerUsage();

 	/**
 	 * @return the average energy injected into the system per tick, for the last 10 ticks.
 	 */
-	@Nonnegative
 	double getAvgPowerInjection();

 	/**
@@ -85,15 +79,13 @@ public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvi
 	 *
 	 * @return the amount of power that the network has OVER the limit.
 	 */
-	@Nonnegative
-	double injectPower( @Nonnegative double amt, @Nonnull Actionable mode );
+	double injectPower( double amt, Actionable mode );

 	/**
 	 * this is should be considered an estimate, and not relied upon for real calculations.
 	 *
 	 * @return estimated available power.
 	 */
-	@Nonnegative
 	double getStoredPower();

 	/**
@@ -101,7 +93,6 @@ public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvi
 	 *
 	 * @return estimated available power.
 	 */
-	@Nonnegative
 	double getMaxStoredPower();

 	/**
@@ -110,6 +101,5 @@ public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvi
 	 *
 	 * @return Amount of power required to charge the grid, in AE.
 	 */
-	@Nonnegative
-	double getEnergyDemand( @Nonnegative double maxRequired );
+	double getEnergyDemand( double maxRequired );
 }
@@ -24,9 +24,6 @@
 package appeng.api.networking.energy;


-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;

@@ -42,6 +39,5 @@ public interface IEnergySource
 	 *
 	 * @return returns extracted power.
 	 */
-	@Nonnegative
-	double extractAEPower( @Nonnegative double amt, @Nonnull Actionable mode, @Nonnull PowerMultiplier usePowerMultiplier );
+	double extractAEPower( double amt, Actionable mode, PowerMultiplier usePowerMultiplier );
 }
@@ -24,9 +24,6 @@
 package appeng.api.networking.energy;


-import javax.annotation.Nonnegative;
-
-
 /**
 * DO NOT IMPLEMENT.
 *
@@ -42,7 +39,7 @@ public interface IEnergyWatcher
 	 * @param amount
 	 * @return true, if successfully added.
 	 */
-	boolean add( @Nonnegative double amount );
+	boolean add( double amount );

 	/**
 	 * Remove a specific threshold from the watcher.
@@ -50,7 +47,7 @@ public interface IEnergyWatcher
 	 * @param amount
 	 * @return true, if successfully removed.
 	 */
-	boolean remove( @Nonnegative double amount );
+	boolean remove( double amount );

 	/**
 	 * Removes all thresholds and resets the watcher to a clean state.
@@ -24,9 +24,6 @@
 package appeng.api.networking.energy;


-import javax.annotation.Nonnull;
-
-
 public interface IEnergyWatcherHost
 {

@@ -36,12 +33,12 @@ public interface IEnergyWatcherHost
 	 *
 	 * @param newWatcher new watcher
 	 */
-	void updateWatcher( @Nonnull IEnergyWatcher newWatcher );
+	void updateWatcher( IEnergyWatcher newWatcher );

 	/**
 	 * Called when a threshold is crossed.
 	 *
 	 * @param energyGrid grid
 	 */
-	void onThresholdPass( @Nonnull IEnergyGrid energyGrid );
+	void onThresholdPass( IEnergyGrid energyGrid );
 }
@@ -24,8 +24,6 @@
 package appeng.api.networking.pathing;


-import javax.annotation.Nonnull;
-
 import appeng.api.networking.IGridCache;


@@ -41,7 +39,6 @@ public interface IPathingGrid extends IGridCache
 	 * @return the controller state of the network, useful if you want to
 	 * require a controller for a feature.
 	 */
-	@Nonnull
 	ControllerState getControllerState();

 	/**
@@ -24,8 +24,6 @@
 package appeng.api.networking.security;


-import javax.annotation.Nonnull;
-
 import appeng.api.networking.IGridNode;


@@ -40,6 +38,5 @@ public interface IActionHost
 	 * @return the the gridnode that actions from this IGridHost are preformed
 	 * by.
 	 */
-	@Nonnull
 	IGridNode getActionableNode();
 }
@@ -24,9 +24,6 @@
 package appeng.api.networking.security;


-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-
 import net.minecraft.entity.player.EntityPlayer;

 import appeng.api.config.SecurityPermissions;
@@ -49,7 +46,7 @@ public interface ISecurityGrid extends IGridCache
 	 *
 	 * @return true if the player has permissions.
 	 */
-	boolean hasPermission( @Nonnull EntityPlayer player, @Nonnull SecurityPermissions perm );
+	boolean hasPermission( EntityPlayer player, SecurityPermissions perm );

 	/**
 	 * Check if a player has permissions.
@@ -59,7 +56,7 @@ public interface ISecurityGrid extends IGridCache
 	 *
 	 * @return true if the player has permissions.
 	 */
-	boolean hasPermission( @Nonnegative int playerID, @Nonnull SecurityPermissions perm );
+	boolean hasPermission( int playerID, SecurityPermissions perm );

 	/**
 	 * @return PlayerID of the admin, or owner, this is the person who placed the security block.
@@ -25,7 +25,7 @@ package appeng.api.networking.security;


 import java.util.EnumSet;
-import java.util.Map;
+import java.util.HashMap;

 import appeng.api.config.SecurityPermissions;

@@ -48,7 +48,7 @@ public interface ISecurityProvider
 	 *
 	 * @param playerPerms player permissions
 	 */
-	void readPermissions( Map<Integer, EnumSet<SecurityPermissions>> playerPerms );
+	void readPermissions( HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms );

 	/**
 	 * @return is security on or off?
@@ -26,8 +26,6 @@ package appeng.api.networking.security;

 import java.util.EnumSet;

-import javax.annotation.Nonnull;
-
 import appeng.api.config.SecurityPermissions;


@@ -43,5 +41,5 @@ public interface ISecurityRegistry
 	 * @param playerID player id
 	 * @param permissions permissions of player
 	 */
-	void addPlayer( int playerID, @Nonnull EnumSet<SecurityPermissions> permissions );
+	void addPlayer( int playerID, EnumSet<SecurityPermissions> permissions );
 }
@@ -24,8 +24,6 @@
 package appeng.api.networking.ticking;


-import javax.annotation.Nonnull;
-
 import appeng.api.networking.IGridNode;


@@ -47,18 +45,18 @@ public interface IGridTickable
 	 */

 	/**
-	 * Return a valid TickingRequest to tell AE a guide for which type of
-	 * responsiveness your device wants.
+	 * You can return null, if you wish to tick using MC's ticking mechanism, or
+	 * you can return a valid TickingRequest to tell AE a guide for which type
+	 * of responsiveness your device wants.
 	 *
-	 * This will be called for your tile any time your tile changes grids, this
+	 * this will be called for your tile any time your tile changes grids, this
 	 * can happen at any time, so if your using the sleep feature you may wish
 	 * to preserve your sleep, in the result of this method. or you can simply
 	 * reset it.
 	 *
-	 * @return a valid new TickingRequest
+	 * @return null or a valid new TickingRequest
 	 */
-	@Nonnull
-	TickingRequest getTickingRequest( @Nonnull IGridNode node );
+	TickingRequest getTickingRequest( IGridNode node );

 	/**
 	 * AE lets you adjust your tick rate based on the results of your tick, if
@@ -69,12 +67,11 @@ public interface IGridTickable
 	 *
 	 * Note: this is never called if you return null from getTickingRequest.
 	 *
-	 * @param ticksSinceLastCall the number of world ticks that were skipped since your last
+	 * @param TicksSinceLastCall the number of world ticks that were skipped since your last
 	 * tick, you can use this to adjust speed of processing or adjust
 	 * your tick rate.
 	 *
 	 * @return tick rate adjustment.
 	 */
-	@Nonnull
-	TickRateModulation tickingRequest( @Nonnull IGridNode node, int ticksSinceLastCall );
+	TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall );
 }
@@ -24,8 +24,6 @@
 package appeng.api.networking.ticking;


-import javax.annotation.Nonnull;
-
 import appeng.api.networking.IGridCache;
 import appeng.api.networking.IGridNode;

@@ -44,7 +42,7 @@ public interface ITickManager extends IGridCache
 	 *
 	 * @param node gridnode
 	 */
-	boolean alertDevice( @Nonnull IGridNode node );
+	boolean alertDevice( IGridNode node );

 	/**
 	 * disables ticking for your device.
@@ -53,7 +51,7 @@ public interface ITickManager extends IGridCache
 	 *
 	 * @return if the call was successful.
 	 */
-	boolean sleepDevice( @Nonnull IGridNode node );
+	boolean sleepDevice( IGridNode node );

 	/**
 	 * enables ticking for your device, undoes a sleepDevice call.
@@ -62,5 +60,5 @@ public interface ITickManager extends IGridCache
 	 *
 	 * @return if the call was successful.
 	 */
-	boolean wakeDevice( @Nonnull IGridNode node );
+	boolean wakeDevice( IGridNode node );
 }
@@ -1,4 +1,3 @@
-
 /*
 * The MIT License (MIT)
 *
@@ -209,7 +209,6 @@ public interface IPart extends IBoxProvider, ICustomCableConnection
 	 * Called when you right click the part, very similar to Block.onActivateBlock
 	 *
 	 * @param player right clicking player
-	 * @param hand hand used
 	 * @param pos position of block
 	 *
 	 * @return if your activate method performed something.
@@ -220,41 +219,12 @@ public interface IPart extends IBoxProvider, ICustomCableConnection
 	 * Called when you right click the part, very similar to Block.onActivateBlock
 	 *
 	 * @param player shift right clicking player
-	 * @param hand hand used
 	 * @param pos position of block
 	 *
 	 * @return if your activate method performed something, you should use false unless you really need it.
 	 */
 	boolean onShiftActivate( EntityPlayer player, EnumHand hand, Vec3d pos );

-	/**
-	 * Called when you left click the part, very similar to Block.onBlockClicked
-	 *
-	 * @param player left clicking player
-	 * @param hand hand used
-	 * @param pos position of block
-	 *
-	 * @return if your activate method performed something, you should use false unless you really need it.
-	 */
-	default boolean onClicked( EntityPlayer player, EnumHand hand, Vec3d pos )
-	{
-		return false;
-	}
-
-	/**
-	 * Called when you shift-left click the part, very similar to Block.onBlockClicked
-	 *
-	 * @param player shift-left clicking player
-	 * @param hand hand used
-	 * @param pos position of block
-	 * 
-	 * @return if your activate method performed something, you should use false unless you really need it.
-	 */
-	default boolean onShiftClicked( EntityPlayer player, EnumHand hand, Vec3d pos )
-	{
-		return false;
-	}
-
 	/**
 	 * Add drops to the items being dropped into the world, if your item stores its contents when wrenched use the
 	 * wrenched boolean to control what data is saved vs dropped when it is broken.
@@ -291,9 +261,6 @@ public interface IPart extends IBoxProvider, ICustomCableConnection

 	/**
 	 * Used to determine which parts can be placed on what cables.
-	 * 
-	 * Dense cables are not allowed for functional (getGridNode returns a node) parts.
-	 * Doing so will result in crashes.
 	 *
 	 * @param what placed part
 	 *
@@ -358,14 +325,4 @@ public interface IPart extends IBoxProvider, ICustomCableConnection
 		return null;
 	}

-	/**
-	 * Flag to be passed to the renderer.
-	 * 
-	 * @return flag or null
-	 */
-	default Long getRenderFlag()
-	{
-		return null;
-	}
-
-}
+}
@@ -1,15 +0,0 @@
-
-package appeng.api.parts;
-
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.client.renderer.block.model.BakedQuad;
-
-
-public interface IPartBakedModel
-{
-	List<BakedQuad> getPartQuads( @Nullable Long partFlags, long rand );
-}
@@ -72,7 +72,7 @@ public interface IPartHost extends ICustomCableConnection
 	 * @return null if the item failed to add, the side it was placed on other wise ( may different for cables,
 	 * {@link AEPartLocation}.UNKNOWN )
 	 */
-	AEPartLocation addPart( ItemStack is, AEPartLocation side, EntityPlayer owner, EnumHand hand );
+	AEPartLocation addPart( ItemStack is, AEPartLocation side, EntityPlayer owner, EnumHand hand  );

 	/**
 	 * Get part by side ( center is {@link AEPartLocation}.UNKNOWN )
@@ -23,7 +23,6 @@

 package appeng.api.parts;

-
 /**
 * TODO: Consider removing and replacing with capabilities.
 */
@@ -30,7 +30,6 @@ import appeng.api.exceptions.MissingIngredientException;
 import appeng.api.exceptions.RecipeException;
 import appeng.api.exceptions.RegistrationException;

-
@Deprecated
 public interface ICraftHandler
 {
@@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack;
 import appeng.api.exceptions.MissingIngredientException;
 import appeng.api.exceptions.RegistrationException;

-
@Deprecated
 public interface IIngredient
 {
@@ -28,7 +28,6 @@ import java.io.BufferedReader;

 import javax.annotation.Nonnull;

-
@Deprecated
 public interface IRecipeLoader
 {
@@ -1,47 +0,0 @@
-
-package appeng.api.storage;
-
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-import appeng.api.implementations.tiles.IChestOrDrive;
-import appeng.api.storage.data.IAEStack;
-
-
-public interface ICellGuiHandler
-{
-	/**
-	 * Return true if this handler can show GUI for this channel.
-	 * 
-	 * @param channel Storage channel
-	 * @return True if handled, else false.
-	 */
-	<T extends IAEStack<T>> boolean isHandlerFor( IStorageChannel<T> channel );
-
-	/**
-	 * Return true to prioritize this handler for the provided {@link ItemStack}.
-	 * 
-	 * @param is Cell ItemStack
-	 * @return True, if specialized else false.
-	 */
-	default boolean isSpecializedFor( ItemStack is )
-	{
-		return false;
-	}
-
-	/**
-	 * Called when the storage cell is placed in an ME Chest and the user tries to open the terminal side, if your item
-	 * is not available via ME Chests simply tell the user they can't use it, or something, other wise you should open
-	 * your gui and display the cell to the user.
-	 *
-	 * @param player player opening chest gui
-	 * @param chest to be opened chest
-	 * @param cellHandler cell handler
-	 * @param inv inventory handler
-	 * @param is item
-	 * @param chan storage channel
-	 */
-	<T extends IAEStack<T>> void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler<T> inv, ItemStack is, IStorageChannel<T> chan );
-
-}
@@ -24,8 +24,10 @@
 package appeng.api.storage;


+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

+import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.storage.data.IAEStack;


@@ -50,12 +52,26 @@ public interface ICellHandler
 	 *
 	 * @param is a storage cell item.
 	 * @param host anytime the contents of your storage cell changes it should use this to request a save, please
-	 * note, this value can be null. If provided, the host is responsible for persisting the cell content.
+	 * note, this value can be null.
 	 * @param channel the storage channel requested.
 	 *
 	 * @return a new IMEHandler for the provided item
 	 */
-	<T extends IAEStack<T>> ICellInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> channel );
+	<T extends IAEStack<T>> IMEInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> channel );
+
+	/**
+	 * Called when the storage cell is planed in an ME Chest and the user tries to open the terminal side, if your item
+	 * is not available via ME Chests simply tell the user they can't use it, or something, other wise you should open
+	 * your gui and display the cell to the user.
+	 *
+	 * @param player player opening chest gui
+	 * @param chest to be opened chest
+	 * @param cellHandler cell handler
+	 * @param inv inventory handler
+	 * @param is item
+	 * @param chan storage channel
+	 */
+	<T extends IAEStack<T>> void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler<T> inv, ItemStack is, IStorageChannel<T> chan );

 	/**
 	 * 0 - cell is missing.
@@ -71,31 +87,10 @@ public interface ICellHandler
 	 *
 	 * @return get the status of the cell based on its contents.
 	 */
-	default <T extends IAEStack<T>> int getStatusForCell( ItemStack is, ICellInventoryHandler<T> handler )
-	{
-		if( handler.getCellInv() != null )
-		{
-			int val = handler.getCellInv().getStatusForCell();
-
-			if( val == 1 && handler.isPreformatted() )
-			{
-				val = 2;
-			}
-
-			return val;
-		}
-		return 0;
-	}
+	<T extends IAEStack<T>> int getStatusForCell( ItemStack is, IMEInventory<T> handler );

 	/**
 	 * @return the ae/t to drain for this storage cell inside a chest/drive.
 	 */
-	default <T extends IAEStack<T>> double cellIdleDrain( ItemStack is, ICellInventoryHandler<T> handler )
-	{
-		if( handler.getCellInv() != null )
-		{
-			return handler.getCellInv().getIdleDrain();
-		}
-		return 1.0;
-	}
+	<T extends IAEStack<T>> double cellIdleDrain( ItemStack is, IMEInventory<T> handler );
 }
@@ -28,10 +28,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.config.FuzzyMode;
-import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEItemStack;


-public interface ICellInventory<T extends IAEStack<T>> extends IMEInventory<T>
+public interface ICellInventory extends IMEInventory<IAEItemStack>
 {

 	/**
@@ -40,7 +40,7 @@ public interface ICellInventory<T extends IAEStack<T>> extends IMEInventory<T>
 	ItemStack getItemStack();

 	/**
-	 * @return the ae/t to drain for this storage cell inside a chest/drive.
+	 * @return idle cost for this Storage Cell
 	 */
 	double getIdleDrain();

@@ -115,20 +115,7 @@ public interface ICellInventory<T extends IAEStack<T>> extends IMEInventory<T>
 	int getUnusedItemCount();

 	/**
-	 * 0 - cell is missing.
-	 *
-	 * 1 - green, ( usually means available room for types or items. )
-	 *
-	 * 2 - orange, ( usually means available room for items, but not types. )
-	 *
-	 * 3 - red, ( usually means the cell is 100% full )
-	 *
-	 * @return get the status of the cell based on its contents.
+	 * @return the status number for this drive.
 	 */
 	int getStatusForCell();
-
-	/**
-	 * Tells the cell to persist to NBT
-	 */
-	void persist();
 }
@@ -24,22 +24,17 @@
 package appeng.api.storage;


-import javax.annotation.Nullable;
-
 import appeng.api.config.IncludeExclude;
-import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEItemStack;


-public interface ICellInventoryHandler<T extends IAEStack<T>> extends IMEInventoryHandler<T>
+public interface ICellInventoryHandler extends IMEInventoryHandler<IAEItemStack>
 {

 	/**
-	 * Get access to the ICellInventory. Can be null for custom cells.
-	 * 
 	 * @return get access to the Cell Inventory.
 	 */
-	@Nullable
-	ICellInventory<T> getCellInv();
+	ICellInventory getCellInv();

 	boolean isPreformatted();

@@ -24,11 +24,7 @@
 package appeng.api.storage;


-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;

 import appeng.api.IAppEngApi;
 import appeng.api.storage.data.IAEStack;
@@ -46,19 +42,9 @@ public interface ICellRegistry
 	/**
 	 * Register a new handler.
 	 *
-	 * Never be call before {@link FMLInitializationEvent} was handled by AE2.
-	 * Will throw an exception otherwise.
-	 *
 	 * @param handler cell handler
 	 */
-	void addCellHandler( @Nonnull ICellHandler handler );
-
-	/**
-	 * Register a new handler
-	 * 
-	 * @param handler cell gui handler
-	 */
-	void addCellGuiHandler( @Nonnull ICellGuiHandler handler );
+	void addCellHandler( ICellHandler handler );

 	/**
 	 * return true, if you can get a InventoryHandler for the item passed.
@@ -71,34 +57,22 @@ public interface ICellRegistry
 	boolean isCellHandled( ItemStack is );

 	/**
-	 * get the handler, for the requested item.
+	 * get the handler, for the requested type.
 	 *
 	 * @param is to be checked item
 	 *
 	 * @return the handler registered for this item type.
 	 */
-	@Nullable
 	ICellHandler getHandler( ItemStack is );

 	/**
-	 * get the handler, for the requested channel.
-	 *
-	 * @param channel requested channel
-	 * @param Cell ItemStack
-	 * @return the handler registered for this channel.
-	 */
-	@Nullable
-	<T extends IAEStack<T>> ICellGuiHandler getGuiHandler( IStorageChannel<T> channel, ItemStack is );
-
-	/**
-	 * returns an ICellInventoryHandler for the provided item by querying all registered handlers.
+	 * returns an IMEInventoryHandler for the provided item.
 	 *
 	 * @param is item with inventory handler
-	 * @param host can be null. If provided, the host is responsible for persisting the cell content.
+	 * @param host can be null, or the hosting tile / part.
 	 * @param chan the storage channel to request the handler for.
 	 *
-	 * @return new ICellInventoryHandler, or null if there isn't one.
+	 * @return new IMEInventoryHandler, or null if there isn't one.
 	 */
-	@Nullable
-	<T extends IAEStack<T>> ICellInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> chan );
+	<T extends IAEStack<T>> IMEInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> chan );
 }
@@ -24,19 +24,8 @@
 package appeng.api.storage;


-import javax.annotation.Nullable;
-
-
-/**
- * Tells the cell provider that changes have been made an the cell must be persisted
- *
- */
 public interface ISaveProvider
 {
-	/**
-	 * Cell has changed and needs to be changed.
-	 * 
-	 * @param cellInventory can be null for custom cells.
-	 */
-	void saveChanges( @Nullable ICellInventory<?> cellInventory );
+
+	void saveChanges( IMEInventory<?> cellInventory );
 }
@@ -32,9 +32,10 @@ import javax.annotation.Nullable;
 import io.netty.buffer.ByteBuf;

 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;

+import appeng.api.networking.energy.IEnergySource;
+import appeng.api.networking.security.IActionSource;
+import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;

@@ -55,17 +56,6 @@ public interface IStorageChannel<T extends IAEStack<T>>
 		return 1;
 	}

-	/**
-	 * The number of units (eg item count, or millibuckets) that can be stored per byte in a storage cell.
-	 * Standard value for items is 8, and for fluids it's 8000
-	 *
-	 * @return number of units
-	 */
-	default int getUnitsPerByte()
-	{
-		return 8;
-	}
-
 	/**
 	 * Create a new {@link IItemList} of the specific type.
 	 * 
@@ -78,12 +68,9 @@ public interface IStorageChannel<T extends IAEStack<T>>
 	 * Create a new {@link IAEStack} subtype of the specific object.
 	 * 
 	 * The parameter is unbound to allow a slightly more flexible approach.
-	 * But the general intention is about converting an {@link ItemStack} or {@link FluidStack} into the corresponding
-	 * {@link IAEStack}.
+	 * But the general intention is about converting an {@link ItemStack} into the corresponding {@link IAEItemStack}.
 	 * Another valid case might be to use it instead of {@link IAEStack#copy()}, but this might not be supported by all
 	 * types.
-	 * IAEStacks that use custom items for {@link IAEStack#asItemStackRepresentation()} must also be able to convert
-	 * these.
 	 * 
 	 * @param input The object to turn into an {@link IAEStack}
 	 * @return The converted stack or null
@@ -101,11 +88,29 @@ public interface IStorageChannel<T extends IAEStack<T>>
 	T readFromPacket( @Nonnull ByteBuf input ) throws IOException;

 	/**
-	 * create from nbt data
-	 * 
-	 * @param nbt
-	 * @return
+	 * use energy from energy, to remove request items from cell, at the request of src.
+	 *
+	 * @param energy to be drained energy source
+	 * @param cell cell of requested items
+	 * @param request requested items
+	 * @param src action source
+	 *
+	 * @return items that successfully extracted.
 	 */
 	@Nullable
-	T createFromNBT( @Nonnull NBTTagCompound nbt );
+	T poweredExtraction( @Nonnull IEnergySource energy, @Nonnull IMEInventory<T> cell, @Nonnull T request, @Nonnull IActionSource src );
+
+	/**
+	 * use energy from energy, to inject input items into cell, at the request of src
+	 *
+	 * @param energy to be added energy source
+	 * @param cell injected cell
+	 * @param input to be injected items
+	 * @param src action source
+	 *
+	 * @return items that failed to insert.
+	 */
+	@Nullable
+	T poweredInsert( @Nonnull IEnergySource energy, @Nonnull IMEInventory<T> cell, @Nonnull T input, @Nonnull IActionSource src );
+
 }
@@ -28,15 +28,10 @@ import java.util.Collection;

 import javax.annotation.Nonnull;

-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

-import appeng.api.config.Actionable;
 import appeng.api.networking.crafting.ICraftingLink;
 import appeng.api.networking.crafting.ICraftingRequester;
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.networking.security.IActionSource;
-import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
@@ -95,38 +90,4 @@ public interface IStorageHelper
 	 */
 	ICraftingLink loadCraftingLink( NBTTagCompound data, ICraftingRequester req );

-	/**
-	 * Extracts items from a {@link IMEInventory} respecting power requirements.
-	 * 
-	 * @param energy Energy source.
-	 * @param inv Inventory to extract from.
-	 * @param request Requested item and count.
-	 * @param src Action source.
-	 * @param mode Simulate or modulate
-	 * @return extracted items or {@code null} of nothing was extracted.
-	 */
-	<T extends IAEStack<T>> T poweredExtraction( final IEnergySource energy, final IMEInventory<T> inv, final T request, final IActionSource src, final Actionable mode );
-
-	/**
-	 * Inserts items into a {@link IMEInventory} respecting power requirements.
-	 * 
-	 * @param energy Energy source.
-	 * @param inv Inventory to insert into.
-	 * @param request Items to insert.
-	 * @param src Action source.
-	 * @param mode Simulate or modulate
-	 * @return items not inserted or {@code null} if everything was inserted.
-	 */
-	<T extends IAEStack<T>> T poweredInsert( final IEnergySource energy, final IMEInventory<T> inv, final T input, final IActionSource src, final Actionable mode );
-
-	/**
-	 * Posts alteration of stored items to the provided {@link IStorageGrid}.
-	 * This can be used by cell containers to notify the grid of storage cell changes.
-	 * 
-	 * @param gs the storage grid.
-	 * @param removedCell the removed cell itemstack
-	 * @param addedCell the added cell itemstack
-	 * @param src the action source
-	 */
-	void postChanges( @Nonnull final IStorageGrid gs, @Nonnull final ItemStack removedCell, @Nonnull final ItemStack addedCell, @Nonnull final IActionSource src );
 }
@@ -112,13 +112,4 @@ 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);
-
 }
@@ -23,24 +23,27 @@

 package appeng.api.storage.data;

+
 import java.io.IOException;

 import io.netty.buffer.ByteBuf;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.PacketBuffer;

 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;

-public interface IAEStack<T extends IAEStack<T>> {
+
+public interface IAEStack<T extends IAEStack<T>>
+{

 	/**
 	 * add two stacks together
 	 *
 	 * @param is added item
 	 */
-	void add(T is);
+	void add( T is );

 	/**
 	 * number of items in the stack.
@@ -54,7 +57,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @param stackSize , ItemStack.stackSize = N
 	 */
-	T setStackSize(long stackSize);
+	T setStackSize( long stackSize );

 	/**
 	 * Same as getStackSize, but for requestable items. ( LP )
@@ -68,7 +71,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @return basically itemStack.stackSize = N but for setStackSize items.
 	 */
-	T setCountRequestable(long countRequestable);
+	T setCountRequestable( long countRequestable );

 	/**
 	 * true, if the item can be crafted.
@@ -82,7 +85,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @param isCraftable can item be crafted
 	 */
-	T setCraftable(boolean isCraftable);
+	T setCraftable( boolean isCraftable );

 	/**
 	 * clears, requestable, craftable, and stack sizes.
@@ -101,33 +104,33 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @param i additional stack size
 	 */
-	void incStackSize(long i);
+	void incStackSize( long i );

 	/**
 	 * removes some from the stack size.
 	 */
-	void decStackSize(long i);
+	void decStackSize( long i );

 	/**
 	 * adds items to the requestable
 	 *
 	 * @param i increased amount of requested items
 	 */
-	void incCountRequestable(long i);
+	void incCountRequestable( long i );

 	/**
 	 * removes items from the requestable
 	 *
 	 * @param i decreased amount of requested items
 	 */
-	void decCountRequestable(long i);
+	void decCountRequestable( long i );

 	/**
-	 * write to a CompoundNBT.
+	 * write to a NBTTagCompound.
 	 *
 	 * @param i to be written data
 	 */
-	void writeToNBT( NBTTagCompound i);
+	void writeToNBT( NBTTagCompound i );

 	/**
 	 * Compare stacks using precise logic.
@@ -143,18 +146,19 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 * @return true if they are the same.
 	 */
 	@Override
-	boolean equals(Object obj);
+	boolean equals( Object obj );

 	/**
-	 * Compare the same subtype of {@link IAEStack} with another using a fuzzy
-	 * comparison.
+	 * compare stacks using fuzzy logic
 	 *
-	 * @param other The stack to compare.
-	 * @param mode  Which {@link FuzzyMode} should be used.
+	 * a IAEItemStack to another AEItemStack or a ItemStack.
+	 *
+	 * @param st stacks
+	 * @param mode used fuzzy mode
 	 *
 	 * @return true if two stacks are equal based on AE Fuzzy Comparison.
 	 */
-	boolean fuzzyComparison(T other, FuzzyMode mode);
+	boolean fuzzyComparison( Object st, FuzzyMode mode );

 	/**
 	 * Slower for disk saving, but smaller/more efficient for packets.
@@ -163,7 +167,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @throws IOException
 	 */
-	void writeToPacket( ByteBuf data) throws IOException;
+	void writeToPacket( ByteBuf data ) throws IOException;

 	/**
 	 * Clone the Item / Fluid Stack
@@ -180,14 +184,24 @@ public interface IAEStack<T extends IAEStack<T>> {
 	T empty();

 	/**
-	 * @return The {@link IStorageChannel} backing this stack.
+	 * @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
 	 */
 	IStorageChannel<T> getChannel();

 	/**
 	 * Returns itemstack for display and similar purposes. Always has a count of 1.
-	 *
+	 * 
 	 * @return itemstack
 	 */
 	ItemStack asItemStackRepresentation();
-}
+}
@@ -1,42 +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.util;
-
-
-public enum AECableSize
-{
-	NONE,
-	NORMAL,
-	DENSE;
-
-	public static AECableSize min( AECableSize a, AECableSize b )
-	{
-		return a.compareTo( b ) < 0 ? a : b;
-	}
-
-	public static AECableSize max( AECableSize a, AECableSize b )
-	{
-		return a.compareTo( b ) > 0 ? a : b;
-	}
-}
@@ -29,32 +29,32 @@ public enum AECableType
 	/**
 	 * No Cable present.
 	 */
-	NONE( AECableVariant.NONE, AECableSize.NONE ),
+	NONE,

 	/**
 	 * Connections to this block should render as glass.
 	 */
-	GLASS( AECableVariant.GLASS, AECableSize.NORMAL ),
+	GLASS,

 	/**
 	 * Connections to this block should render as covered.
 	 */
-	COVERED( AECableVariant.COVERED, AECableSize.NORMAL ),
+	COVERED,

 	/**
 	 * Connections to this block should render as smart.
 	 */
-	SMART( AECableVariant.SMART, AECableSize.NORMAL ),
+	SMART,

 	/**
 	 * Smart Dense Cable, represents a tier 2 block that can carry 32 channels.
 	 */
-	DENSE_COVERED( AECableVariant.COVERED, AECableSize.DENSE ),
+	DENSE_COVERED,

 	/**
 	 * Smart Dense Cable, represents a tier 2 block that can carry 32 channels.
 	 */
-	DENSE_SMART( AECableVariant.SMART, AECableSize.DENSE );
+	DENSE_SMART;

 	public static final AECableType[] VALIDCABLES = {
 			GLASS,
@@ -64,97 +64,4 @@ public enum AECableType
 			DENSE_SMART
 	};

-	private final AECableVariant variant;
-	private final AECableSize size;
-
-	private AECableType( AECableVariant variant, AECableSize size )
-	{
-		this.variant = variant;
-		this.size = size;
-	}
-
-	public AECableSize size()
-	{
-		return this.size;
-	}
-
-	public AECableVariant variant()
-	{
-		return this.variant;
-	}
-
-	public boolean isValid()
-	{
-		return this.variant != AECableVariant.NONE && this.size != AECableSize.NONE;
-	}
-
-	public boolean isDense()
-	{
-		return this.size == AECableSize.DENSE;
-	}
-
-	public boolean isSmart()
-	{
-		return this.variant == AECableVariant.SMART;
-	}
-
-	public static AECableType min( AECableType a, AECableType b )
-	{
-		final AECableVariant v = AECableVariant.min( a.variant(), b.variant() );
-		final AECableSize s = AECableSize.min( a.size(), b.size() );
-
-		return AECableType.from( v, s );
-	}
-
-	public static AECableType max( AECableType a, AECableType b )
-	{
-		final AECableVariant v = AECableVariant.max( a.variant(), b.variant() );
-		final AECableSize s = AECableSize.max( a.size(), b.size() );
-
-		return AECableType.from( v, s );
-	}
-
-	private static AECableType from( AECableVariant variant, AECableSize size )
-	{
-		switch( variant )
-		{
-			case GLASS:
-				switch( size )
-				{
-					case NORMAL:
-						return GLASS;
-					default:
-						break;
-				}
-
-				break;
-			case COVERED:
-				switch( size )
-				{
-					case NORMAL:
-						return COVERED;
-					case DENSE:
-						return DENSE_COVERED;
-					default:
-						break;
-				}
-
-				break;
-			case SMART:
-				switch( size )
-				{
-					case NORMAL:
-						return SMART;
-					case DENSE:
-						return DENSE_SMART;
-					default:
-						break;
-				}
-				break;
-			default:
-				break;
-		}
-
-		return NONE;
-	}
 }
@@ -1,43 +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.util;
-
-
-public enum AECableVariant
-{
-	NONE,
-	GLASS,
-	COVERED,
-	SMART;
-
-	public static AECableVariant min( AECableVariant a, AECableVariant b )
-	{
-		return a.compareTo( b ) < 0 ? a : b;
-	}
-
-	public static AECableVariant max( AECableVariant a, AECableVariant b )
-	{
-		return a.compareTo( b ) > 0 ? a : b;
-	}
-}
@@ -74,30 +74,25 @@ public enum AEColor

 	TRANSPARENT( "gui.appliedenergistics2.Fluix", null, 0x1B2344, 0x895CA8, 0xD7BBEC );

-	public static final List<AEColor> VALID_COLORS = Arrays.asList( WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME, PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE,
-			BLUE, BROWN, GREEN, RED, BLACK );
+	public static final List<AEColor> VALID_COLORS = Arrays.asList( WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME, PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE, BLUE, BROWN, GREEN, RED, BLACK );

 	/**
-	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #blackVariant dark
-	 * variant} of the apprioriate AE color.
+	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #blackVariant dark variant} of the apprioriate AE color.
 	 */
 	public static final int TINTINDEX_DARK = 1;

 	/**
-	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #mediumVariant medium
-	 * variant} of the apprioriate AE color.
+	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #mediumVariant medium variant} of the apprioriate AE color.
 	 */
 	public static final int TINTINDEX_MEDIUM = 2;

 	/**
-	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #whiteVariant bright
-	 * variant} of the apprioriate AE color.
+	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #whiteVariant bright variant} of the apprioriate AE color.
 	 */
 	public static final int TINTINDEX_BRIGHT = 3;

 	/**
-	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get a color between the
-	 * {@link #mediumVariant medium}
+	 * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get a color between the {@link #mediumVariant medium}
 	 * and {@link #whiteVariant bright variant} of the apprioriate AE color.
 	 */
 	public static final int TINTINDEX_MEDIUM_BRIGHT = 4;
@@ -146,8 +141,7 @@ public enum AEColor
 	{
 		switch( tintIndex )
 		{
-			// Please note that tintindex 0 is hardcoded for the block breaking particles. Returning anything other than
-			// -1 for tintindex=0 here
+			// Please note that tintindex 0 is hardcoded for the block breaking particles. Returning anything other than -1 for tintindex=0 here
 			// will cause issues with those particles
 			case 0:
 				return -1;
@@ -1,21 +0,0 @@
-
-package appeng.api.util;
-
-
-import java.util.List;
-
-import appeng.api.storage.ICellInventoryHandler;
-import appeng.api.storage.data.IAEStack;
-
-
-public interface IClientHelper
-{
-	/**
-	 * Add cell information to the provided list. Used for tooltip content.
-	 * 
-	 * @param handler Cell handler.
-	 * @param lines List of lines to add to.
-	 */
-	<T extends IAEStack<T>> void addCellInformation( ICellInventoryHandler<T> handler, List<String> lines );
-
-}
@@ -23,10 +23,8 @@

 package appeng.api.util;

-
 import net.minecraft.util.math.RayTraceResult;

-
 /**
 * Implement on Tile or part to customize if the info gui opens, or an action is preformed.
 */
@@ -1,87 +0,0 @@
-package yalter.mousetweaks.api;
-
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-
-/**
- * This is the interface you want to implement in your GuiScreen to make it compatible with Mouse Tweaks.
- * If this interface is not enough (for example, you need a custom slot click function, or if you use a custom Container
- * which happens to be incompatible), check IMTModGuiContainer2Ex instead.
- * If you just need to disable Mouse Tweaks or the wheel tweak, see the MouseTweaksIgnore
- * or the MouseTweaksDisableWheelTweak annotations.
- */
-public interface IMTModGuiContainer2 {
-	/**
-	 * If you want to disable Mouse Tweaks in your GuiScreen, return true from this method.
-	 *
-	 * @return True if Mouse Tweaks should be disabled, false otherwise.
-	 */
-	boolean MT_isMouseTweaksDisabled();
-
-	/**
-	 * If you want to disable the Wheel Tweak in your GuiScreen, return true from this method.
-	 *
-	 * @return True if the Wheel Tweak should be disabled, false otherwise.
-	 */
-	boolean MT_isWheelTweakDisabled();
-
-	/**
-	 * Returns the Container.
-	 *
-	 * @return Container that is currently in use.
-	 */
-	Container MT_getContainer();
-
-	/**
-	 * Returns the Slot that is currently selected by the player, or null if no Slot is selected.
-	 *
-	 * @return Slot that is located under the mouse, or null if no Slot it currently under the mouse.
-	 */
-	Slot MT_getSlotUnderMouse();
-
-	/**
-	 * Return true if the given Slot behaves like the vanilla crafting output slots (inside the crafting table,
-	 * or the furnace output slot, or the anvil output slot, etc.). These slots are handled differently by Mouse Tweaks.
-	 *
-	 * @param slot the slot to check
-	 * @return True if slot is a crafting output slot.
-	 */
-	boolean MT_isCraftingOutput(Slot slot);
-
-	/**
-	 * Return true if the given Slot should be ignored by Mouse Tweaks. Examples of ignored slots are the item select
-	 * slots and the Destroy Item slot in the vanilla creative inventory.
-	 *
-	 * @param slot the slot to check
-	 * @return Tru if slot should be ignored by Mouse Tweaks.
-	 */
-	boolean MT_isIgnored(Slot slot);
-
-	/**
-	 * If your container has an RMB dragging functionality (like vanilla containers), disable it inside this method.
-	 * This method is called every frame (render tick), which is after all mouseClicked / mouseClickMove / mouseReleased
-	 * events are handled (although note these events are handled every game tick, which is far less frequent than every
-	 * render tick).<br><br>
-	 *
-	 * If true is returned from this method, Mouse Tweaks (after checking other conditions like isIgnored) will click
-	 * the slot on which the right mouse button was initially pressed (in most cases this is the slot currently under
-	 * mouse). This is needed because the vanilla RMB dragging functionality prevents the initial slot click.<br><br>
-	 *
-	 * For vanilla containers this method looks like this:
-	 * <pre>
-	 * this.ignoreMouseUp = true;
-	 *
-	 * if (this.dragSplitting) {
-	 *     if (this.dragSplittingButton == 1) {
-	 *         this.dragSplitting = false;
-	 *         return true;
-	 *     }
-	 * }
-	 *
-	 * return false;
-	 * </pre>
-	 *
-	 * @return True if Mouse Tweaks should click the slot on which the RMB was pressed.
-	 */
-	boolean MT_disableRMBDraggingFunctionality();
-}
@@ -56,18 +56,15 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
 		double internalCurrentPower = 0;
 		final double internalMaxPower = this.getMaxEnergyCapacity();

-		if( internalMaxPower > 0 )
+		if( tag != null )
 		{
-			if( tag != null )
-			{
-				internalCurrentPower = tag.getDouble( "internalCurrentPower" );
-			}
-
-			final double percent = internalCurrentPower / internalMaxPower;
-
-			lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform
-					.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) );
+			internalCurrentPower = tag.getDouble( "internalCurrentPower" );
 		}
+
+		final double percent = internalCurrentPower / internalMaxPower;
+
+		lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform
+				.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) );
 	}

 	@Override
@@ -87,7 +87,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	@Override
 	public boolean canRenderInLayer( IBlockState state, BlockRenderLayer layer )
 	{
-		return layer == BlockRenderLayer.CUTOUT || layer == BlockRenderLayer.TRANSLUCENT;
+		return layer == BlockRenderLayer.TRANSLUCENT;
 	}

 	@Override
@@ -150,9 +150,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final EnumFacing up = this.getOrientable( world, pos ).getUp();
-		if( !this.canPlaceAt( world, pos, up.getOpposite() ) )
+		if( !this.canPlaceAt( (World) world, pos, up.getOpposite() ) )
 		{
-			this.dropTorch( world, pos );
+			this.dropTorch( (World) world, pos );
 		}
 	}

@@ -37,13 +37,17 @@ import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.common.registry.EntityRegistry;

 import appeng.block.AEBaseBlock;
+import appeng.core.AppEng;
+import appeng.entity.EntityIds;
 import appeng.entity.EntityTinyTNTPrimed;
 import appeng.helpers.ICustomCollision;

@@ -63,6 +67,9 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision

 		this.setSoundType( SoundType.GROUND );
 		this.setHardness( 0F );
+
+		EntityRegistry.registerModEntity( new ResourceLocation( AppEng.MOD_ID, EntityTinyTNTPrimed.class.getName() ), EntityTinyTNTPrimed.class,
+				"EntityTinyTNTPrimed", EntityIds.get( EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true );
 	}

 	@Override
@@ -49,7 +49,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.RayTraceResult.Type;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -61,22 +60,17 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

-import appeng.api.parts.IFacadeContainer;
-import appeng.api.parts.IFacadePart;
+import appeng.api.AEApi;
 import appeng.api.parts.PartItemStack;
 import appeng.api.parts.SelectedPart;
 import appeng.api.util.AEColor;
-import appeng.api.util.AEPartLocation;
 import appeng.block.AEBaseTileBlock;
 import appeng.client.UnlistedProperty;
 import appeng.client.render.cablebus.CableBusBakedModel;
 import appeng.client.render.cablebus.CableBusRenderState;
 import appeng.core.Api;
 import appeng.core.AppEng;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketClick;
 import appeng.helpers.AEGlassMaterial;
-import appeng.integration.abstraction.IAEFacade;
 import appeng.parts.ICableBusContainer;
 import appeng.parts.NullCableBusContainer;
 import appeng.tile.AEBaseTile;
@@ -86,7 +80,7 @@ import appeng.tile.networking.TileCableBusTESR;
 import appeng.util.Platform;


-public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
+public class BlockCableBus extends AEBaseTileBlock
 {

 	public static final UnlistedProperty<CableBusRenderState> RENDER_STATE_PROPERTY = new UnlistedProperty<>( "cable_bus_render_state", CableBusRenderState.class );
@@ -125,8 +119,6 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
 	{
 		CableBusRenderState renderState = this.cb( world, pos ).getRenderState();
-		renderState.setWorld( world );
-		renderState.setPos( pos );
 		return ( (IExtendedBlockState) state ).withProperty( RENDER_STATE_PROPERTY, renderState );
 	}

@@ -322,14 +314,13 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 					for( int l = 0; l < 4; ++l )
 					{
 						// Randomly select one of the textures if the cable bus has more than just one possibility here
-						final TextureAtlasSprite texture = Platform.pickRandom( textures );
-
-						final double d0 = pos.getX() + ( j + 0.5D ) / 4.0D;
-						final double d1 = pos.getY() + ( k + 0.5D ) / 4.0D;
-						final double d2 = pos.getZ() + ( l + 0.5D ) / 4.0D;
-						final ParticleDigging particle = new DestroyFX( world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos
-								.getY() - 0.5D, d2 - pos.getZ() - 0.5D, this.getDefaultState() ).setBlockPos( pos );
+						TextureAtlasSprite texture = Platform.pickRandom( textures );

+						double d0 = (double) pos.getX() + ( (double) j + 0.5D ) / 4.0D;
+						double d1 = (double) pos.getY() + ( (double) k + 0.5D ) / 4.0D;
+						double d2 = (double) pos.getZ() + ( (double) l + 0.5D ) / 4.0D;
+						ParticleDigging particle = new DestroyFX( world, d0, d1, d2, d0 - (double) pos.getX() - 0.5D, d1 - (double) pos
+								.getY() - 0.5D, d2 - (double) pos.getZ() - 0.5D, this.getDefaultState() ).setBlockPos( pos );
 						particle.setParticleTexture( texture );
 						effectRenderer.addEffect( particle );
 					}
@@ -362,45 +353,6 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 		return out == null ? NULL_CABLE_BUS : out;
 	}

-	@Nullable
-	private IFacadeContainer fc( final IBlockAccess w, final BlockPos pos )
-	{
-		final TileEntity te = w.getTileEntity( pos );
-		IFacadeContainer out = null;
-
-		if( te instanceof TileCableBus )
-		{
-			out = ( (TileCableBus) te ).getCableBus().getFacadeContainer();
-		}
-
-		return out;
-	}
-
-	@Override
-	public void onBlockClicked( World worldIn, BlockPos pos, EntityPlayer playerIn )
-	{
-		if( Platform.isClient() )
-		{
-			final RayTraceResult rtr = Minecraft.getMinecraft().objectMouseOver;
-			if( rtr != null && rtr.typeOfHit == Type.BLOCK && pos.equals( rtr.getBlockPos() ) )
-			{
-				final Vec3d hitVec = rtr.hitVec.subtract( new Vec3d( pos ) );
-
-				if( this.cb( worldIn, pos ).clicked( playerIn, EnumHand.MAIN_HAND, hitVec ) )
-				{
-					NetworkHandler.instance()
-							.sendToServer(
-									new PacketClick( pos, rtr.sideHit, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, EnumHand.MAIN_HAND, true ) );
-				}
-			}
-		}
-	}
-
-	public void onBlockClickPacket( World worldIn, BlockPos pos, EntityPlayer playerIn, EnumHand hand, Vec3d hitVec )
-	{
-		this.cb( worldIn, pos ).clicked( playerIn, hand, hitVec );
-	}
-
 	@Override
 	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
 	{
@@ -456,25 +408,14 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	@Override
 	public boolean canRenderInLayer( IBlockState state, BlockRenderLayer layer )
 	{
-		return true;
-	}
-
-	@Override
-	public IBlockState getFacadeState( IBlockAccess world, BlockPos pos, EnumFacing side )
-	{
-		if( side != null )
+		if( AEApi.instance().partHelper().getCableRenderMode().transparentFacades )
 		{
-			IFacadeContainer container = this.fc( world, pos );
-			if( container != null )
-			{
-				IFacadePart facade = container.getFacade( AEPartLocation.fromFacing( side ) );
-				if( facade != null )
-				{
-					return facade.getBlockState();
-				}
-			}
+			return layer == BlockRenderLayer.CUTOUT || layer == BlockRenderLayer.TRANSLUCENT;
+		}
+		else
+		{
+			return layer == BlockRenderLayer.CUTOUT;
 		}
-		return world.getBlockState( pos );
 	}

 	public static Class<? extends AEBaseTile> getNoTesrTile()
@@ -34,6 +34,8 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;

+import appeng.api.AEApi;
+import appeng.api.storage.ICellHandler;
 import appeng.api.util.AEPartLocation;
 import appeng.block.AEBaseTileBlock;
 import appeng.core.localization.PlayerMessages;
@@ -106,7 +108,14 @@ public class BlockChest extends AEBaseTileBlock
 			}
 			else
 			{
-				if( !tg.openGui( p ) )
+				final ItemStack cell = tg.getCell();
+				if( !cell.isEmpty() )
+				{
+					final ICellHandler ch = AEApi.instance().registries().cell().getHandler( cell );
+
+					tg.openGui( p, ch, cell, side );
+				}
+				else
 				{
 					p.sendMessage( PlayerMessages.ChestCannotReadStorageCell.get() );
 				}
@@ -136,7 +136,7 @@ public class FeatureFactory

 	private <T extends IBootstrapComponent> void addBootstrapComponent( Class<? extends IBootstrapComponent> eventType, T component )
 	{
-		this.bootstrapComponents.computeIfAbsent( eventType, c -> new ArrayList<IBootstrapComponent>() ).add( component );
+		bootstrapComponents.computeIfAbsent( eventType, c -> new ArrayList<IBootstrapComponent>() ).add( component );
 	}

 	@SideOnly( Side.CLIENT )
@@ -144,7 +144,7 @@ class ItemDefinitionBuilder implements IItemBuilder
 		item.setCreativeTab( this.creativeTab );

 		// Register all extra handlers
-		this.boostrapComponents.forEach( component -> this.factory.addBootstrapComponent( component.apply( item ) ) );
+		this.boostrapComponents.forEach( component -> component.apply( item ) );

 		// Register custom dispenser behavior if requested
 		if( this.dispenserBehaviorSupplier != null )
@@ -1,15 +0,0 @@
-
-package appeng.bootstrap.components;
-
-
-import net.minecraftforge.fml.common.registry.EntityEntry;
-import net.minecraftforge.registries.IForgeRegistry;
-
-import appeng.bootstrap.IBootstrapComponent;
-
-
-@FunctionalInterface
-public interface IEntityRegistrationComponent extends IBootstrapComponent
-{
-	void entityRegistration( IForgeRegistry<EntityEntry> entityRegistry );
-}
@@ -19,7 +19,6 @@
 package appeng.capabilities;


-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.darkhax.tesla.api.ITeslaConsumer;
 import net.darkhax.tesla.api.ITeslaHolder;
 import net.minecraft.nbt.NBTBase;
@@ -55,8 +54,6 @@ public final class Capabilities

 	public static Capability<IEnergyStorage> FORGE_ENERGY;

-	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY;
-
 	/**
 	 * Register AE2 provided capabilities.
 	 */
@@ -102,9 +99,6 @@ public final class Capabilities
 		FORGE_ENERGY = cap;
 	}

-	@CapabilityInject( IItemRepository.class )
-	private static void capIItemRepositoryRegistered( Capability<IItemRepository> cap ) { ITEM_REPOSITORY_CAPABILITY = cap; }
-
 	// Create a storage implementation that does not do anything
 	private static <T> Capability.IStorage<T> createNullStorage()
 	{
@@ -1,28 +0,0 @@
-
-package appeng.client;
-
-
-import org.lwjgl.input.Keyboard;
-
-
-public enum ActionKey
-{
-	TOGGLE_FOCUS( Keyboard.KEY_TAB );
-
-	private final int defaultKey;
-
-	private ActionKey( int defaultKey )
-	{
-		this.defaultKey = defaultKey;
-	}
-
-	public String getTranslationKey()
-	{
-		return "key." + this.name().toLowerCase() + ".desc";
-	}
-
-	public int getDefaultKey()
-	{
-		return this.defaultKey;
-	}
-}
@@ -21,16 +21,15 @@ package appeng.client;

 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.EnumMap;
 import java.util.List;
 import java.util.Random;

-import appeng.helpers.HighlighterHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.RayTraceResult;
@@ -38,14 +37,11 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.client.event.RenderLivingEvent;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.minecraftforge.fml.client.registry.ClientRegistry;
-import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;

 import appeng.api.parts.CableRenderMode;
@@ -79,9 +75,6 @@ import appeng.util.Platform;

 public class ClientHelper extends ServerHelper
 {
-	private final static String KEY_CATEGORY = "key.appliedenergistics2.category";
-
-	private final EnumMap<ActionKey, KeyBinding> bindings = new EnumMap<>( ActionKey.class );

 	@Override
 	public void preinit()
@@ -92,25 +85,30 @@ public class ClientHelper extends ServerHelper
 		{
 			ModelLoaderRegistry.registerLoader( UVLModelLoader.INSTANCE );
 		}
-
-		RenderingRegistry.registerEntityRenderingHandler( EntityTinyTNTPrimed.class, manager -> new RenderTinyTNTPrimed( manager ) );
-		RenderingRegistry.registerEntityRenderingHandler( EntityFloatingItem.class, manager -> new RenderFloatingItem( manager ) );
 	}

 	@Override
 	public void init()
 	{
-		for( ActionKey key : ActionKey.values() )
-		{
-			final KeyBinding binding = new KeyBinding( key.getTranslationKey(), key.getDefaultKey(), KEY_CATEGORY );
-			ClientRegistry.registerKeyBinding( binding );
-			this.bindings.put( key, binding );
-		}
-	}
+		// final Block fluixBlock = GameRegistry.findBlock( "appliedenergistics2", "fluix" );
+		// Item fluixItem = Item.getItemFromBlock( fluixBlock );
+		// ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:fluix",
+		// "inventory" );
+		// final int DEFAULT_ITEM_SUBTYPE = 0;
+		// final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
+		// // mesher.register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation );
+		//
+		// final ResourceLocation resource = new ResourceLocation( "appliedenergistics2", "stair.fluix" );
+		// final ModelResourceLocation fluixStairModel = new ModelResourceLocation( resource, "inventory" );
+		// AELog.info( "FluixStairModel: " + fluixStairModel );
+		//
+		// final Set<Item> items = AEApi.instance().definitions().blocks().fluixStairs().maybeItem().asSet();
+		// for( Item item : items )
+		// {
+		// AELog.info( "Registering with %s with unlocalized %s", item, item.getUnlocalizedName() );
+		// mesher.register( item, DEFAULT_ITEM_SUBTYPE, fluixStairModel );
+		// }

-	@SubscribeEvent
-	public void renderWorldLastEvent( RenderWorldLastEvent event) {
-		HighlighterHandler.tick(event);
 	}

 	@Override
@@ -201,6 +199,11 @@ public class ClientHelper extends ServerHelper
 	@Override
 	public void postInit()
 	{
+		// RenderingRegistry.registerBlockHandler( WorldRender.INSTANCE );
+		final RenderManager inst = Minecraft.getMinecraft().getRenderManager();
+
+		inst.entityRenderMap.put( EntityTinyTNTPrimed.class, new RenderTinyTNTPrimed( inst ) );
+		inst.entityRenderMap.put( EntityFloatingItem.class, new RenderFloatingItem( inst ) );
 	}

 	@Override
@@ -327,20 +330,29 @@ public class ClientHelper extends ServerHelper
 		final EntityPlayer player = mc.player;
 		if( player.isSneaking() )
 		{
-			final boolean mainHand = player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem;
-			final boolean offHand = player.getHeldItem( EnumHand.OFF_HAND ).getItem() instanceof IMouseWheelItem;
-
-			if( mainHand || offHand )
+			final EnumHand hand;
+			if( !player.getHeldItem( EnumHand.MAIN_HAND ).isEmpty() && player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem )
 			{
-				try
-				{
-					NetworkHandler.instance().sendToServer( new PacketValueConfig( "Item", me.getDwheel() > 0 ? "WheelUp" : "WheelDown" ) );
-					me.setCanceled( true );
-				}
-				catch( final IOException e )
-				{
-					AELog.debug( e );
-				}
+				hand = EnumHand.MAIN_HAND;
+			}
+			else if( !player.getHeldItem( EnumHand.OFF_HAND ).isEmpty() && player.getHeldItem( EnumHand.OFF_HAND ).getItem() instanceof IMouseWheelItem )
+			{
+				hand = EnumHand.OFF_HAND;
+			}
+			else
+			{
+				return;
+			}
+
+			final ItemStack is = player.getHeldItem( hand );
+			try
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "Item", me.getDwheel() > 0 ? "WheelUp" : "WheelDown" ) );
+				me.setCanceled( true );
+			}
+			catch( final IOException e )
+			{
+				AELog.debug( e );
 			}
 		}
 	}
@@ -351,16 +363,4 @@ public class ClientHelper extends ServerHelper
 		ParticleTextures.registerSprite( event );
 		InscriberTESR.registerTexture( event );
 	}
-
-	@Override
-	public boolean isKeyPressed( ActionKey key )
-	{
-		return this.bindings.get( key ).isPressed();
-	}
-
-	@Override
-	public boolean isActionKey( ActionKey key, int pressedKeyCode )
-	{
-		return this.bindings.get( key ).isActiveAndMatches( pressedKeyCode );
-	}
 }
@@ -22,22 +22,19 @@ package appeng.client.gui;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;

-import appeng.tile.inventory.AppEngInternalInventory;
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;

-import net.minecraftforge.fml.common.Optional;
-import net.minecraftforge.items.IItemHandler;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -49,8 +46,6 @@ import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ClickType;
@@ -59,11 +54,8 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.fluids.Fluid;

-import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.widgets.GuiCustomSlot;
 import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.client.gui.widgets.ITooltip;
 import appeng.client.me.InternalSlotME;
@@ -74,7 +66,7 @@ import appeng.container.AEBaseContainer;
 import appeng.container.slot.AppEngCraftingSlot;
 import appeng.container.slot.AppEngSlot;
 import appeng.container.slot.AppEngSlot.hasCalculatedValidness;
-import appeng.container.slot.IOptionalSlot;
+import appeng.container.slot.OptionalSlotFake;
 import appeng.container.slot.SlotCraftingTerm;
 import appeng.container.slot.SlotDisabled;
 import appeng.container.slot.SlotFake;
@@ -87,26 +79,20 @@ import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketInventoryAction;
 import appeng.core.sync.packets.PacketSwapSlots;
-import appeng.fluids.client.render.FluidStackSizeRenderer;
-import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
-import yalter.mousetweaks.api.IMTModGuiContainer2;


-@Optional.Interface( iface = "yalter.mousetweaks.api.IMTModGuiContainer2", modid = "mousetweaks" )
-public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContainer2
+public abstract class AEBaseGui extends GuiContainer
 {
-	private final List<InternalSlotME> meSlots = new ArrayList<>();
+	private final List<InternalSlotME> meSlots = new LinkedList<>();
 	// drag y
 	private final Set<Slot> drag_click = new HashSet<>();
 	private final StackSizeRenderer stackSizeRenderer = new StackSizeRenderer();
-	private final FluidStackSizeRenderer fluidStackSizeRenderer = new FluidStackSizeRenderer();
 	private GuiScrollbar myScrollBar = null;
 	private boolean disableShiftClick = false;
 	private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
 	private ItemStack dbl_whichItem = ItemStack.EMPTY;
 	private Slot bl_clicked;
-	protected final List<GuiCustomSlot> guiSlots = new ArrayList<>();

 	public AEBaseGui( final Container container )
 	{
@@ -160,76 +146,35 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	}

 	@Override
-	public void drawScreen( final int mouseX, final int mouseY, final float partialTicks )
+	public void drawScreen( final int mouseX, final int mouseY, final float btn )
 	{
 		super.drawDefaultBackground();
-		super.drawScreen( mouseX, mouseY, partialTicks );
-
-		GlStateManager.pushMatrix();
-		GlStateManager.translate( this.guiLeft, this.guiTop, 0.0F );
-		GlStateManager.enableDepth();
-		for( final GuiCustomSlot c : this.guiSlots )
-		{
-			this.drawGuiSlot( c, mouseX, mouseY, partialTicks );
-		}
-		GlStateManager.disableDepth();
-		for( final GuiCustomSlot c : this.guiSlots )
-		{
-			this.drawTooltip( c, mouseX - this.guiLeft, mouseY - this.guiTop );
-		}
-		GlStateManager.popMatrix();
-
+		super.drawScreen( mouseX, mouseY, btn );
 		this.renderHoveredToolTip( mouseX, mouseY );

 		for( final Object c : this.buttonList )
 		{
 			if( c instanceof ITooltip )
 			{
-				this.drawTooltip( (ITooltip) c, mouseX, mouseY );
-			}
-		}
-	}
+				final ITooltip tooltip = (ITooltip) c;
+				final int x = tooltip.xPos(); // ((GuiImgButton) c).x;
+				int y = tooltip.yPos(); // ((GuiImgButton) c).y;

-	protected void drawGuiSlot( GuiCustomSlot slot, int mouseX, int mouseY, float partialTicks )
-	{
-		if( slot.isSlotEnabled() )
-		{
-			final int left = slot.xPos();
-			final int top = slot.yPos();
-			final int right = left + slot.getWidth();
-			final int bottom = top + slot.getHeight();
-
-			slot.drawContent( this.mc, mouseX, mouseY, partialTicks );
-
-			if( this.isPointInRegion( left, top, slot.getWidth(), slot.getHeight(), mouseX, mouseY ) && slot.canClick( this.mc.player ) )
-			{
-				GlStateManager.disableLighting();
-				GlStateManager.colorMask( true, true, true, false );
-				this.drawGradientRect( left, top, right, bottom, -2130706433, -2130706433 );
-				GlStateManager.colorMask( true, true, true, true );
-				GlStateManager.enableLighting();
-			}
-		}
-	}
-
-	private void drawTooltip( ITooltip tooltip, int mouseX, int mouseY )
-	{
-		final int x = tooltip.xPos(); // ((GuiImgButton) c).x;
-		int y = tooltip.yPos(); // ((GuiImgButton) c).y;
-
-		if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
-		{
-			if( y < mouseY && y + tooltip.getHeight() > mouseY )
-			{
-				if( y < 15 )
+				if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
 				{
-					y = 15;
-				}
+					if( y < mouseY && y + tooltip.getHeight() > mouseY )
+					{
+						if( y < 15 )
+						{
+							y = 15;
+						}

-				final String msg = tooltip.getMessage();
-				if( msg != null )
-				{
-					this.drawTooltip( x + 11, y + 4, msg );
+						final String msg = tooltip.getMessage();
+						if( msg != null )
+						{
+							this.drawTooltip( x + 11, y + 4, msg );
+						}
+					}
 				}
 			}
 		}
@@ -291,36 +236,27 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 		final List<Slot> slots = this.getInventorySlots();
 		for( final Slot slot : slots )
 		{
-			if( slot instanceof IOptionalSlot )
+			if( slot instanceof OptionalSlotFake )
 			{
-				final IOptionalSlot optionalSlot = (IOptionalSlot) slot;
-				if( optionalSlot.isRenderDisabled() )
+				final OptionalSlotFake fs = (OptionalSlotFake) slot;
+				if( fs.renderDisabled() )
 				{
-					final AppEngSlot aeSlot = (AppEngSlot) slot;
-					if( aeSlot.isSlotEnabled() )
+					if( fs.isSlotEnabled() )
 					{
-						this.drawTexturedModalRect( ox + aeSlot.xPos - 1, oy + aeSlot.yPos - 1, optionalSlot.getSourceX() - 1, optionalSlot.getSourceY() - 1,
-								18,
+						this.drawTexturedModalRect( ox + fs.xPos - 1, oy + fs.yPos - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
 								18 );
 					}
 					else
 					{
 						GlStateManager.color( 1.0F, 1.0F, 1.0F, 0.4F );
 						GlStateManager.enableBlend();
-						this.drawTexturedModalRect( ox + aeSlot.xPos - 1, oy + aeSlot.yPos - 1, optionalSlot.getSourceX() - 1, optionalSlot.getSourceY() - 1,
-								18,
+						this.drawTexturedModalRect( ox + fs.xPos - 1, oy + fs.yPos - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
 								18 );
 						GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
 					}
 				}
 			}
 		}
-
-		for( final GuiCustomSlot slot : this.guiSlots )
-		{
-			slot.drawBackground( ox, oy );
-		}
-
 	}

 	@Override
@@ -341,14 +277,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			}
 		}

-		for( GuiCustomSlot slot : this.guiSlots )
-		{
-			if( this.isPointInRegion( slot.xPos(), slot.yPos(), slot.getWidth(), slot.getHeight(), xCoord, yCoord ) && slot.canClick( this.mc.player ) )
-			{
-				slot.slotClicked( this.mc.player.inventory.getItemStack(), btn );
-			}
-		}
-
 		if( this.getScrollBar() != null )
 		{
 			this.getScrollBar().click( this, xCoord - this.guiLeft, yCoord - this.guiTop );
@@ -380,59 +308,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				}
 			}
 		}
-		else if( slot instanceof SlotDisconnected )
-		{
-			this.drag_click.add( slot );
-			if( this.drag_click.size() > 1 )
-			{
-				if( !itemstack.isEmpty() )
-				{
-					Set<IItemHandler> visitedInterfaces = new HashSet<>();
-					for( final Slot dr : this.drag_click )
-					{
-						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
-						if (visitedInterfaces.contains( interfaceHandler )) break;
-						visitedInterfaces.add( interfaceHandler );
-						boolean canInsert = true;
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
-						{
-							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), itemstack ) )
-							{
-								canInsert = false;
-								break;
-							}
-						}
-						if( canInsert )
-						{
-							if( slot.getStack().isEmpty() )
-							{
-								InventoryAction action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-								final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
-								NetworkHandler.instance().sendToServer( p );
-							}
-						}
-					}
-				}
-
-				else if( isShiftKeyDown() )
-				{
-					for( final Slot dr : this.drag_click )
-					{
-						InventoryAction action = null;
-						if( !slot.getStack().isEmpty() )
-						{
-							action = InventoryAction.SHIFT_CLICK;
-						}
-						if( action != null )
-						{
-							final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
-							NetworkHandler.instance().sendToServer( p );
-						}
-					}
-				}
-			}
-		}
-
 		else
 		{
 			super.mouseClickMove( x, y, c, d );
@@ -526,35 +401,12 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain

 		if( slot instanceof SlotDisconnected )
 		{
-			if( this.drag_click.size() > 1 )
-			{
-				return;
-			}
-
 			InventoryAction action = null;

-			switch ( clickType )
+			switch( clickType )
 			{
 				case PICKUP: // pickup / set-down.
-					if( slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty() )
-					{
-						boolean canInsert = true;
-						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
-						{
-							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
-							{
-								canInsert = false;
-								break;
-							}
-						}
-						if( canInsert )
-						{
-							action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-						}
-						break;
-					}
-					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 ) action = InventoryAction.PICKUP_OR_SET_DOWN;
+					action = ( mouseButton == 1 ) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
 					break;
 				case QUICK_MOVE:
 					action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
@@ -636,11 +488,11 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			return;
 		}

-		if( !this.disableShiftClick && isShiftKeyDown() && mouseButton == 0 )
+		if( !this.disableShiftClick && isShiftKeyDown() )
 		{
 			this.disableShiftClick = true;

-			if( this.dbl_whichItem.isEmpty() || this.bl_clicked != slot || this.dbl_clickTimer.elapsed( TimeUnit.MILLISECONDS ) > 250 )
+			if( this.dbl_whichItem.isEmpty() || this.bl_clicked != slot || this.dbl_clickTimer.elapsed( TimeUnit.MILLISECONDS ) > 150 )
 			{
 				// some simple double click logic.
 				this.bl_clicked = slot;
@@ -662,13 +514,12 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				for( final Slot inventorySlot : slots )
 				{
 					if( inventorySlot != null && inventorySlot.canTakeStack(
-							this.mc.player ) && inventorySlot.getHasStack() && inventorySlot.isSameInventory( slot ) && Container.canAddItemToSlot(
+							this.mc.player ) && inventorySlot.getHasStack() && inventorySlot.inventory == slot.inventory && Container.canAddItemToSlot(
 									inventorySlot, this.dbl_whichItem, true ) )
 					{
-						this.handleMouseClick( inventorySlot, inventorySlot.slotNumber, 0, ClickType.QUICK_MOVE );
+						this.handleMouseClick( inventorySlot, inventorySlot.slotNumber, 1, clickType );
 					}
 				}
-				this.dbl_whichItem = ItemStack.EMPTY;
 			}

 			this.disableShiftClick = false;
@@ -783,16 +634,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				}
 			}
 		}
-		if( slot instanceof SlotFake )
-		{
-			final ItemStack stack = ( (SlotFake) slot ).getStack();
-			if( stack != ItemStack.EMPTY )
-			{
-				InventoryAction direction = wheel > 0 ? InventoryAction.PLACE_SINGLE : InventoryAction.PICKUP_SINGLE;
-				final PacketInventoryAction p = new PacketInventoryAction( direction , slot.slotNumber , 0);
-				NetworkHandler.instance().sendToServer( p );
-			}
-		}
 	}

 	protected boolean enableSpaceClicking()
@@ -874,39 +715,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain

 			return;
 		}
-		else if( s instanceof IMEFluidSlot && ( (IMEFluidSlot) s ).shouldRenderAsFluid() )
-		{
-			final IMEFluidSlot slot = (IMEFluidSlot) s;
-			final IAEFluidStack fs = slot.getAEFluidStack();
-
-			if( fs != null && this.isPowered() )
-			{
-				GlStateManager.disableLighting();
-				GlStateManager.disableBlend();
-				final Fluid fluid = fs.getFluid();
-				Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-				final TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( fluid.getStill().toString() );
-
-				// Set color for dynamic fluids
-				// Convert int color to RGB
-				float red = ( fluid.getColor() >> 16 & 255 ) / 255.0F;
-				float green = ( fluid.getColor() >> 8 & 255 ) / 255.0F;
-				float blue = ( fluid.getColor() & 255 ) / 255.0F;
-				GlStateManager.color( red, green, blue );
-
-				this.drawTexturedModalRect( s.xPos, s.yPos, sprite, 16, 16 );
-				GlStateManager.enableLighting();
-				GlStateManager.enableBlend();
-
-				this.fluidStackSizeRenderer.renderStackSize( this.fontRenderer, fs, s.xPos, s.yPos );
-			}
-			else if( !this.isPowered() )
-			{
-				drawRect( s.xPos, s.yPos, 16 + s.xPos, 16 + s.yPos, 0x66111111 );
-			}
-
-			return;
-		}
 		else
 		{
 			try
@@ -1052,53 +860,4 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		return this.meSlots;
 	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isMouseTweaksDisabled()
-	{
-		return false;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isWheelTweakDisabled()
-	{
-		return true;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public Container MT_getContainer()
-	{
-		return this.inventorySlots;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public Slot MT_getSlotUnderMouse()
-	{
-		return getSlotUnderMouse();
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isCraftingOutput( Slot slot )
-	{
-		return slot instanceof SlotOutput || slot instanceof AppEngCraftingSlot;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isIgnored( Slot slot )
-	{
-		return false;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_disableRMBDraggingFunctionality()
-	{
-		return false;
-	}
 }
@@ -1,97 +0,0 @@
-package appeng.client.gui;
-
-import javax.annotation.Nullable;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.implementations.GuiCraftAmount;
-import appeng.client.gui.implementations.GuiCraftConfirm;
-import appeng.client.gui.implementations.GuiCraftingCPU;
-import appeng.client.gui.widgets.GuiCustomSlot;
-import appeng.container.implementations.ContainerCraftAmount;
-import mezz.jei.api.gui.IAdvancedGuiHandler;
-import net.minecraft.client.renderer.RenderItem;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-
-public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>
-{
-
-    @Override
-    public Class<AEBaseGui> getGuiContainerClass()
-    {
-        return AEBaseGui.class;
-    }
-
-    @Nullable
-    @Override
-    public List<Rectangle> getGuiExtraAreas( AEBaseGui guiContainer )
-    {
-        return Collections.emptyList();
-    }
-
-    @Nullable
-    @Override
-    public Object getIngredientUnderMouse( AEBaseGui guiContainer, int mouseX, int mouseY )
-    {
-        List<IAEItemStack> visual = new ArrayList<>();
-        int guiSlotIdx = 0;
-        Object result = null;
-        if( guiContainer instanceof GuiCraftConfirm )
-        {
-            guiSlotIdx = getSlotidx( guiContainer, mouseX, mouseY, ( (GuiCraftConfirm) guiContainer ).getDisplayedRows() );
-            visual = ( (GuiCraftConfirm) guiContainer ).getVisual();
-            if( guiSlotIdx < visual.size() && guiSlotIdx != -1 )
-            {
-                result = visual.get( guiSlotIdx ).getDefinition();
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        if( guiContainer instanceof GuiCraftingCPU )
-        {
-            guiSlotIdx = getSlotidx( guiContainer, mouseX, mouseY, ( (GuiCraftingCPU) guiContainer ).getDisplayedRows() );
-            visual = ( (GuiCraftingCPU) guiContainer ).getVisual();
-            if( guiSlotIdx < visual.size() && guiSlotIdx != -1 )
-            {
-                result = visual.get( guiSlotIdx ).getDefinition();
-            }
-            else
-            {
-                return null;
-            }
-        }
-        
-        if( guiContainer instanceof GuiCraftAmount )
-        {
-            if( guiContainer.getSlotUnderMouse() != null )
-            {
-                result = guiContainer.getSlotUnderMouse().getStack();
-            }
-        }
-        return result;
-    }
-
-    private int getSlotidx(AEBaseGui guiContainer, int mouseX, int mouseY, int rows)
-    {
-        int guileft = guiContainer.getGuiLeft();
-        int guitop = guiContainer.getGuiTop();
-        int currentScroll = guiContainer.getScrollBar().getCurrentScroll();
-        final int xo = 9;
-        final int yo = 19;
-
-        int guiSlotx = ( mouseX - guileft - xo ) / 67;
-        if( guiSlotx > 2 || mouseX < guileft + xo ) return -1;
-        int guiSloty = ( mouseY - guitop - yo ) / 23;
-        if( guiSloty > ( rows - 1 ) || mouseY < guitop + yo ) return -1;
-        return ( guiSloty * 3 ) + guiSlotx + ( currentScroll * 3 );
-    }
-}
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;

 import com.google.common.base.Joiner;
@@ -237,7 +238,7 @@ public class GuiCraftConfirm extends AEBaseGui
 		final int viewEnd = viewStart + 3 * this.rows;

 		String dspToolTip = "";
-		final List<String> lineList = new ArrayList<>();
+		final List<String> lineList = new LinkedList<>();
 		int toolPosX = 0;
 		int toolPosY = 0;

@@ -582,14 +583,4 @@ public class GuiCraftConfirm extends AEBaseGui
 			}
 		}
 	}
-
-	public List<IAEItemStack> getVisual()
-	{
-		return visual;
-	}
-
-	public int getDisplayedRows()
-	{
-		return this.rows;
-	}
 }
@@ -22,6 +22,7 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

@@ -211,7 +212,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 		final int viewEnd = viewStart + 3 * 6;

 		String dspToolTip = "";
-		final List<String> lineList = new ArrayList<>();
+		final List<String> lineList = new LinkedList<>();
 		int toolPosX = 0;
 		int toolPosY = 0;

@@ -493,14 +494,4 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 	{
 		return ViewItems.ALL;
 	}
-
-	public List<IAEItemStack> getVisual()
-	{
-		return visual;
-	}
-
-	public int getDisplayedRows()
-	{
-		return DISPLAYED_ROWS;
-	}
 }
@@ -82,8 +82,8 @@ public class GuiInterface extends GuiUpgradeable

 		this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Interface.getLocal() ), 8, 6, 4210752 );

-		this.fontRenderer.drawString( GuiText.Config.getLocal(), 8, 6 + 11 + 7, 4210752 );
-		this.fontRenderer.drawString( GuiText.StoredItems.getLocal(), 8, 6 + 60 + 7, 4210752 );
+		this.fontRenderer.drawString( GuiText.Config.getLocal(), 18, 6 + 11 + 7, 4210752 );
+		this.fontRenderer.drawString( GuiText.StoredItems.getLocal(), 18, 6 + 60 + 7, 4210752 );
 		this.fontRenderer.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 );

 		this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -20,17 +20,20 @@ package appeng.client.gui.implementations;


 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;

-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.util.BlockPosUtils;
 import com.google.common.collect.HashMultimap;

-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -46,12 +49,6 @@ import appeng.container.implementations.ContainerInterfaceTerminal;
 import appeng.core.localization.GuiText;
 import appeng.parts.reporting.PartInterfaceTerminal;
 import appeng.util.Platform;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextComponentString;
-
-
-import static appeng.client.render.BlockPosHighlighter.hilightBlock;


 public class GuiInterfaceTerminal extends AEBaseGui
@@ -60,33 +57,26 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private static final int LINES_ON_PAGE = 6;

 	// TODO: copied from GuiMEMonitorable. It looks not changed, maybe unneeded?
-	private final int offsetX = 21;
+	private final int offsetX = 9;

 	private final HashMap<Long, ClientDCInternalInv> byId = new HashMap<>();
 	private final HashMultimap<String, ClientDCInternalInv> byName = HashMultimap.create();
-	private final HashMap<ClientDCInternalInv,BlockPos> blockPosHashMap = new HashMap<>();
-	private final HashMap<GuiButton,ClientDCInternalInv> guiButtonHashMap = new HashMap<>();
 	private final ArrayList<String> names = new ArrayList<>();
 	private final ArrayList<Object> lines = new ArrayList<>();

 	private final Map<String, Set<Object>> cachedSearches = new WeakHashMap<>();

 	private boolean refreshList = false;
-	private MEGuiTextField searchFieldOutputs;
-	private MEGuiTextField searchFieldInputs;
-	private PartInterfaceTerminal partInterfaceTerminal;
-	private GuiButton guiButtonHide;
-	private GuiButton guiButtonNextAssembler;
+	private MEGuiTextField searchField;

 	public GuiInterfaceTerminal( final InventoryPlayer inventoryPlayer, final PartInterfaceTerminal te )
 	{
 		super( new ContainerInterfaceTerminal( inventoryPlayer, te ) );

-		this.partInterfaceTerminal = te;
 		final GuiScrollbar scrollbar = new GuiScrollbar();
 		this.setScrollBar( scrollbar );
-		this.xSize = 208;
-		this.ySize = 256;
+		this.xSize = 195;
+		this.ySize = 222;
 	}

 	@Override
@@ -94,64 +84,36 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		super.initGui();

-		this.getScrollBar().setLeft( 189 );
+		this.getScrollBar().setLeft( 175 );
 		this.getScrollBar().setHeight( 106 );
-		this.getScrollBar().setTop( 51 );
+		this.getScrollBar().setTop( 18 );

-		this.searchFieldInputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 32, this.offsetX ), this.guiTop + 25, 65, 12 );
-		this.searchFieldInputs.setEnableBackgroundDrawing( false );
-		this.searchFieldInputs.setMaxStringLength( 25 );
-		this.searchFieldInputs.setTextColor( 0xFFFFFF );
-		this.searchFieldInputs.setVisible( true );
-		this.searchFieldInputs.setFocused( false );
-
-		this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 32, this.offsetX ), this.guiTop + 38, 65, 12 );
-		this.searchFieldOutputs.setEnableBackgroundDrawing( false );
-		this.searchFieldOutputs.setMaxStringLength( 25 );
-		this.searchFieldOutputs.setTextColor( 0xFFFFFF );
-		this.searchFieldOutputs.setVisible( true );
-		this.searchFieldOutputs.setFocused( true );
-
-		this.searchFieldInputs.setText( partInterfaceTerminal.in );
-		this.searchFieldOutputs.setText( partInterfaceTerminal.out );
-	}
-
-	@Override
-	public void onGuiClosed()
-	{
-		partInterfaceTerminal.saveSearchStrings( this.searchFieldInputs.getText().toLowerCase(), this.searchFieldOutputs.getText().toLowerCase() );
-		super.onGuiClosed();
-	}
-
-	@Override
-	protected boolean isPointInRegion( int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY )
-	{
-		if( searchFieldInputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop , "Inputs OR names" );
-		else if( searchFieldOutputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop, "Outputs OR names" );
-		return super.isPointInRegion( rectX, rectY, rectWidth, rectHeight, pointX, pointY );
+		this.searchField = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 );
+		this.searchField.setEnableBackgroundDrawing( false );
+		this.searchField.setMaxStringLength( 25 );
+		this.searchField.setTextColor( 0xFFFFFF );
+		this.searchField.setVisible( true );
+		this.searchField.setFocused( true );
 	}

 	@Override
 	public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
-		this.buttonList.clear();
-
 		this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
-		this.fontRenderer.drawString( GuiText.inventory.getLocal(), this.offsetX + 2, this.ySize - 96 + 3, 4210752 );
+		this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );

 		final int ex = this.getScrollBar().getCurrentScroll();

-		this.guiButtonNextAssembler = new GuiImgButton(guiLeft + 123, guiTop + 25,Settings.ACTIONS, ActionItems.FREE_MOLECULAR_SLOT_SHORTCUT);
-		this.buttonList.add( guiButtonNextAssembler );
+		final Iterator<Slot> o = this.inventorySlots.inventorySlots.iterator();
+		while( o.hasNext() )
+		{
+			if( o.next() instanceof SlotDisconnected )
+			{
+				o.remove();
+			}
+		}

-		guiButtonHide = new GuiImgButton( guiLeft + 141, guiTop + 25,Settings.ACTIONS, this.partInterfaceTerminal.onlyInterfacesWithFreeSlots ?
-																							ActionItems.TOGGLE_SHOW_FULL_INTERFACES_OFF :
-																							ActionItems.TOGGLE_SHOW_FULL_INTERFACES_ON);
-		this.buttonList.add( guiButtonHide );
-
-		this.inventorySlots.inventorySlots.removeIf( slot -> slot instanceof SlotDisconnected );
-
-		int offset = 51;
+		int offset = 17;
 		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
 		{
 			final Object lineObj = this.lines.get( ex + x );
@@ -160,13 +122,8 @@ public class GuiInterfaceTerminal extends AEBaseGui
 				final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
 				for( int z = 0; z < inv.getInventory().getSlots(); z++ )
 				{
-					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 22, 1 + offset ) );
+					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) );
 				}
-
-				GuiButton guiButton = new GuiImgButton(guiLeft + 4, guiTop + offset + 1, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE);
-				guiButtonHashMap.put( guiButton , inv);
-				this.buttonList.add( guiButton );
-
 			}
 			else if( lineObj instanceof String )
 			{
@@ -182,7 +139,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					name = name.substring( 0, name.length() - 1 );
 				}

-				this.fontRenderer.drawString( name, this.offsetX + 2, 6 + offset, 4210752 );
+				this.fontRenderer.drawString( name, 10, 6 + offset, 4210752 );
 			}
 			offset += 18;
 		}
@@ -191,66 +148,24 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	@Override
 	protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
 	{
-		this.searchFieldInputs.mouseClicked( xCoord, yCoord, btn );
+		this.searchField.mouseClicked( xCoord, yCoord, btn );

-		if( btn == 1 && this.searchFieldInputs.isMouseIn( xCoord, yCoord ) )
+		if( btn == 1 && this.searchField.isMouseIn( xCoord, yCoord ) )
 		{
-			this.searchFieldInputs.setText( "" );
-			this.refreshList();
-		}
-
-		this.searchFieldOutputs.mouseClicked( xCoord, yCoord, btn );
-
-		if( btn == 1 && this.searchFieldOutputs.isMouseIn( xCoord, yCoord ) )
-		{
-			this.searchFieldOutputs.setText( "" );
+			this.searchField.setText( "" );
 			this.refreshList();
 		}

 		super.mouseClicked( xCoord, yCoord, btn );
 	}

-	@Override
-	protected void actionPerformed( final GuiButton btn ) throws IOException
-	{
-		if( guiButtonHashMap.containsKey( btn ) )
-		{
-			BlockPos blockPos = blockPosHashMap.get( guiButtonHashMap.get( this.selectedButton ) );
-			BlockPos blockPos2 = mc.player.getPosition();
-			hilightBlock( blockPos, System.currentTimeMillis() + 500 * BlockPosUtils.getDistance(blockPos, blockPos2) );
-			mc.player.sendStatusMessage( new TextComponentString( "The interface is now highlighted at " + "X: " + blockPos.getX() + " Y: " + blockPos.getY() + " Z: " + blockPos.getZ() ), false );
-			mc.player.closeScreen();
-		}
-
-		if (btn == guiButtonHide)
-		{
-			partInterfaceTerminal.onlyInterfacesWithFreeSlots = !partInterfaceTerminal.onlyInterfacesWithFreeSlots;
-			this.refreshList();
-		}
-
-		if (btn == guiButtonNextAssembler)
-		{
-			// Set Search to "Molecular Assembler" and set "Only Free Interface"
-			boolean currentOnlyInterfacesWithFreeSlots = this.partInterfaceTerminal.onlyInterfacesWithFreeSlots;
-			String currentSearchText = this.searchFieldOutputs.getText();
-
-			this.partInterfaceTerminal.onlyInterfacesWithFreeSlots = true;
-			this.searchFieldOutputs.setText("Molecular Assembler");
-
-			this.refreshList();
-
-			this.partInterfaceTerminal.onlyInterfacesWithFreeSlots = currentOnlyInterfacesWithFreeSlots;
-			this.searchFieldOutputs.setText(currentSearchText);
-		}
-	}
-
 	@Override
 	public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
-		this.bindTexture( "guis/newinterfaceterminal.png" );
+		this.bindTexture( "guis/interfaceterminal.png" );
 		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );

-		int offset = 51;
+		int offset = 17;
 		final int ex = this.getScrollBar().getCurrentScroll();

 		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
@@ -262,19 +177,14 @@ public class GuiInterfaceTerminal extends AEBaseGui

 				GlStateManager.color( 1, 1, 1, 1 );
 				final int width = inv.getInventory().getSlots() * 18;
-				this.drawTexturedModalRect( offsetX + 20, offsetY + offset, 20, 173, width, 18 );
+				this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 139, width, 18 );
 			}
 			offset += 18;
 		}

-		if( this.searchFieldInputs != null )
+		if( this.searchField != null )
 		{
-			this.searchFieldInputs.drawTextBox();
-		}
-
-		if( this.searchFieldOutputs != null )
-		{
-			this.searchFieldOutputs.drawTextBox();
+			this.searchField.drawTextBox();
 		}
 	}

@@ -283,21 +193,15 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		if( !this.checkHotbarKeys( key ) )
 		{
-			if( character == ' ' && this.searchFieldInputs.getText().isEmpty() && this.searchFieldInputs.isFocused() )
+			if( character == ' ' && this.searchField.getText().isEmpty() )
 			{
 				return;
 			}

-			if( character == ' ' && this.searchFieldOutputs.getText().isEmpty() && this.searchFieldOutputs.isFocused())
-			{
-				return;
-			}
-
-			if( this.searchFieldInputs.textboxKeyTyped( character, key ) || this.searchFieldOutputs.textboxKeyTyped( character, key ))
+			if( this.searchField.textboxKeyTyped( character, key ) )
 			{
 				this.refreshList();
 			}
-
 			else
 			{
 				super.keyTyped( character, key );
@@ -323,7 +227,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					final long id = Long.parseLong( key.substring( 1 ), Character.MAX_RADIX );
 					final NBTTagCompound invData = in.getCompoundTag( key );
 					final ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) );
-					blockPosHashMap.put( current, NBTUtil.getPosFromTag( invData.getCompoundTag( "pos" )) );

 					for( int x = 0; x < current.getInventory().getSlots(); x++ )
 					{
@@ -357,68 +260,41 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private void refreshList()
 	{
 		this.byName.clear();
-		this.buttonList.clear();

-		final String searchFieldInputs = this.searchFieldInputs.getText().toLowerCase();
-		final String searchFieldOutputs = this.searchFieldOutputs.getText().toLowerCase();
+		final String searchFilterLowerCase = this.searchField.getText().toLowerCase();

-		final Set<Object> cachedSearch = this.getCacheForSearchTerm( "IN:" + searchFieldInputs + " OUT:" + searchFieldOutputs + partInterfaceTerminal.onlyInterfacesWithFreeSlots);
+		final Set<Object> cachedSearch = this.getCacheForSearchTerm( searchFilterLowerCase );
 		final boolean rebuild = cachedSearch.isEmpty();

 		for( final ClientDCInternalInv entry : this.byId.values() )
 		{
-			// ignore inventory if not doing a full rebuild and cache already marks it as miss.
+			// ignore inventory if not doing a full rebuild or cache already marks it as miss.
 			if( !rebuild && !cachedSearch.contains( entry ) )
 			{
 				continue;
 			}

 			// Shortcut to skip any filter if search term is ""/empty
-
-			boolean found = (searchFieldInputs.isEmpty() && searchFieldOutputs.isEmpty() && !partInterfaceTerminal.onlyInterfacesWithFreeSlots);
+			boolean found = searchFilterLowerCase.isEmpty();

 			// Search if the current inventory holds a pattern containing the search term.
-			if( !found )
+			if( !found && !searchFilterLowerCase.isEmpty() )
 			{
 				for( final ItemStack itemStack : entry.getInventory() )
 				{
-					if( !searchFieldInputs.isEmpty() && !searchFieldOutputs.isEmpty() )
-						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) || this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
-					else if( !searchFieldInputs.isEmpty() )
-						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) );
-					else if( !searchFieldOutputs.isEmpty() )
-						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
+					found = this.itemStackMatchesSearchTerm( itemStack, searchFilterLowerCase );
 					if( found )
 					{
 						break;
 					}
 				}
-			} 
-
-			// If only Interfaces with empty slots should be shown, check that here
-			boolean interfaceHasFreeSlots = false;
-			if (partInterfaceTerminal.onlyInterfacesWithFreeSlots) {
-				for( final ItemStack itemStack : entry.getInventory() )
-				{
-					if(itemStack.isEmpty()){
-						interfaceHasFreeSlots = true;
-						break;
-					}
-				}
 			}

 			// if found, filter skipped or machine name matching the search term, add it
-			if( found || (entry.getName().toLowerCase().contains( searchFieldInputs ) && entry.getName().toLowerCase().contains( searchFieldOutputs )))
+			if( found || entry.getName().toLowerCase().contains( searchFilterLowerCase ) )
 			{
-				if (!partInterfaceTerminal.onlyInterfacesWithFreeSlots)
-				{
-					this.byName.put( entry.getName(), entry );
-					cachedSearch.add( entry );
-				}
-				else if ( interfaceHasFreeSlots ){
-					this.byName.put( entry.getName(), entry );
-					cachedSearch.add( entry );
-				}
+				this.byName.put( entry.getName(), entry );
+				cachedSearch.add( entry );
 			}
 			else
 			{
@@ -448,7 +324,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		this.getScrollBar().setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 );
 	}

-	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm,int pass )
+	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm )
 	{
 		if( itemStack.isEmpty() )
 		{
@@ -462,21 +338,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			return false;
 		}

-		NBTTagList tag = new NBTTagList();
+		// Potential later use to filter by input
+		// NBTTagList inTag = encodedValue.getTagList( "in", 10 );
+		final NBTTagList outTag = encodedValue.getTagList( "out", 10 );

-		if (pass == 0)
-		{
-			tag = encodedValue.getTagList( "in", 10 );
-		}
-		else
-		{
-			tag = encodedValue.getTagList( "out", 10 );
-		}
-
-		for( int i = 0; i < tag.tagCount(); i++ )
+		for( int i = 0; i < outTag.tagCount(); i++ )
 		{

-			final ItemStack parsedItemStack = new ItemStack( tag.getCompoundTagAt( i ) );
+			final ItemStack parsedItemStack = new ItemStack( outTag.getCompoundTagAt( i ) );
 			if( !parsedItemStack.isEmpty() )
 			{
 				final String displayName = Platform
@@ -40,7 +40,6 @@ import appeng.api.storage.ITerminalHost;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;
-import appeng.client.ActionKey;
 import appeng.client.gui.AEBaseMEGui;
 import appeng.client.gui.widgets.GuiImgButton;
 import appeng.client.gui.widgets.GuiScrollbar;
@@ -55,7 +54,6 @@ import appeng.container.slot.SlotCraftingMatrix;
 import appeng.container.slot.SlotFakeCraftingMatrix;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
-import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.GuiBridge;
 import appeng.core.sync.network.NetworkHandler;
@@ -97,9 +95,6 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 	private GuiImgButton SortDirBox;
 	private GuiImgButton searchBoxSettings;
 	private GuiImgButton terminalStyleBox;
-	private boolean isAutoFocus = false;
-	private int currentMouseX = 0;
-	private int currentMouseY = 0;

 	public GuiMEMonitorable( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
 	{
@@ -229,10 +224,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 		Keyboard.enableRepeatEvents( true );

 		this.maxRows = this.getMaxRows();
-		this.perRow = AEConfig.instance()
-				.getConfigManager()
-				.getSetting(
-						Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 );
+		this.perRow = AEConfig.instance().getConfigManager().getSetting(
+				Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 );

 		final int magicNumber = 114 + 1;
 		final int extraSpace = this.height - magicNumber - this.reservedSpace;
@@ -297,10 +290,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 		offset += 20;

 		this.buttonList.add(
-				this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance()
-						.getConfigManager()
-						.getSetting(
-								Settings.SEARCH_MODE ) ) );
+				this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance().getConfigManager().getSetting(
+						Settings.SEARCH_MODE ) ) );

 		offset += 20;

@@ -315,7 +306,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 		this.searchField.setEnableBackgroundDrawing( false );
 		this.searchField.setMaxStringLength( 25 );
 		this.searchField.setTextColor( 0xFFFFFF );
-		this.searchField.setSelectionColor( 0xFF008000 );
+		this.searchField.setSelectionColor( 0xFF99FF99 );
 		this.searchField.setVisible( true );

 		if( this.viewCell || this instanceof GuiWirelessTerm )
@@ -327,11 +318,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi

 		final Enum searchModeSetting = AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_MODE );

-		this.isAutoFocus = SearchBoxMode.AUTOSEARCH == searchModeSetting || SearchBoxMode.JEI_AUTOSEARCH == searchModeSetting || SearchBoxMode.AUTOSEARCH_KEEP == searchModeSetting || SearchBoxMode.JEI_AUTOSEARCH_KEEP == searchModeSetting;
+		final boolean isAutoFocus = SearchBoxMode.AUTOSEARCH == searchModeSetting || SearchBoxMode.JEI_AUTOSEARCH == searchModeSetting || SearchBoxMode.AUTOSEARCH_KEEP == searchModeSetting || SearchBoxMode.JEI_AUTOSEARCH_KEEP == searchModeSetting;
+		final boolean isManualFocus = SearchBoxMode.MANUAL_SEARCH == searchModeSetting || SearchBoxMode.JEI_MANUAL_SEARCH == searchModeSetting || SearchBoxMode.MANUAL_SEARCH_KEEP == searchModeSetting || SearchBoxMode.JEI_MANUAL_SEARCH_KEEP == searchModeSetting;
 		final boolean isKeepFilter = SearchBoxMode.AUTOSEARCH_KEEP == searchModeSetting || SearchBoxMode.JEI_AUTOSEARCH_KEEP == searchModeSetting || SearchBoxMode.MANUAL_SEARCH_KEEP == searchModeSetting || SearchBoxMode.JEI_MANUAL_SEARCH_KEEP == searchModeSetting;
 		final boolean isJEIEnabled = SearchBoxMode.JEI_AUTOSEARCH == searchModeSetting || SearchBoxMode.JEI_MANUAL_SEARCH == searchModeSetting;

-		this.searchField.setFocused( this.isAutoFocus );
+		this.searchField.setFocused( isAutoFocus );
+		this.searchField.setCanLoseFocus( isManualFocus );

 		if( isJEIEnabled )
 		{
@@ -381,9 +374,6 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 	{
 		this.fontRenderer.drawString( this.getGuiDisplayName( this.myName.getLocal() ), 8, 6, 4210752 );
 		this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
-
-		this.currentMouseX = mouseX;
-		this.currentMouseY = mouseY;
 	}

 	@Override
@@ -480,40 +470,18 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 	@Override
 	protected void keyTyped( final char character, final int key ) throws IOException
 	{
-
 		if( !this.checkHotbarKeys( key ) )
 		{
-			if( AppEng.proxy.isActionKey( ActionKey.TOGGLE_FOCUS, key ) )
-			{
-				this.searchField.setFocused( !this.searchField.isFocused() );
-				return;
-			}
-
-			if( this.searchField.isFocused() && key == Keyboard.KEY_RETURN )
-			{
-				this.searchField.setFocused( false );
-				return;
-			}
-
 			if( character == ' ' && this.searchField.getText().isEmpty() )
 			{
 				return;
 			}

-			final boolean mouseInGui = this.isPointInRegion( 0, 0, this.xSize, this.ySize, this.currentMouseX, this.currentMouseY );
-
-			if( this.isAutoFocus && !this.searchField.isFocused() && mouseInGui )
-			{
-				this.searchField.setFocused( true );
-			}
-
 			if( this.searchField.textboxKeyTyped( character, key ) )
 			{
 				this.repo.setSearchString( this.searchField.getText() );
 				this.repo.updateView();
 				this.setScrollBar();
-				// tell forge the key event is handled and should not be sent out
-				this.keyHandled = mouseInGui;
 			}
 			else
 			{
@@ -60,13 +60,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 	private GuiImgButton substitutionsDisabledBtn;
 	private GuiImgButton encodeBtn;
 	private GuiImgButton clearBtn;
-	private GuiImgButton x2Btn;
-	private GuiImgButton x3Btn;
-	private GuiImgButton plusOneBtn;
-	private GuiImgButton divTwoBtn;
-	private GuiImgButton divThreeBtn;
-	private GuiImgButton minusOneBtn;
-	private GuiImgButton maxCountBtn;

 	public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
 	{
@@ -85,20 +78,13 @@ public class GuiPatternTerm extends GuiMEMonitorable

 			if( this.tabCraftButton == btn || this.tabProcessButton == btn )
 			{
-				NetworkHandler.instance()
-						.sendToServer(
-								new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) );
+				NetworkHandler.instance().sendToServer(
+						new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) );
 			}

 			if( this.encodeBtn == btn )
 			{
-				if ( isShiftKeyDown() ){
-					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "2" ) );
-				}
-				else
-				{
-					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
-				}
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
 			}

 			if( this.clearBtn == btn )
@@ -106,46 +92,10 @@ public class GuiPatternTerm extends GuiMEMonitorable
 				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) );
 			}

-			if( this.x2Btn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByTwo", "1" ) );
-			}
-
-			if( this.x3Btn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByThree", "1" ) );
-			}
-
-			if( this.divTwoBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByTwo", "1" ) );
-			}
-
-			if( this.divThreeBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByThree", "1" ) );
-			}
-
-			if( this.plusOneBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.IncreaseByOne", "1" ) );
-			}
-
-			if( this.minusOneBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DecreaseByOne", "1" ) );
-			}
-
-			if( this.maxCountBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MaximizeCount", "1" ) );
-			}
-
 			if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
 			{
-				NetworkHandler.instance()
-						.sendToServer(
-								new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) );
+				NetworkHandler.instance().sendToServer(
+						new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) );
 			}
 		}
 		catch( final IOException e )
@@ -179,34 +129,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 		this.clearBtn.setHalfSize( true );
 		this.buttonList.add( this.clearBtn );

-		this.x3Btn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.MULTIPLY_BY_THREE );
-		this.x3Btn.setHalfSize( true );
-		this.buttonList.add( this.x3Btn );
-
-		this.x2Btn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.MULTIPLY_BY_TWO );
-		this.x2Btn.setHalfSize( true );
-		this.buttonList.add( this.x2Btn );
-
-		this.plusOneBtn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 138, Settings.ACTIONS, ActionItems.INCREASE_BY_ONE );
-		this.plusOneBtn.setHalfSize( true );
-		this.buttonList.add( this.plusOneBtn );
-
-		this.divThreeBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.DIVIDE_BY_THREE );
-		this.divThreeBtn.setHalfSize( true );
-		this.buttonList.add( this.divThreeBtn );
-
-		this.divTwoBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.DIVIDE_BY_TWO );
-		this.divTwoBtn.setHalfSize( true );
-		this.buttonList.add( this.divTwoBtn );
-
-		this.minusOneBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 138, Settings.ACTIONS, ActionItems.DECREASE_BY_ONE );
-		this.minusOneBtn.setHalfSize( true );
-		this.buttonList.add( this.minusOneBtn );
-
-		//this.maxCountBtn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 108, Settings.ACTIONS, ActionItems.MAX_COUNT );
-		//this.maxCountBtn.setHalfSize( true );
-		//this.buttonList.add( this.maxCountBtn );
-
 		this.encodeBtn = new GuiImgButton( this.guiLeft + 147, this.guiTop + this.ySize - 142, Settings.ACTIONS, ActionItems.ENCODE );
 		this.buttonList.add( this.encodeBtn );
 	}
@@ -218,13 +140,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 		{
 			this.tabCraftButton.visible = true;
 			this.tabProcessButton.visible = false;
-			this.x2Btn.visible = false;
-			this.x3Btn.visible = false;
-			this.divTwoBtn.visible = false;
-			this.divThreeBtn.visible = false;
-			this.plusOneBtn.visible = false;
-			this.minusOneBtn.visible = false;
-			//this.maxCountBtn.visible = false;

 			if( this.container.substitute )
 			{
@@ -243,13 +158,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 			this.tabProcessButton.visible = true;
 			this.substitutionsEnabledBtn.visible = false;
 			this.substitutionsDisabledBtn.visible = false;
-			this.x2Btn.visible = true;
-			this.x3Btn.visible = true;
-			this.divTwoBtn.visible = true;
-			this.divThreeBtn.visible = true;
-			this.plusOneBtn.visible = true;
-			this.minusOneBtn.visible = true;
-			//this.maxCountBtn.visible = true;
 		}

 		super.drawFG( offsetX, offsetY, mouseX, mouseY );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
fscan	fa2b4fabc7	Fix ConcurrentModificatonException in NetworkEventBus (#3660 )	2018-08-01 00:35:44 +02:00
Saereth	f8d5f4ddb1	Fixes #3478 : Changes the way xp drops from Certus Ore blocks (#3482 )	2018-06-26 23:36:21 +02:00
fscan	f8dfa2619e	Fixes #3535 : Prevent crash when either quartz types are disabled (#3542 ) * Fixes crash when either quartz types are disabled and prevent cascading worldgen. * Also fixes #3486	2018-06-26 15:31:03 +02:00
fscan	c1d1dc947f	Fixes #3548 : AEBaseTile now respect overridden markDirty implementations. (#3550 )	2018-06-26 10:33:56 +02:00
fscan	6bb465be0b	Fixes #3449 : Prevent CellInventory#getCell() from mutating the cell itemstack definition (#3552 ) CellInventory#getCell() initalizes the ItemStack with an empty NBT and therefore was messing with the item definition.	2018-06-26 10:32:58 +02:00
fscan	8902af9766	Fixes #3459 : Open the inventory if raytrace misses (#3549 )	2018-06-26 10:31:17 +02:00
fscan	2b592dd40e	Fixes DriveBakedModel to not crash when SLOT_STATE is null (#3545 ) Uses a null object in case the TE is not available for whichever reason.	2018-06-18 19:03:28 +02:00
fscan	41e7558b24	Fixes interface shift-clicking to generate correct onChangeInventory events (#3544 )	2018-06-18 19:01:17 +02:00