yet another try at energy issues

fix requesters not being added to the energy grid partially revert the energy 'fixes' potential desync on item count energy and items change
fluid pass
2021-09-17 00:09:49 -03:00 · 2021-09-13 04:22:52 -03:00 · 2021-09-13 02:10:28 -03:00 · 2021-09-11 22:48:45 -03:00 · 2021-09-06 23:51:32 -03:00 · 2021-09-05 20:28:37 -03:00
1025 changed files with 34473 additions and 13041 deletions
@@ -0,0 +1,30 @@
+---
+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:
@@ -0,0 +1,17 @@
+---
+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. -->
@@ -0,0 +1,15 @@
+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,14 +7,27 @@ 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/deobfedDeps/providedDummy.jar
-  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
+  - 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
+
 cache:
  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+    - '$HOME/.m2/repository'
+    - '$HOME/.sonar/cache'
+    - '$HOME/.gradle/wrapper'
+    - '$HOME/.gradle/caches'
+
+addons:
+  sonarcloud:
+    organization: "appliedenergistics"

 install: "./gradlew setupCIWorkspace"
-script: "./gradlew build test"
+script: 
+  - "./gradlew build"
+  - "./gradlew test"
+  - "./gradlew sonarqube"
@@ -0,0 +1,58 @@
+Changes so far :
+
+Design changes/breakages:
+ - Interfaces no longer spill items of one pattern on other faces
+ - Interfaces now push patterns in round-robin (Interfaces, then sides)
+
+
+
+
+Fixes:
+
+ - Fix gregtech machines appearing with 'unnamed' or 'draconium lens' on the interface terminal on specific situations.
+ - Add memorycard support for fluid interfaces, import/export/storage busses and level emitters ( this fix was upstreamed to AE2 for MC 1.16)
+ - Storage busses now hide/show inaccessible items as configured.
+ - Exclusive Blocking mode for GTCE ( shapes, molds and configured circuits do not block GTCE machines )
+ - Blocking modes default to block on any item in the iventory the entity exposes
+ - Fuzzy includes items that report that they're damageable, but report a maxDamage of 0 ( auto-crafting of basic capacitors -> resonant capacitors is now possible ) <- Broken item implementation.
+ - Fix CME exceptions on the energy grid
+ - Fix AE going offline even with enough power by extracting from the local buffer always last
+ - Fix IO-Port copying craftable flag into items
+ - Fix NBT of old items not clearing on drives that reached 64 types once
+
+Performance:
+
+ - Added @talchas fixes for insane channelless AE networks.
+ - Implemented StorageDrawers slotless itemrepository.
+ - Removed CraftedEvent calls (really bad lag with craftweaker versions before CraftTweaker2-1.12-4.1.20.626)
+ - Count items set in interfaces before queuing crafting for them needlessly
+ - Backported b7ca98d ( Avoid copying items on simulated item extraction )
+ - Cache some level emitters functions
+ - Reduced import bus insert simulation to 1 before real insertion (if possible)
+ - Backported itemlist re-implementation along with pattern changes to avoid CraftingManager fallback issues
+ - Instead of recalculating all the content of the network on every change, track the changes properly and apply them to the cached list of items
+
+QOL:
+
+ - added highlight interface button to interface terminal ("?" button on the left of the interface slots)
+ - Added bar on the interface terminal that search by inputs ( The one on the LEFT, also searchs by interface name )
+ - Shortcut to molecular assemblers with free slots on the terminal interface by @Theisyat
+ - Toggle button on interface terminal to hide full interfaces
+ - JEI "U", "R" and "A" (Usages/Recipes/Bookmark) now work on the Crafting Status GUI. ( the one that shows the total items to craft, and whats missing)
+ - Patterns can now be made with items currently showing on JEI. ( This is overriden by Just Enough Energistics. )
+ - Added multiplier buttons to processing pattern gui
+ - Switched crafting terminal JEI search to fuzzy mode. If the recipe uses a damageable item, AE will try to grab it ( damaged tools )
+ - Encoded patterns stack up to 64 ( holding shift and clicking the encode arrow will transfer the encoded pattern to the player inventory)
+ - Encoded patterns can be draggred on the interface terminal.
+ - Storage Monitor and Conversion Monitor now also ccepts fluids
+ - Draggable JEI ghost items (also works on bookmarked items. SHIFT + Click will move the hovered item into the first free target slot)
+ - JEI auto switches between crafting and processing patterns
+ - GTCE Blocking mode work through phantom itemfaces
+ - Shift-clicking blank patterns into the pattern terminal will try to fill the blank pattern slots first
+ - Mismached simulated/real item count ( most often due to compacting drawers ) will now tell the player wich item cause the failure when trying to start a craft
+ - Added 'pattern expansion' cards that adds an extra row of patterns to interfaces. up to 3 card on an interface. (each card will increase the interface idle power draw by 4 times)
+
+HOTKEYS:
+
+ - Implemented mousetweaks API. AE2 custom keybinds now work. (Try right clicking and use the scroll-wheel on the terminals)
+ - Holding SHIFT and scrolling UP and DOWN will increase the items set on the configured slots of Interfaces and Pattern Terminal (Processing mode)
@@ -1,239 +1,29 @@
-[![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)
+This is a fork of AE2 i made for trying to solve issues for the [Omnifactory](https://www.curseforge.com/minecraft/modpacks/omnifactory) modpack.

-# Applied Energistics 2
+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.

-## 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)
+# Applied Energistics 2 (PrototypeTrousers fork for Omnifactory)

 ## 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 - 2017 AlgorithmX2 et al
+  - (c) 2013 - 2018 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 - 2017 AlgorithmX2 et al
+  - (c) 2013 - 2018 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 - 2017 AlgorithmX2 et al
+  - (c) 2013 - 2018 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,7 +30,13 @@ 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()
@@ -51,7 +57,7 @@ tasks.withType(JavaCompile) {
    options.encoding = 'UTF-8'
 }

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

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

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

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

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

 #########################################################
 # Provided APIs                                         #
 #########################################################
-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
+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

 #########################################################
 # Deployment                                            #
@@ -24,36 +24,44 @@ 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'
+	classifier = 'api'
+}
+
+task sourceJar(type: Jar, overwrite: true) {
+	from sourceSets.api.allSource
+	from sourceSets.main.allSource
+
+	classifier = 'sources'
 }

 artifacts {
-    archives apiJar
-    archives javadocJar
-    archives sourceJar
+	archives apiJar
+	archives javadocJar
+	archives sourceJar
 }
@@ -31,7 +31,12 @@ repositories {

    maven {
        name = "Tesla repo"
-        url "http://maven.epoxide.xyz"
+        url "http://maven.mcmoddev.com"
+    }
+
+    maven {
+        name "Ellpeck"
+        url "https://maven.ellpeck.de"
    }

    maven {
@@ -48,21 +53,26 @@ repositories {
        name 'tterrag maven'
        url "http://maven.tterrag.com/"
    }
-    
+
    maven { // McJtyLib
        name 'mcjty'
        url "http://maven.k-4u.nl/"
    }

-    maven { // Hwyla
-        name 'tehnut'
-        url "http://tehnut.info/maven"
-    }
-    
   	maven { // CraftTweaker
        name 'jared maven'
        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/"
+	}
 }

 configurations {
@@ -70,6 +80,8 @@ configurations {
 }

 dependencies {
+    compileOnly "gregtechce:gregtech:1.12.2:1.15.1.735"
+
    // installable runtime dependencies
    mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
@@ -78,11 +90,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:${tesla_version}"
+    compileOnly "net.darkhax.tesla:Tesla-1.12.2:${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}"
+    compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api"

    // at runtime, use the full JEI jar
    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
@@ -1,6 +1,5 @@
-#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-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh

 ##############################################################################
 ##
@@ -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,11 +154,19 @@ if $cygwin ; then
    esac
 fi

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

-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"
@@ -49,7 +49,6 @@ 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.
@@ -60,11 +59,6 @@ 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,6 +30,7 @@ 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
@@ -60,4 +61,9 @@ public interface IAppEngApi
 	 */
 	IDefinitions definitions();

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

 public enum ActionItems
 {
-	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
+	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
 }
@@ -37,12 +37,17 @@ 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 ),
+	PATTERN_EXPANSION(1);

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

 	ITileDefinition iface();

+	ITileDefinition fluidIface();
+
 	ITileDefinition cellWorkbench();

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

 	IItemDefinition cell64k();

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

 	IItemDefinition spatialCell16();
@@ -89,6 +89,8 @@ public interface IMaterials

 	IItemDefinition cardCapacity();

+	IItemDefinition cardPatternExpansion();
+
 	IItemDefinition cardFuzzy();

 	IItemDefinition cardInverter();
@@ -134,4 +136,12 @@ 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,6 +64,8 @@ public interface IParts

 	IItemDefinition iface();

+	IItemDefinition fluidIface();
+
 	IItemDefinition levelEmitter();

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

 	IItemDefinition conversionMonitor();
+
+	IItemDefinition fluidTerminal();
+
+	IItemDefinition fluidImportBus();
+
+	IItemDefinition fluidExportBus();
+
+	IItemDefinition fluidStorageBus();
+
+	IItemDefinition fluidLevelEmitter();
+
+	IItemDefinition fluidAnnihilationPlane();
+
+	IItemDefinition fluidFormationnPlane();
 }
@@ -47,7 +47,9 @@ 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,6 +28,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

+import appeng.api.util.AEColor;
+

 /**
 * Memory Card API
@@ -41,13 +43,18 @@ 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 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.
+	 * @param settingsName unlocalized string that represents the tile entity.
+	 * @param data the NBT tag, refer to the normal comment for special keys.
 	 */
-	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
@@ -68,6 +75,17 @@ 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,10 +24,13 @@
 package appeng.api.implementations.items;


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

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


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

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

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

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

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

 	/**
 	 * Allows you to specify if this storage cell can be stored inside other
@@ -103,10 +106,16 @@ public interface IStorageCell extends ICellWorkbenchItem
 	 *
 	 * @return if the ItemStack should behavior as a storage cell.
 	 */
-	boolean isStorageCell( ItemStack i );
+	boolean isStorageCell( @Nonnull 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_CLEARED
+	INVALID_MACHINE, SETTINGS_LOADED, SETTINGS_SAVED, SETTINGS_RESET, SETTINGS_CLEARED
 }
@@ -23,6 +23,7 @@

 package appeng.api.implementations.tiles;

+
 import net.minecraftforge.items.IItemHandler;


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

 package appeng.api.implementations.tiles;

+
 import net.minecraftforge.items.IItemHandler;


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


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

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

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

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

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

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

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

 	/**
@@ -93,5 +101,6 @@ public interface IGrid
 	/**
 	 * @return the node considered the pivot point of the grid.
 	 */
+	@Nonnull
 	IGridNode getPivot();
 }
@@ -26,6 +26,9 @@ 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;

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

 	/**
@@ -56,10 +60,11 @@ 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.
 	 *
@@ -68,37 +73,46 @@ 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( GridNotification notification );
+	void onGridNotification( @Nonnull GridNotification notification );

 	/**
 	 * Update Blocks network/connection/booting status. grid,
 	 *
 	 * @param grid grid
 	 * @param channelsInUse used channels
+	 * @deprecated to be removed in rv7
 	 */
+	@Deprecated
 	void setNetworkStatus( IGrid grid, int channelsInUse );

 	/**
 	 * Determine which sides of the block can be connected too, only used when isWorldAccessible returns true, not used
 	 * for {@link IPart} implementations.
 	 */
+	@Nonnull
 	EnumSet<EnumFacing> getConnectableSides();

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

 	/**
@@ -109,7 +123,8 @@ 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, null is valid, and will not show this node.
+	 * @return the render item stack to use to render this node. Returning an empty ItemStack will not show this node.
 	 */
+	@Nonnull
 	ItemStack getMachineRepresentation();
 }
@@ -24,6 +24,9 @@
 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.
@@ -50,7 +53,7 @@ public interface IGridCache
 	 * @param gridNode removed from that grid
 	 * @param machine to be removed machine
 	 */
-	void removeNode( IGridNode gridNode, IGridHost machine );
+	void removeNode( @Nonnull IGridNode gridNode, @Nonnull IGridHost machine );

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

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

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

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


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


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

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


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


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

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

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

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

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


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

@@ -32,5 +35,5 @@ public interface IGridConnectionVisitor extends IGridVisitor
 	 *
 	 * @param n the connection.
 	 */
-	void visitConnection( IGridConnection n );
+	void visitConnection( @Nonnull IGridConnection n );
 }
@@ -24,12 +24,14 @@
 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
@@ -39,7 +41,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.
 	 *
@@ -47,18 +49,20 @@ public interface IGridHelper
 	 *
 	 * @return grid node of block
 	 */
-	IGridNode createGridNode( IGridBlock block );
+	@Nonnull
+	IGridNode createGridNode( @Nonnull 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
 	 */
-	IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnectionException;
+	@Nonnull
+	IGridConnection createGridConnection( @Nonnull IGridNode a, @Nonnull IGridNode b ) throws FailedConnectionException;

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


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

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

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

 	/**
 	 * break this host, its violating security rules, just break your block, or part.
@@ -26,6 +26,8 @@ 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
@@ -40,5 +42,6 @@ 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,6 +26,8 @@ package appeng.api.networking;

 import java.util.EnumSet;

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

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

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

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

 	/**
@@ -86,11 +90,13 @@ 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();

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

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

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

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

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

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


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


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

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


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


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


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


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

@@ -32,5 +35,5 @@ public interface ICraftingCallback
 	 *
 	 * @param job - final job
 	 */
-	void calculationComplete( ICraftingJob job );
+	void calculationComplete( @Nonnull ICraftingJob job );
 }
@@ -99,9 +99,18 @@ public interface ICraftingGrid extends IGridCache
 	/**
 	 * is this item being crafted?
 	 *
-	 * @param aeStackInSlot item being crafted
+	 * @param what item being crafted
 	 *
 	 * @return true if it is being crafting
 	 */
-	boolean isRequesting( IAEItemStack aeStackInSlot );
+	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 );
 }
@@ -31,6 +31,9 @@ import net.minecraft.world.World;
 import appeng.api.implementations.ICraftingPatternItem;
 import appeng.api.storage.data.IAEItemStack;

+import java.util.Collections;
+import java.util.List;
+

 /**
 * do not implement provided by {@link ICraftingPatternItem}
@@ -84,6 +87,11 @@ public interface ICraftingPatternDetails
 	 */
 	boolean canSubstitute();

+	default List<IAEItemStack> getSubstituteInputs( int slot )
+	{
+		return Collections.emptyList();
+	}
+
 	/**
 	 * Allow using this INSTANCE of the pattern details to preform the crafting action with performance enhancements.
 	 *
@@ -24,6 +24,8 @@
 package appeng.api.networking.energy;


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

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

 	/**
 	 * @return the current maximum power ( this can change :P )
@@ -67,5 +69,6 @@ public interface IAEPowerStorage extends IEnergySource
 	 *
 	 * @return access restriction what the network can do
 	 */
+	@Nonnull
 	AccessRestriction getPowerFlow();
 }
@@ -24,6 +24,9 @@
 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;
@@ -38,17 +41,20 @@ 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();

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

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

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

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


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

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


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

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

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


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

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

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


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


@@ -39,6 +41,7 @@ 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,6 +24,8 @@
 package appeng.api.networking.security;


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


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


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

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

 	/**
 	 * Check if a player has permissions.
@@ -56,7 +59,7 @@ public interface ISecurityGrid extends IGridCache
 	 *
 	 * @return true if the player has permissions.
 	 */
-	boolean hasPermission( int playerID, SecurityPermissions perm );
+	boolean hasPermission( @Nonnegative int playerID, @Nonnull 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.HashMap;
+import java.util.Map;

 import appeng.api.config.SecurityPermissions;

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

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

 import java.util.EnumSet;

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


@@ -41,5 +43,5 @@ public interface ISecurityRegistry
 	 * @param playerID player id
 	 * @param permissions permissions of player
 	 */
-	void addPlayer( int playerID, EnumSet<SecurityPermissions> permissions );
+	void addPlayer( int playerID, @Nonnull EnumSet<SecurityPermissions> permissions );
 }
@@ -44,10 +44,7 @@ public interface IStackWatcherHost
 	/**
 	 * Called when a watched item changes amounts.
 	 *
-	 * @param o changed item list
-	 * @param fullStack old stack
 	 * @param diffStack new stack
-	 * @param src action source
 	 * @param chan storage channel
 	 */
 	void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan );
@@ -51,6 +51,7 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable
 	 * @param input injected items
 	 */
 	void postAlterationOfStoredItems( IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src );
+	void postCraftablesChanges( IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src);

 	/**
 	 * Used to add a cell provider to the storage system
@@ -24,6 +24,8 @@
 package appeng.api.networking.ticking;


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


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

 	/**
-	 * 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.
+	 * 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 null or a valid new TickingRequest
+	 * @return a valid new TickingRequest
 	 */
-	TickingRequest getTickingRequest( IGridNode node );
+	@Nonnull
+	TickingRequest getTickingRequest( @Nonnull IGridNode node );

 	/**
 	 * AE lets you adjust your tick rate based on the results of your tick, if
@@ -67,11 +69,12 @@ 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.
 	 */
-	TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall );
+	@Nonnull
+	TickRateModulation tickingRequest( @Nonnull IGridNode node, int ticksSinceLastCall );
 }
@@ -24,6 +24,8 @@
 package appeng.api.networking.ticking;


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

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

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

 	/**
 	 * enables ticking for your device, undoes a sleepDevice call.
@@ -60,5 +62,5 @@ public interface ITickManager extends IGridCache
 	 *
 	 * @return if the call was successful.
 	 */
-	boolean wakeDevice( IGridNode node );
+	boolean wakeDevice( @Nonnull IGridNode node );
 }
@@ -1,3 +1,4 @@
+
 /*
 * The MIT License (MIT)
 *
@@ -209,6 +209,7 @@ 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.
@@ -219,12 +220,41 @@ 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.
@@ -261,6 +291,9 @@ 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
 	 *
@@ -325,4 +358,14 @@ public interface IPart extends IBoxProvider, ICustomCableConnection
 		return null;
 	}

-}
+	/**
+	 * Flag to be passed to the renderer.
+	 * 
+	 * @return flag or null
+	 */
+	default Long getRenderFlag()
+	{
+		return null;
+	}
+
+}
@@ -0,0 +1,15 @@
+
+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,6 +23,7 @@

 package appeng.api.parts;

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

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

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

 import javax.annotation.Nonnull;

+
@Deprecated
 public interface IRecipeLoader
 {
@@ -0,0 +1,47 @@
+
+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,10 +24,8 @@
 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;


@@ -52,26 +50,12 @@ 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.
+	 * note, this value can be null. If provided, the host is responsible for persisting the cell content.
 	 * @param channel the storage channel requested.
 	 *
 	 * @return a new IMEHandler for the provided item
 	 */
-	<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 );
+	<T extends IAEStack<T>> ICellInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> channel );

 	/**
 	 * 0 - cell is missing.
@@ -87,10 +71,31 @@ public interface ICellHandler
 	 *
 	 * @return get the status of the cell based on its contents.
 	 */
-	<T extends IAEStack<T>> int getStatusForCell( ItemStack is, IMEInventory<T> handler );
+	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;
+	}

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

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


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

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

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

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

 	/**
-	 * @return the status number for this drive.
+	 * 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.
 	 */
 	int getStatusForCell();
+
+	/**
+	 * Tells the cell to persist to NBT
+	 */
+	void persist();
 }
@@ -24,17 +24,22 @@
 package appeng.api.storage;


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


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

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

 	boolean isPreformatted();

@@ -24,7 +24,11 @@
 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;
@@ -42,9 +46,19 @@ 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( ICellHandler handler );
+	void addCellHandler( @Nonnull ICellHandler handler );
+
+	/**
+	 * Register a new handler
+	 * 
+	 * @param handler cell gui handler
+	 */
+	void addCellGuiHandler( @Nonnull ICellGuiHandler handler );

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

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

 	/**
-	 * returns an IMEInventoryHandler for the provided item.
+	 * 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.
 	 *
 	 * @param is item with inventory handler
-	 * @param host can be null, or the hosting tile / part.
+	 * @param host can be null. If provided, the host is responsible for persisting the cell content.
 	 * @param chan the storage channel to request the handler for.
 	 *
-	 * @return new IMEInventoryHandler, or null if there isn't one.
+	 * @return new ICellInventoryHandler, or null if there isn't one.
 	 */
-	<T extends IAEStack<T>> IMEInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> chan );
+	@Nullable
+	<T extends IAEStack<T>> ICellInventoryHandler<T> getCellInventory( ItemStack is, ISaveProvider host, IStorageChannel<T> chan );
 }
@@ -24,8 +24,19 @@
 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
 {
-
-	void saveChanges( IMEInventory<?> cellInventory );
+	/**
+	 * Cell has changed and needs to be changed.
+	 * 
+	 * @param cellInventory can be null for custom cells.
+	 */
+	void saveChanges( @Nullable ICellInventory<?> cellInventory );
 }
@@ -32,10 +32,9 @@ 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;

@@ -56,6 +55,17 @@ 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.
 	 * 
@@ -68,9 +78,12 @@ 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} into the corresponding {@link IAEItemStack}.
+	 * But the general intention is about converting an {@link ItemStack} or {@link FluidStack} into the corresponding
+	 * {@link IAEStack}.
 	 * 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
@@ -88,29 +101,11 @@ public interface IStorageChannel<T extends IAEStack<T>>
 	T readFromPacket( @Nonnull ByteBuf input ) throws IOException;

 	/**
-	 * 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.
+	 * create from nbt data
+	 * 
+	 * @param nbt
+	 * @return
 	 */
 	@Nullable
-	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 );
-
+	T createFromNBT( @Nonnull NBTTagCompound nbt );
 }
@@ -28,10 +28,15 @@ 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;
@@ -90,4 +95,38 @@ 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,4 +112,13 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 * @return definition stack
 	 */
 	ItemStack getDefinition();
+
+	/**
+	 * Compare this AE item stack to another item stack, but ignores
+	 * the amount. It checks the item type, NBT and damage values.
+	 *
+	 * @param is An item stack
+	 */
+	boolean equals(ItemStack is);
+
 }
@@ -149,16 +149,14 @@ public interface IAEStack<T extends IAEStack<T>>
 	boolean equals( Object obj );

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

 	/**
 	 * Slower for disk saving, but smaller/more efficient for packets.
@@ -200,7 +198,7 @@ public interface IAEStack<T extends IAEStack<T>>

 	/**
 	 * Returns itemstack for display and similar purposes. Always has a count of 1.
-	 * 
+	 *
 	 * @return itemstack
 	 */
 	ItemStack asItemStackRepresentation();
@@ -0,0 +1,42 @@
+/*
+ * 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,
+	NONE( AECableVariant.NONE, AECableSize.NONE ),

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

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

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

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

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

 	public static final AECableType[] VALIDCABLES = {
 			GLASS,
@@ -64,4 +64,97 @@ 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;
+	}
 }
@@ -0,0 +1,43 @@
+/*
+ * 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,25 +74,30 @@ 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;
@@ -141,7 +146,8 @@ 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;
@@ -0,0 +1,21 @@
+
+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,8 +23,10 @@

 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.
 */
@@ -0,0 +1,143 @@
+package com.jaquadro.minecraft.storagedrawers.api.capabilities;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+
+import javax.annotation.Nonnull;
+import java.util.function.Predicate;
+
+/**
+ * An interface for treating an inventory as a slotless, central repository of items.
+ *
+ * For all operations that accept a predicate, if a predicate is supplied, a stored ItemStack must pass the predicate
+ * in order to be considered for the given operation.
+ *
+ * An IItemRepository implementation MAY relax or eliminate its own internal tests when a predicate is supplied.  If
+ * the predicate is derived from DefaultPredicate, then the implementation MUST apply any tests it would have applied
+ * had no predicate been provided at all, in addition to testing the predicate itself.
+ */
+public interface IItemRepository
+{
+    /**
+     * Gets a list of all items in the inventory.  The same item may appear multiple times with varying counts.
+
+     * @return A list of zero or more items in the inventory.
+     */
+    @Nonnull
+    NonNullList<ItemRecord> getAllItems ();
+
+    /**
+     * Inserts an ItemStack into the inventory and returns the remainder.
+     *
+     * @param stack     ItemStack to insert.
+     * @param simulate  If true, the insertion is only simulated
+     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
+     * @return The remaining ItemStack that was not inserted.  If the entire stack was accepted, returns
+     * ItemStack.EMPTY instead.
+     */
+    @Nonnull
+    ItemStack insertItem (@Nonnull ItemStack stack, boolean simulate, Predicate<ItemStack> predicate);
+
+    @Nonnull
+    default ItemStack insertItem (@Nonnull ItemStack stack, boolean simulate) {
+        return insertItem(stack, simulate, null);
+    }
+
+    /**
+     * Tries to extract the given ItemStack from the inventory.  The returned value will be a matching ItemStack
+     * with a stack size equal to or less than amount, or the empty ItemStack if the item could not be found at all.
+     * The returned stack size may exceed the ItemStack's getMaxStackSize() value.
+
+     * @param stack     The item to extract.  The stack size is ignored.
+     * @param amount    Amount to extract (may be greater than the stacks max limit)
+     * @param simulate  If true, the extraction is only simulated
+     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
+     * @return ItemStack extracted from the inventory, or ItemStack.EMPTY if nothing could be extracted.
+     */
+    @Nonnull
+    ItemStack extractItem (@Nonnull ItemStack stack, int amount, boolean simulate, Predicate<ItemStack> predicate);
+
+    @Nonnull
+    default ItemStack extractItem (@Nonnull ItemStack stack, int amount, boolean simulate) {
+        return extractItem(stack, amount, simulate, null);
+    }
+
+    /**
+     * Gets the number of items matching the given ItemStack stored by the inventory.
+
+     * @param stack     ItemStack to query.
+     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
+     * @return The number of stored matching items.  A value of Integer.MAX_VALUE may indicate an infinite item source.
+     */
+    default int getStoredItemCount (@Nonnull ItemStack stack, Predicate<ItemStack> predicate) {
+        ItemStack amount = extractItem(stack, Integer.MAX_VALUE, true, predicate);
+        return amount.getCount();
+    }
+
+    default int getStoredItemCount (@Nonnull ItemStack stack) {
+        return getStoredItemCount(stack, null);
+    }
+
+    /**
+     * Gets the number items matching the given ItemStack that additionally still be stored by the inventory.
+     * Remaining capacity may include space that is internally empty or unassigned to any given item.
+     *
+     * @param stack     ItemStack to query.
+     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
+     * @return The available remaining space for matching items.
+     */
+    default int getRemainingItemCapacity (@Nonnull ItemStack stack, Predicate<ItemStack> predicate) {
+        stack = stack.copy();
+        stack.setCount(Integer.MAX_VALUE);
+        ItemStack remainder = insertItem(stack, true, predicate);
+        return Integer.MAX_VALUE - remainder.getCount();
+    }
+
+    default int getRemainingItemCapacity (@Nonnull ItemStack stack) {
+        return getRemainingItemCapacity(stack, null);
+    }
+
+    /**
+     * Gets the total inventory capacity for items matching the given ItemStack.
+     * Total capacity may include space that is internally empty or unassigned to any given item.
+     *
+     * @param stack     ItemStack to query.
+     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
+     * @return The total capacity for matching items.
+     */
+    default int getItemCapacity (@Nonnull ItemStack stack, Predicate<ItemStack> predicate) {
+        long capacity = getStoredItemCount(stack, predicate) + getRemainingItemCapacity(stack, predicate);
+        if (capacity > Integer.MAX_VALUE)
+            return Integer.MAX_VALUE;
+        return (int)capacity;
+    }
+
+    default int getItemCapacity (@Nonnull ItemStack stack) {
+        return getItemCapacity(stack, null);
+    }
+
+    /**
+     * An item record representing an item and the amount stored.
+     *
+     * The ItemStack held by itemPrototype always reports a stack size of 1.
+     * IT IS IMPORTANT THAT YOU NEVER MODIFY itemPrototype.
+     */
+    class ItemRecord
+    {
+        @Nonnull
+        public final ItemStack itemPrototype;
+        public final int count;
+
+        public ItemRecord (@Nonnull ItemStack itemPrototype, int count) {
+            this.itemPrototype = itemPrototype;
+            this.count = count;
+        }
+    }
+
+    /**
+     * A variant of the standard Predicate interface that when passed to IItemRepository functions, will ask the
+     * internal default predicate to be tested in addition to the custom predicate.  An IItemRepository function
+     * may choose to enforce its own predicate regardless.
+     */
+    interface DefaultPredicate<T> extends Predicate<T> { }
+}
@@ -0,0 +1,87 @@
+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,15 +56,18 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
 		double internalCurrentPower = 0;
 		final double internalMaxPower = this.getMaxEnergyCapacity();

-		if( tag != null )
+		if( internalMaxPower > 0 )
 		{
-			internalCurrentPower = tag.getDouble( "internalCurrentPower" );
+			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 ) );
 		}
-
-		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.TRANSLUCENT;
+		return layer == BlockRenderLayer.CUTOUT || 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) world, pos, up.getOpposite() ) )
+		if( !this.canPlaceAt( world, pos, up.getOpposite() ) )
 		{
-			this.dropTorch( (World) world, pos );
+			this.dropTorch( world, pos );
 		}
 	}

@@ -37,17 +37,13 @@ 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;

@@ -67,9 +63,6 @@ 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,6 +49,7 @@ 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;
@@ -60,17 +61,22 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

-import appeng.api.AEApi;
+import appeng.api.parts.IFacadeContainer;
+import appeng.api.parts.IFacadePart;
 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;
@@ -80,7 +86,7 @@ import appeng.tile.networking.TileCableBusTESR;
 import appeng.util.Platform;


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

 	public static final UnlistedProperty<CableBusRenderState> RENDER_STATE_PROPERTY = new UnlistedProperty<>( "cable_bus_render_state", CableBusRenderState.class );
@@ -119,6 +125,8 @@ public class BlockCableBus extends AEBaseTileBlock
 	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 );
 	}

@@ -314,13 +322,14 @@ public class BlockCableBus extends AEBaseTileBlock
 					for( int l = 0; l < 4; ++l )
 					{
 						// Randomly select one of the textures if the cable bus has more than just one possibility here
-						TextureAtlasSprite texture = Platform.pickRandom( textures );
+						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 );

-						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 );
 					}
@@ -353,6 +362,45 @@ public class BlockCableBus extends AEBaseTileBlock
 		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 )
 	{
@@ -408,14 +456,25 @@ public class BlockCableBus extends AEBaseTileBlock
 	@Override
 	public boolean canRenderInLayer( IBlockState state, BlockRenderLayer layer )
 	{
-		if( AEApi.instance().partHelper().getCableRenderMode().transparentFacades )
+		return true;
+	}
+
+	@Override
+	public IBlockState getFacadeState( IBlockAccess world, BlockPos pos, EnumFacing side )
+	{
+		if( side != null )
 		{
-			return layer == BlockRenderLayer.CUTOUT || layer == BlockRenderLayer.TRANSLUCENT;
-		}
-		else
-		{
-			return layer == BlockRenderLayer.CUTOUT;
+			IFacadeContainer container = this.fc( world, pos );
+			if( container != null )
+			{
+				IFacadePart facade = container.getFacade( AEPartLocation.fromFacing( side ) );
+				if( facade != null )
+				{
+					return facade.getBlockState();
+				}
+			}
 		}
+		return world.getBlockState( pos );
 	}

 	public static Class<? extends AEBaseTile> getNoTesrTile()
@@ -34,8 +34,6 @@ 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;
@@ -108,14 +106,7 @@ public class BlockChest extends AEBaseTileBlock
 			}
 			else
 			{
-				final ItemStack cell = tg.getCell();
-				if( !cell.isEmpty() )
-				{
-					final ICellHandler ch = AEApi.instance().registries().cell().getHandler( cell );
-
-					tg.openGui( p, ch, cell, side );
-				}
-				else
+				if( !tg.openGui( p ) )
 				{
 					p.sendMessage( PlayerMessages.ChestCannotReadStorageCell.get() );
 				}
@@ -74,13 +74,8 @@ public class BlockDrive extends AEBaseTileBlock
 	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
 	{
 		TileDrive te = this.getTileEntity( world, pos );
-		if( te == null )
-		{
-			return super.getExtendedState( state, world, pos );
-		}
-
 		IExtendedBlockState extState = (IExtendedBlockState) super.getExtendedState( state, world, pos );
-		return extState.withProperty( SLOTS_STATE, DriveSlotsState.fromChestOrDrive( te ) );
+		return extState.withProperty( SLOTS_STATE, te == null ? DriveSlotsState.createEmpty( 10 ) : DriveSlotsState.fromChestOrDrive( te ) );
 	}

 	@Override
@@ -75,4 +75,14 @@ public class DriveSlotsState
 		}
 		return new DriveSlotsState( slots );
 	}
+
+	public static DriveSlotsState createEmpty( int slotCount )
+	{
+		DriveSlotState[] slots = new DriveSlotState[slotCount];
+		for( int i = 0; i < slotCount; i++ )
+		{
+			slots[i] = DriveSlotState.EMPTY;
+		}
+		return new DriveSlotsState( slots );
+	}
 }
@@ -136,7 +136,7 @@ public class FeatureFactory

 	private <T extends IBootstrapComponent> void addBootstrapComponent( Class<? extends IBootstrapComponent> eventType, T component )
 	{
-		bootstrapComponents.computeIfAbsent( eventType, c -> new ArrayList<IBootstrapComponent>() ).add( component );
+		this.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 -> component.apply( item ) );
+		this.boostrapComponents.forEach( component -> this.factory.addBootstrapComponent( component.apply( item ) ) );

 		// Register custom dispenser behavior if requested
 		if( this.dispenserBehaviorSupplier != null )
@@ -0,0 +1,15 @@
+
+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,6 +19,7 @@
 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;
@@ -54,6 +55,8 @@ public final class Capabilities

 	public static Capability<IEnergyStorage> FORGE_ENERGY;

+	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY;
+
 	/**
 	 * Register AE2 provided capabilities.
 	 */
@@ -99,6 +102,9 @@ 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()
 	{
@@ -0,0 +1,28 @@
+
+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,27 +21,31 @@ 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.client.gui.AEBaseGui;
+import appeng.container.interfaces.IJEIGhostIngredients;
+import appeng.helpers.HighlighterHandler;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.settings.KeyBinding;
 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;
 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.TextureStitchEvent;
+import net.minecraftforge.client.event.*;
 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;
@@ -71,10 +75,14 @@ import appeng.hooks.TickHandler;
 import appeng.hooks.TickHandler.PlayerColor;
 import appeng.server.ServerHelper;
 import appeng.util.Platform;
+import org.lwjgl.input.Mouse;


 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()
@@ -85,30 +93,25 @@ 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()
 	{
-		// 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 );
-		// }
+		for( ActionKey key : ActionKey.values() )
+		{
+			final KeyBinding binding = new KeyBinding( key.getTranslationKey(), key.getDefaultKey(), KEY_CATEGORY );
+			ClientRegistry.registerKeyBinding( binding );
+			this.bindings.put( key, binding );
+		}
+	}

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

 	@Override
@@ -199,11 +202,6 @@ 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
@@ -318,6 +316,28 @@ public class ClientHelper extends ServerHelper
 		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
 	}

+	@SubscribeEvent
+	public void MouseClickEvent( final GuiScreenEvent.MouseInputEvent.Pre me )
+	{
+		final Minecraft mc = Minecraft.getMinecraft();
+		if( mc.currentScreen instanceof IJEIGhostIngredients )
+		{
+			AEBaseGui gui = ( (AEBaseGui) mc.currentScreen );
+			Object ingredient = gui.getBookmarkedIngredient();
+			if( ingredient != null )
+			{
+				if( GuiScreen.isShiftKeyDown() )
+				{
+					me.setCanceled( true );
+				}
+				else if( Mouse.isButtonDown( 0 ) )
+				{
+					me.setCanceled( true );
+				}
+			}
+		}
+	}
+
 	@SubscribeEvent
 	public void wheelEvent( final MouseEvent me )
 	{
@@ -330,29 +350,20 @@ public class ClientHelper extends ServerHelper
 		final EntityPlayer player = mc.player;
 		if( player.isSneaking() )
 		{
-			final EnumHand hand;
-			if( !player.getHeldItem( EnumHand.MAIN_HAND ).isEmpty() && player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem )
-			{
-				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 boolean mainHand = player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem;
+			final boolean offHand = player.getHeldItem( EnumHand.OFF_HAND ).getItem() instanceof IMouseWheelItem;

-			final ItemStack is = player.getHeldItem( hand );
-			try
+			if( mainHand || offHand )
 			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "Item", me.getDwheel() > 0 ? "WheelUp" : "WheelDown" ) );
-				me.setCanceled( true );
-			}
-			catch( final IOException e )
-			{
-				AELog.debug( e );
+				try
+				{
+					NetworkHandler.instance().sendToServer( new PacketValueConfig( "Item", me.getDwheel() > 0 ? "WheelUp" : "WheelDown" ) );
+					me.setCanceled( true );
+				}
+				catch( final IOException e )
+				{
+					AELog.debug( e );
+				}
 			}
 		}
 	}
@@ -363,4 +374,16 @@ 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 );
+	}
 }
@@ -19,22 +19,29 @@
 package appeng.client.gui;


+import java.awt.*;
 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.container.slot.*;
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;

+import mezz.jei.api.gui.IGhostIngredientHandler;
+import net.minecraft.client.gui.Gui;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fml.common.Optional;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -46,6 +53,8 @@ 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;
@@ -54,8 +63,11 @@ 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;
@@ -63,36 +75,57 @@ import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
 import appeng.client.render.StackSizeRenderer;
 import appeng.container.AEBaseContainer;
-import appeng.container.slot.AppEngCraftingSlot;
-import appeng.container.slot.AppEngSlot;
 import appeng.container.slot.AppEngSlot.hasCalculatedValidness;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.container.slot.SlotCraftingTerm;
-import appeng.container.slot.SlotDisabled;
-import appeng.container.slot.SlotFake;
-import appeng.container.slot.SlotInaccessible;
-import appeng.container.slot.SlotOutput;
-import appeng.container.slot.SlotPatternTerm;
-import appeng.container.slot.SlotRestrictedInput;
 import appeng.core.AELog;
 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;
+
+import static appeng.integration.modules.jei.JEIPlugin.aeGuiHandler;
+import static appeng.integration.modules.jei.JEIPlugin.runtime;


-public abstract class AEBaseGui extends GuiContainer
+@Optional.Interface( iface = "yalter.mousetweaks.api.IMTModGuiContainer2", modid = "mousetweaks" )
+public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContainer2
 {
-	private final List<InternalSlotME> meSlots = new LinkedList<>();
+	private final List<InternalSlotME> meSlots = new ArrayList<>();
 	// 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;
+	private Stopwatch lastClicked = Stopwatch.createStarted();
+	private List<IGhostIngredientHandler.Target<Object>> hoveredIngredientTargets = new ArrayList<>();
+	private Object bookmarkedIngredient;
+	private boolean isDraggingJeiGhostItem;
+
+	public void setJeiGhostItem( boolean jeiGhostItem )
+	{
+		isJeiGhostItem = jeiGhostItem;
+	}
+
+	private boolean isJeiGhostItem;
+
+	public Object getBookmarkedIngredient()
+	{
+		return bookmarkedIngredient;
+	}
+
+	public List<GuiCustomSlot> getGuiSlots()
+	{
+		return guiSlots;
+	}
+
+	protected final List<GuiCustomSlot> guiSlots = new ArrayList<>();

 	public AEBaseGui( final Container container )
 	{
@@ -146,35 +179,135 @@ public abstract class AEBaseGui extends GuiContainer
 	}

 	@Override
-	public void drawScreen( final int mouseX, final int mouseY, final float btn )
+	public void drawScreen( final int mouseX, final int mouseY, final float partialTicks )
 	{
 		super.drawDefaultBackground();
-		super.drawScreen( mouseX, mouseY, btn );
+		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();
+
 		this.renderHoveredToolTip( mouseX, mouseY );

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

-				if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
+	void bookmarkedJEIghostItem(final int mouseX, final int mouseY) {
+
+		if (!isJeiGhostItem)
+		{
+			bookmarkedIngredient = runtime.getBookmarkOverlay().getIngredientUnderMouse();
+		}
+
+		if( bookmarkedIngredient != null )
+		{
+			hoveredIngredientTargets = aeGuiHandler.getTargets( this, bookmarkedIngredient, false );
+			ItemStack dragItem = ItemStack.EMPTY;
+			if( hoveredIngredientTargets.size() > 0 )
+			{
+				if( isShiftKeyDown() && Mouse.isButtonDown( 0 ) && this.lastClicked.elapsed( TimeUnit.MILLISECONDS ) > 200 )
 				{
-					if( y < mouseY && y + tooltip.getHeight() > mouseY )
+					this.lastClicked = Stopwatch.createStarted();
+					aeGuiHandler.getTargets( this, bookmarkedIngredient, true );
+				}
+				else if( Mouse.isButtonDown( 0 ) && this.lastClicked.elapsed( TimeUnit.MILLISECONDS ) > 200 )
+				{
+					this.lastClicked = Stopwatch.createStarted();
+					if( bookmarkedIngredient instanceof ItemStack )
 					{
-						if( y < 15 )
-						{
-							y = 15;
-						}
-
-						final String msg = tooltip.getMessage();
-						if( msg != null )
-						{
-							this.drawTooltip( x + 11, y + 4, msg );
-						}
+						dragItem = ( (ItemStack) bookmarkedIngredient );
 					}
+					else if( bookmarkedIngredient instanceof FluidStack )
+					{
+						dragItem = FluidUtil.getFilledBucket( ( (FluidStack) bookmarkedIngredient ) );
+					}
+					mc.player.inventory.setItemStack( dragItem.copy() );
+					this.isJeiGhostItem = true;
+				}
+				drawTargets( mouseX, mouseY );
+			}
+		}
+	}
+	private void drawTargets(int mouseX, int mouseY) {
+		GlStateManager.disableLighting();
+		for( IGhostIngredientHandler.Target target : hoveredIngredientTargets )
+		{
+			Rectangle area = target.getArea();
+			Color color;
+			if( area.contains( mouseX, mouseY ) )
+			{
+				color = new Color( 76, 201, 25, 128 );
+			}
+			else
+			{
+				color = new Color( 19, 201, 10, 64 );
+			}
+			Gui.drawRect( area.x, area.y, area.x + area.width, area.y + area.height, color.getRGB() );
+		}
+		GlStateManager.color( 1f, 1f, 1f, 1f );
+		GlStateManager.enableDepth();
+	}
+
+	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 )
+				{
+					y = 15;
+				}
+
+				final String msg = tooltip.getMessage();
+				if( msg != null )
+				{
+					this.drawTooltip( x + 11, y + 4, msg );
 				}
 			}
 		}
@@ -236,27 +369,35 @@ public abstract class AEBaseGui extends GuiContainer
 		final List<Slot> slots = this.getInventorySlots();
 		for( final Slot slot : slots )
 		{
-			if( slot instanceof OptionalSlotFake )
+			if( slot instanceof IOptionalSlot )
 			{
-				final OptionalSlotFake fs = (OptionalSlotFake) slot;
-				if( fs.renderDisabled() )
+				final IOptionalSlot optionalSlot = (IOptionalSlot) slot;
+				if( optionalSlot.isRenderDisabled() )
 				{
-					if( fs.isSlotEnabled() )
+					final AppEngSlot aeSlot = (AppEngSlot) slot;
+					if( aeSlot.isSlotEnabled() )
 					{
-						this.drawTexturedModalRect( ox + fs.xPos - 1, oy + fs.yPos - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
+						this.drawTexturedModalRect( ox + aeSlot.xPos - 1, oy + aeSlot.yPos - 1, optionalSlot.getSourceX() - 1, optionalSlot.getSourceY() - 1,
+								18,
 								18 );
 					}
 					else
 					{
 						GlStateManager.color( 1.0F, 1.0F, 1.0F, 0.4F );
 						GlStateManager.enableBlend();
-						this.drawTexturedModalRect( ox + fs.xPos - 1, oy + fs.yPos - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
+						this.drawTexturedModalRect( ox + aeSlot.xPos - 1, oy + aeSlot.yPos - 1, optionalSlot.getSourceX() - 1, optionalSlot.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
@@ -277,6 +418,14 @@ public abstract class AEBaseGui extends GuiContainer
 			}
 		}

+		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 );
@@ -308,6 +457,43 @@ public abstract class AEBaseGui extends GuiContainer
 				}
 			}
 		}
+		else if( slot instanceof SlotDisconnected )
+		{
+			this.drag_click.add( slot );
+			if( this.drag_click.size() > 1 )
+			{
+				if( !itemstack.isEmpty() )
+				{
+					for( final Slot dr : this.drag_click )
+					{
+						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 );
@@ -320,18 +506,56 @@ public abstract class AEBaseGui extends GuiContainer
 	{
 		final EntityPlayer player = Minecraft.getMinecraft().player;

-		if( slot instanceof SlotFake )
+		if( this.isJeiGhostItem && isDraggingJeiGhostItem)
 		{
-			final InventoryAction action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
+			for( IGhostIngredientHandler.Target target : hoveredIngredientTargets )
+			{
+				Rectangle area = target.getArea();
+				final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
+				final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
+
+				if( area.contains( x, y ) )
+				{
+					target.accept( bookmarkedIngredient );
+					break;
+				}
+			}
+			this.isJeiGhostItem = false;
+			this.isDraggingJeiGhostItem = false;
+
+			ItemStack dragItem = ItemStack.EMPTY;
+			if( runtime.getBookmarkOverlay().getIngredientUnderMouse() != null )
+			{
+				bookmarkedJEIghostItem( Mouse.getX(), this.mc.displayHeight - Mouse.getY() );
+				if( bookmarkedIngredient instanceof ItemStack )
+				{
+					dragItem = ( (ItemStack) bookmarkedIngredient );
+				}
+				else if( bookmarkedIngredient instanceof FluidStack )
+				{
+					dragItem = FluidUtil.getFilledBucket( ( (FluidStack) bookmarkedIngredient ) );
+				}
+				mc.player.inventory.setItemStack( dragItem.copy() );
+				this.isJeiGhostItem = true;
+			}
+			else
+			{
+				mc.player.inventory.setItemStack( dragItem );
+			}
+		}
+
+		else if( slot instanceof SlotFake )
+		{
+			final InventoryAction action;
+			action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;

 			if( this.drag_click.size() > 1 )
 			{
 				return;
 			}

-			final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
+			PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
 			NetworkHandler.instance().sendToServer( p );
-
 			return;
 		}

@@ -401,12 +625,24 @@ public abstract class AEBaseGui extends GuiContainer

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

-			switch( clickType )
+			switch ( clickType )
 			{
 				case PICKUP: // pickup / set-down.
-					action = ( mouseButton == 1 ) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
+					if( slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty() )
+					{
+						action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
+					}
+					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 )
+					{
+						action = InventoryAction.PICKUP_OR_SET_DOWN;
+					}
 					break;
 				case QUICK_MOVE:
 					action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
@@ -439,14 +675,13 @@ public abstract class AEBaseGui extends GuiContainer
 			InventoryAction action = null;
 			IAEItemStack stack = null;

-			switch( clickType )
+			switch ( clickType )
 			{
 				case PICKUP: // pickup / set-down.
 					action = ( mouseButton == 1 ) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
 					stack = ( (SlotME) slot ).getAEStack();

-					if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack()
-							.isEmpty() )
+					if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack().isEmpty() )
 					{
 						action = InventoryAction.AUTO_CRAFT;
 					}
@@ -488,11 +723,11 @@ public abstract class AEBaseGui extends GuiContainer
 			return;
 		}

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

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

 			this.disableShiftClick = false;
 		}

+		if (clickType == ClickType.PICKUP && isJeiGhostItem && !isDraggingJeiGhostItem) {
+			this.isDraggingJeiGhostItem = true;
+			return;
+		}
+
 		super.handleMouseClick( slot, slotIdx, mouseButton, clickType );
 	}

@@ -634,6 +873,16 @@ public abstract class AEBaseGui extends GuiContainer
 				}
 			}
 		}
+		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()
@@ -715,6 +964,39 @@ public abstract class AEBaseGui extends GuiContainer

 			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
@@ -860,4 +1142,54 @@ public abstract class AEBaseGui extends GuiContainer
 	{
 		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;
+	}
+
 }
@@ -0,0 +1,144 @@
+package appeng.client.gui;
+
+import javax.annotation.Nullable;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.client.gui.implementations.*;
+import appeng.container.interfaces.IJEIGhostIngredients;
+import appeng.container.slot.SlotFake;
+import appeng.fluids.client.gui.widgets.GuiFluidSlot;
+import mezz.jei.api.gui.IAdvancedGuiHandler;
+import mezz.jei.api.gui.IGhostIngredientHandler;
+import net.minecraft.client.gui.GuiScreen;
+import org.lwjgl.input.Mouse;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>, IGhostIngredientHandler<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;
+        int guiSlotIdx;
+        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 );
+    }
+
+    @Override
+    public <I> List<Target<I>> getTargets( AEBaseGui gui, I ingredient, boolean doStart )
+    {
+        ArrayList<Target<I>> targets = new ArrayList<>();
+        if( gui instanceof IJEIGhostIngredients )
+        {
+            IJEIGhostIngredients g = (IJEIGhostIngredients) gui;
+            List<Target<?>> phantomTargets = g.getPhantomTargets( ingredient );
+            targets.addAll( (List<Target<I>>) (Object) phantomTargets );
+        }
+        if( doStart && GuiScreen.isShiftKeyDown() && Mouse.isButtonDown( 0 ) )
+        {
+            if( gui instanceof GuiUpgradeable || gui instanceof GuiPatternTerm )
+            {
+                IJEIGhostIngredients ghostGui = ( (IJEIGhostIngredients) gui );
+                for( Target<I> target : targets )
+                {
+                    if( ghostGui.getFakeSlotTargetMap().get( target ) instanceof SlotFake )
+                    {
+                        if( ( (SlotFake) ghostGui.getFakeSlotTargetMap().get( target ) ).getStack().isEmpty() )
+                        {
+                            target.accept( ingredient );
+                            break;
+                        }
+                    }
+                    else if( ghostGui.getFakeSlotTargetMap().get( target ) instanceof GuiFluidSlot )
+                    {
+                        if( ( (GuiFluidSlot) ghostGui.getFakeSlotTargetMap().get( target ) ).getFluidStack() == null )
+                        {
+                            target.accept( ingredient );
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return targets;
+    }
+
+    @Override
+    public void onComplete(){
+    }
+
+    @Override
+    public boolean shouldHighlightTargets()
+    {
+        return true;
+    }
+
+}
--- a/Show More
+++ b/Show More