Merge pull request #1 from talchas/rv6-1.12

merge talchas fixes
Safer implementation of CraftingGridCache updatePatterns coalescing
2020-10-20 14:32:48 -03:00 · 2019-12-20 19:54:14 -08:00 · 2019-12-09 22:43:55 -08:00
568 changed files with 4534 additions and 17778 deletions
@@ -1,58 +0,0 @@
-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,15 +1,34 @@
-This is a fork of AE2 i made for trying to solve issues for the [Omnifactory](https://www.curseforge.com/minecraft/modpacks/omnifactory) modpack.
+[![Travis](https://img.shields.io/travis/AppliedEnergistics/Applied-Energistics-2.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/AppliedEnergistics/Applied-Energistics-2)
+[![Latest Release](https://img.shields.io/github/release/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest%20Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)

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

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

 ## About

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

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

 * Applied Energistics 2 API
@@ -24,6 +43,198 @@ A Mod about Matter, Energy and using them to conquer the world..
 * 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 "<summary 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_-_____-__:api"
+    }
+
+or add the compile line to your existing dependencies task to your build.gradle
+
+Where the __ are filled in with the correct version criteria; AE2 is available from the default forge maven so no additional repositories are necessary.
+
+An example string would be `appeng:appliedenergistics2:rv5-stable-1:api` for the API only or `appeng:appliedenergistics2:rv5-stable-1`  for the whole mod.
+
+## Applied Energistics 2 CraftTweaker
+
+### Inscriber
+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
@@ -57,7 +57,7 @@ tasks.withType(JavaCompile) {
    options.encoding = 'UTF-8'
 }

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

@@ -1,24 +1,25 @@
 aeversion=rv6
-aechannel=stable
-aebuild=7
+aechannel=alpha
+aebuild=0
 aegroup=appeng
 aebasename=appliedenergistics2
-extended=extended_life
-extendedversion=v52b
+
 #########################################################
 # Versions                                              #
 #########################################################
 minecraft_version=1.12.2
 mcp_mappings=snapshot_20171003
-forge_version=14.23.5.2847
+forge_version=14.23.5.2768
+
 #########################################################
 # Installable                                           #
 #########################################################
 hwyla_version=1.8.26-B41_1.12.2
+
 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=4.16.1.302
+jei_version=4.13.0.219
 tesla_version=1.0.63
 ic2_version=2.8.73-ex112
 top_version=1.12-1.4.23-16
@@ -26,7 +27,7 @@ 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
-forestry_version=5.8.2.387
+
 #########################################################
 # Deployment                                            #
 #########################################################
@@ -31,12 +31,7 @@ repositories {

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

    maven {
@@ -59,7 +54,12 @@ repositories {
        url "http://maven.k-4u.nl/"
    }

-    maven { // CraftTweaker
+    maven { // Hwyla
+        name 'tehnut'
+        url "http://tehnut.info/maven"
+    }
+
+   	maven { // CraftTweaker
        name 'jared maven'
        url "http://maven.blamejared.com/"
    }
@@ -70,9 +70,9 @@ repositories {
    //}

    maven {
-        name = "CurseForge"
-        url = "https://minecraft.curseforge.com/api/maven/"
-    }
+		name = "CurseForge"
+		url = "https://minecraft.curseforge.com/api/maven/"
+	}
 }

 configurations {
@@ -80,7 +80,6 @@ configurations {
 }

 dependencies {
-    deobfCompile "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"
@@ -94,11 +93,8 @@ dependencies {
    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 "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api"
    compileOnly "team.chisel.ctm:CTM:${ctm_version}"
-    compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api"
-    deobfCompile "net.sengir.forestry:forestry_${minecraft_version}:$forestry_version"
-

    // at runtime, use the full JEI jar
    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
@@ -26,20 +26,5 @@ package appeng.api.config;

 public enum ActionItems
 {
-	WRENCH,
-	CLOSE,
-	STASH,
-	ENCODE,
-	SUBSTITUTION,
-	MULTIPLY_BY_TWO,
-	MULTIPLY_BY_THREE,
-	INCREASE_BY_ONE,
-	DIVIDE_BY_TWO,
-	DIVIDE_BY_THREE,
-	DECREASE_BY_ONE,
-	MAX_COUNT,
-	FREE_MOLECULAR_SLOT_SHORTCUT,
-	TOGGLE_SHOW_FULL_INTERFACES_ON,
-	TOGGLE_SHOW_FULL_INTERFACES_OFF,
-	HIGHLIGHT_INTERFACE
+	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
 }
@@ -28,8 +28,7 @@ public enum PowerUnits
 {
 	AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy
 	EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units
-	RF( "gui.appliedenergistics2.units.rf" ), // RF - Redstone Flux
-	GTEU( "gui.appliedenergistics2.units.gteu" ); // RF - Redstone Flux
+	RF( "gui.appliedenergistics2.units.rf" ); // RF - Redstone Flux

 	/**
 	 * unlocalized name for the power unit.
@@ -47,13 +46,14 @@ public enum PowerUnits

 	/**
 	 * do power conversion using AE's conversion rates.
-	 * <p>
+	 *
 	 * Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 );
-	 * <p>
+	 *
 	 * will normally returns 64, as it will convert the EU, to AE with AE's power settings.
 	 *
 	 * @param target target power unit
-	 * @param value  value
+	 * @param value value
+	 *
 	 * @return value converted to target units, from this units.
 	 */
 	public double convertTo( final PowerUnits target, final double value )
@@ -29,7 +29,6 @@ public enum TunnelType
 	ME, // Network Tunnel
 	IC2_POWER, // EU Tunnel
 	FE_POWER, // Forge Energy tunnel
-	GTEU_POWER, // Forge Energy tunnel
 	REDSTONE, // Redstone Tunnel
 	FLUID, // Fluid Tunnel
 	ITEM, // Item Tunnel
@@ -46,8 +46,7 @@ public enum Upgrades
 	 */
 	FUZZY( 1 ),
 	SPEED( 1 ),
-	INVERTER( 1 ),
-	PATTERN_EXPANSION(1);
+	INVERTER( 1 );

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

 	IItemDefinition cardCapacity();

-	IItemDefinition cardPatternExpansion();
-
 	IItemDefinition cardFuzzy();

 	IItemDefinition cardInverter();
@@ -58,8 +58,6 @@ public interface IParts

 	IItemDefinition storageBus();

-	IItemDefinition oreDictStorageBus();
-
 	IItemDefinition importBus();

 	IItemDefinition exportBus();
@@ -88,8 +86,6 @@ public interface IParts

 	IItemDefinition p2PTunnelFE();

-	IItemDefinition p2PTunnelGTEU();
-
 	IItemDefinition p2PTunnelLight();

 	// IItemDefinition p2PTunnelOpenComputers();
@@ -106,8 +102,6 @@ public interface IParts

 	IItemDefinition patternTerminal();

-	IItemDefinition expandedProcessingPatternTerminal();
-
 	IItemDefinition craftingTerminal();

 	IItemDefinition terminal();
@@ -31,9 +31,6 @@ 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}
@@ -87,11 +84,6 @@ 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.
 	 *
@@ -44,7 +44,10 @@ 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,7 +51,6 @@ 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
@@ -112,17 +112,4 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 * @return definition stack
 	 */
 	ItemStack getDefinition();
-
-	/**
-	 * Compare this AE item stack to another item stack, but ignores
-	 * the amount. It checks the item type, NBT and damage values.
-	 *
-	 * @param is An item stack
-	 */
-	boolean equals( ItemStack is );
-
-	ItemStack getCachedItemStack( long stackSize );
-
-	void setCachedItemStack( ItemStack is );
-
 }
@@ -1,143 +0,0 @@
-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> { }
-}
@@ -1,87 +0,0 @@
-package yalter.mousetweaks.api;
-
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-
-/**
- * This is the interface you want to implement in your GuiScreen to make it compatible with Mouse Tweaks.
- * If this interface is not enough (for example, you need a custom slot click function, or if you use a custom Container
- * which happens to be incompatible), check IMTModGuiContainer2Ex instead.
- * If you just need to disable Mouse Tweaks or the wheel tweak, see the MouseTweaksIgnore
- * or the MouseTweaksDisableWheelTweak annotations.
- */
-public interface IMTModGuiContainer2 {
-	/**
-	 * If you want to disable Mouse Tweaks in your GuiScreen, return true from this method.
-	 *
-	 * @return True if Mouse Tweaks should be disabled, false otherwise.
-	 */
-	boolean MT_isMouseTweaksDisabled();
-
-	/**
-	 * If you want to disable the Wheel Tweak in your GuiScreen, return true from this method.
-	 *
-	 * @return True if the Wheel Tweak should be disabled, false otherwise.
-	 */
-	boolean MT_isWheelTweakDisabled();
-
-	/**
-	 * Returns the Container.
-	 *
-	 * @return Container that is currently in use.
-	 */
-	Container MT_getContainer();
-
-	/**
-	 * Returns the Slot that is currently selected by the player, or null if no Slot is selected.
-	 *
-	 * @return Slot that is located under the mouse, or null if no Slot it currently under the mouse.
-	 */
-	Slot MT_getSlotUnderMouse();
-
-	/**
-	 * Return true if the given Slot behaves like the vanilla crafting output slots (inside the crafting table,
-	 * or the furnace output slot, or the anvil output slot, etc.). These slots are handled differently by Mouse Tweaks.
-	 *
-	 * @param slot the slot to check
-	 * @return True if slot is a crafting output slot.
-	 */
-	boolean MT_isCraftingOutput(Slot slot);
-
-	/**
-	 * Return true if the given Slot should be ignored by Mouse Tweaks. Examples of ignored slots are the item select
-	 * slots and the Destroy Item slot in the vanilla creative inventory.
-	 *
-	 * @param slot the slot to check
-	 * @return Tru if slot should be ignored by Mouse Tweaks.
-	 */
-	boolean MT_isIgnored(Slot slot);
-
-	/**
-	 * If your container has an RMB dragging functionality (like vanilla containers), disable it inside this method.
-	 * This method is called every frame (render tick), which is after all mouseClicked / mouseClickMove / mouseReleased
-	 * events are handled (although note these events are handled every game tick, which is far less frequent than every
-	 * render tick).<br><br>
-	 *
-	 * If true is returned from this method, Mouse Tweaks (after checking other conditions like isIgnored) will click
-	 * the slot on which the right mouse button was initially pressed (in most cases this is the slot currently under
-	 * mouse). This is needed because the vanilla RMB dragging functionality prevents the initial slot click.<br><br>
-	 *
-	 * For vanilla containers this method looks like this:
-	 * <pre>
-	 * this.ignoreMouseUp = true;
-	 *
-	 * if (this.dragSplitting) {
-	 *     if (this.dragSplittingButton == 1) {
-	 *         this.dragSplitting = false;
-	 *         return true;
-	 *     }
-	 * }
-	 *
-	 * return false;
-	 * </pre>
-	 *
-	 * @return True if Mouse Tweaks should click the slot on which the RMB was pressed.
-	 */
-	boolean MT_disableRMBDraggingFunctionality();
-}
@@ -56,7 +56,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	@Override
 	protected IProperty[] getAEStates()
 	{
-		return new IProperty[]{POWERED};
+		return new IProperty[] { POWERED };
 	}

 	@Override
@@ -108,14 +108,4 @@ public class BlockMolecularAssembler extends AEBaseTileBlock

 		return super.onBlockActivated( w, pos, state, p, hand, side, hitX, hitY, hitZ );
 	}
-
-	@Override
-	public void onNeighborChange( IBlockAccess world, BlockPos pos, BlockPos neighbor )
-	{
-		final TileMolecularAssembler tg = this.getTileEntity( world, pos );
-		if( tg != null )
-		{
-			tg.updateNeighbors( world, pos, neighbor );
-		}
-	}
 }
@@ -19,8 +19,6 @@
 package appeng.capabilities;


-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
-import gregtech.api.capability.IEnergyContainer;
 import net.darkhax.tesla.api.ITeslaConsumer;
 import net.darkhax.tesla.api.ITeslaHolder;
 import net.minecraft.nbt.NBTBase;
@@ -56,10 +54,6 @@ public final class Capabilities

 	public static Capability<IEnergyStorage> FORGE_ENERGY;

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

-	@CapabilityInject( IItemRepository.class )
-	private static void capIItemRepositoryRegistered( Capability<IItemRepository> cap )
-	{
-		ITEM_REPOSITORY_CAPABILITY = cap;
-	}
-
-	@CapabilityInject( IEnergyContainer.class )
-	private static void capIEnergyContainerRegistered( Capability<IEnergyContainer> cap )
-	{
-		if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.GTCE ) )
-		{
-			GTCE_ENERGY = cap;
-		}
-	}
-
 	// Create a storage implementation that does not do anything
 	private static <T> Capability.IStorage<T> createNullStorage()
 	{
@@ -25,11 +25,7 @@ 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.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
@@ -39,7 +35,9 @@ 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.*;
+import net.minecraftforge.client.event.MouseEvent;
+import net.minecraftforge.client.event.RenderLivingEvent;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.common.MinecraftForge;
@@ -75,7 +73,6 @@ 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
@@ -109,11 +106,6 @@ public class ClientHelper extends ServerHelper
 		}
 	}

-	@SubscribeEvent
-	public void renderWorldLastEvent( RenderWorldLastEvent event) {
-		HighlighterHandler.tick(event);
-	}
-
 	@Override
 	public World getWorld()
 	{
@@ -316,28 +308,6 @@ 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 )
 	{
@@ -19,7 +19,6 @@
 package appeng.client.gui;


-import java.awt.*;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -32,17 +31,10 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;

-import appeng.container.slot.*;
-import appeng.util.Platform;
 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;
@@ -76,7 +68,17 @@ 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.IOptionalSlot;
+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;
@@ -85,14 +87,9 @@ 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;


-@Optional.Interface( iface = "yalter.mousetweaks.api.IMTModGuiContainer2", modid = "mousetweaks" )
-public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContainer2
+public abstract class AEBaseGui extends GuiContainer
 {
 	private final List<InternalSlotME> meSlots = new ArrayList<>();
 	// drag y
@@ -104,28 +101,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	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 )
@@ -160,7 +135,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain

 		final List<Slot> slots = this.getInventorySlots();
 		final Iterator<Slot> i = slots.iterator();
-		while ( i.hasNext() )
+		while( i.hasNext() )
 		{
 			if( i.next() instanceof SlotME )
 			{
@@ -208,71 +183,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				this.drawTooltip( (ITooltip) c, mouseX, mouseY );
 			}
 		}
-		GlStateManager.enableDepth();
-		if( Platform.isModLoaded( "jei" ) )
-		{
-			bookmarkedJEIghostItem( mouseX, mouseY );
-		}
-		GlStateManager.disableDepth();
-	}
-
-	@Optional.Method( modid = "jei" )
-	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 )
-				{
-					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 )
-					{
-						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 )
@@ -384,13 +294,17 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 					final AppEngSlot aeSlot = (AppEngSlot) slot;
 					if( aeSlot.isSlotEnabled() )
 					{
-						this.drawTexturedModalRect( ox + aeSlot.xPos - 1, oy + aeSlot.yPos - 1, optionalSlot.getSourceX() - 1, optionalSlot.getSourceY() - 1, 18, 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 + aeSlot.xPos - 1, oy + aeSlot.yPos - 1, optionalSlot.getSourceX() - 1, optionalSlot.getSourceY() - 1, 18, 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 );
 					}
 				}
@@ -401,6 +315,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 		{
 			slot.drawBackground( ox, oy );
 		}
+
 	}

 	@Override
@@ -460,43 +375,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				}
 			}
 		}
-		else if( slot instanceof SlotDisconnected )
-		{
-			this.drag_click.add( slot );
-			if( this.drag_click.size() > 1 )
-			{
-				if( !itemstack.isEmpty() )
-				{
-					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 );
@@ -509,56 +387,18 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		final EntityPlayer player = Minecraft.getMinecraft().player;

-		if( this.isJeiGhostItem && isDraggingJeiGhostItem )
+		if( slot instanceof SlotFake )
 		{
-			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;
+			final InventoryAction action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;

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

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

@@ -628,24 +468,12 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain

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

-			switch ( clickType )
+			switch( clickType )
 			{
 				case PICKUP: // pickup / set-down.
-					if( slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty() )
-					{
-						action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-					}
-					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 )
-					{
-						action = InventoryAction.PICKUP_OR_SET_DOWN;
-					}
+					action = ( mouseButton == 1 ) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
 					break;
 				case QUICK_MOVE:
 					action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
@@ -678,13 +506,14 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			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;
 					}
@@ -751,7 +580,9 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				final List<Slot> slots = this.getInventorySlots();
 				for( final Slot inventorySlot : slots )
 				{
-					if( inventorySlot != null && inventorySlot.canTakeStack( this.mc.player ) && inventorySlot.getHasStack() && inventorySlot.isSameInventory( slot ) && 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, 0, ClickType.QUICK_MOVE );
 					}
@@ -762,12 +593,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			this.disableShiftClick = false;
 		}

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

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

 	protected boolean enableSpaceClicking()
@@ -1036,11 +851,27 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 							final float f1 = 0.00390625F;
 							final float f = 0.00390625F;
 							final float par6 = 16;
-							vb.pos( par1 + 0, par2 + par6, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).endVertex();
+							vb.pos( par1 + 0, par2 + par6, this.zLevel )
+									.tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 )
+									.color( 1.0f, 1.0f, 1.0f,
+											aes.getOpacityOfIcon() )
+									.endVertex();
 							final float par5 = 16;
-							vb.pos( par1 + par5, par2 + par6, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).endVertex();
-							vb.pos( par1 + par5, par2 + 0, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).endVertex();
-							vb.pos( par1 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).endVertex();
+							vb.pos( par1 + par5, par2 + par6, this.zLevel )
+									.tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 )
+									.color( 1.0f, 1.0f, 1.0f,
+											aes.getOpacityOfIcon() )
+									.endVertex();
+							vb.pos( par1 + par5, par2 + 0, this.zLevel )
+									.tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 )
+									.color( 1.0f, 1.0f, 1.0f,
+											aes.getOpacityOfIcon() )
+									.endVertex();
+							vb.pos( par1 + 0, par2 + 0, this.zLevel )
+									.tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 )
+									.color( 1.0f, 1.0f, 1.0f,
+											aes.getOpacityOfIcon() )
+									.endVertex();
 							tessellator.draw();

 						}
@@ -1054,7 +885,8 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				{
 					if( ( (AppEngSlot) s ).getIsValid() == hasCalculatedValidness.NotAvailable )
 					{
-						boolean isValid = s.isItemValid( is ) || s instanceof SlotOutput || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled || s instanceof SlotInaccessible || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected;
+						boolean isValid = s.isItemValid(
+								is ) || s instanceof SlotOutput || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled || s instanceof SlotInaccessible || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected;
 						if( isValid && s instanceof SlotRestrictedInput )
 						{
 							try
@@ -1129,54 +961,4 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		return this.meSlots;
 	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isMouseTweaksDisabled()
-	{
-		return false;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isWheelTweakDisabled()
-	{
-		return true;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public Container MT_getContainer()
-	{
-		return this.inventorySlots;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public Slot MT_getSlotUnderMouse()
-	{
-		return getSlotUnderMouse();
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isCraftingOutput( Slot slot )
-	{
-		return slot instanceof SlotOutput || slot instanceof AppEngCraftingSlot;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isIgnored( Slot slot )
-	{
-		return false;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_disableRMBDraggingFunctionality()
-	{
-		return false;
-	}
-
 }
@@ -1,144 +0,0 @@
-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 || gui instanceof GuiExpandedProcessingPatternTerm )
-            {
-                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;
-    }
-
-}
@@ -21,7 +21,6 @@ package appeng.client.gui.implementations;

 import java.io.IOException;

-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -124,12 +123,6 @@ public class GuiCraftAmount extends AEBaseGui
 			this.originalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}

-		if( target instanceof PartExpandedProcessingPatternTerminal )
-		{
-			myIcon = parts.expandedProcessingPatternTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY );
-			this.originalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
-
 		if( this.originalGui != null && !myIcon.isEmpty() )
 		{
 			this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) );
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import com.google.common.base.Joiner;

 import org.lwjgl.input.Mouse;
@@ -105,11 +104,6 @@ public class GuiCraftConfirm extends AEBaseGui
 		{
 			this.OriginalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}
-
-		if( te instanceof PartExpandedProcessingPatternTerminal )
-		{
-			this.OriginalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
 	}

 	boolean isAutoStart()
@@ -588,14 +582,4 @@ public class GuiCraftConfirm extends AEBaseGui
 			}
 		}
 	}
-
-	public List<IAEItemStack> getVisual()
-	{
-		return visual;
-	}
-
-	public int getDisplayedRows()
-	{
-		return this.rows;
-	}
 }
@@ -493,14 +493,4 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 	{
 		return ViewItems.ALL;
 	}
-
-	public List<IAEItemStack> getVisual()
-	{
-		return visual;
-	}
-
-	public int getDisplayedRows()
-	{
-		return DISPLAYED_ROWS;
-	}
 }
@@ -25,7 +25,6 @@ package appeng.client.gui.implementations;

 import java.io.IOException;

-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import org.lwjgl.input.Mouse;

 import net.minecraft.client.gui.GuiButton;
@@ -96,12 +95,6 @@ public class GuiCraftingStatus extends GuiCraftingCPU

 			this.originalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}
-
-		if( target instanceof PartExpandedProcessingPatternTerminal )
-		{
-			myIcon = parts.expandedProcessingPatternTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY );
-			this.originalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
 	}

 	@Override
@@ -1,277 +0,0 @@
-package appeng.client.gui.implementations;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.ItemSubstitution;
-import appeng.api.config.Settings;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.implementations.ContainerExpandedProcessingPatternTerm;
-import appeng.container.interfaces.IJEIGhostIngredients;
-import appeng.container.slot.AppEngSlot;
-import appeng.container.slot.SlotFake;
-import appeng.core.AELog;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.InventoryAction;
-import appeng.util.item.AEItemStack;
-import mezz.jei.api.gui.IGhostIngredientHandler;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import java.awt.Rectangle;
-import java.io.IOException;
-import java.util.*;
-
-
-public class GuiExpandedProcessingPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredients
-{
-    private static final String BACKGROUND_EXPANDED_PROCESSING_MODE = "guis/pattern_processing_expanded.png";
-
-    private static final String SUBSITUTION_DISABLE = "0";
-    private static final String SUBSITUTION_ENABLE = "1";
-
-    private static final String CRAFTMODE_CRFTING = "1";
-    private static final String CRAFTMODE_PROCESSING = "0";
-
-    private GuiTabButton tabCraftButton;
-    private GuiTabButton tabProcessButton;
-    private GuiImgButton substitutionsEnabledBtn;
-    private GuiImgButton substitutionsDisabledBtn;
-    private GuiImgButton encodeBtn;
-    private GuiImgButton clearBtn;
-    private GuiImgButton x2Btn;
-    private GuiImgButton x3Btn;
-    private GuiImgButton plusOneBtn;
-    private GuiImgButton divTwoBtn;
-    private GuiImgButton divThreeBtn;
-    private GuiImgButton minusOneBtn;
-    private GuiImgButton maxCountBtn;
-    public Map<IGhostIngredientHandler.Target<?>, Object> mapTargetSlot = new HashMap<>();
-
-    public GuiExpandedProcessingPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
-    {
-        super( inventoryPlayer, te, new ContainerExpandedProcessingPatternTerm( inventoryPlayer, te ) );
-        this.setReservedSpace( 81 );
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed( btn );
-
-        try
-        {
-
-            if( this.tabCraftButton == btn || this.tabProcessButton == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) );
-            }
-
-            if( this.encodeBtn == btn )
-            {
-                if( isShiftKeyDown() )
-                {
-                    NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "2" ) );
-                }
-                else
-                {
-                    NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
-                }
-            }
-
-            if( this.clearBtn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) );
-            }
-
-            if( this.x2Btn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByTwo", "1" ) );
-            }
-
-            if( this.x3Btn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByThree", "1" ) );
-            }
-
-            if( this.divTwoBtn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByTwo", "1" ) );
-            }
-
-            if( this.divThreeBtn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByThree", "1" ) );
-            }
-
-            if( this.plusOneBtn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.IncreaseByOne", "1" ) );
-            }
-
-            if( this.minusOneBtn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DecreaseByOne", "1" ) );
-            }
-
-            if( this.maxCountBtn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MaximizeCount", "1" ) );
-            }
-
-            if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) );
-            }
-        }
-        catch( final IOException e )
-        {
-            AELog.error( e );
-        }
-    }
-
-    @Override
-    public void initGui()
-    {
-        super.initGui();
-
-        this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.CRAFTING_TABLE ), GuiText.CraftingPattern.getLocal(), this.itemRender );
-        this.buttonList.add( this.tabCraftButton );
-
-        this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.FURNACE ), GuiText.ProcessingPattern.getLocal(), this.itemRender );
-        this.buttonList.add( this.tabProcessButton );
-
-        this.substitutionsEnabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.ENABLED );
-        this.substitutionsEnabledBtn.setHalfSize( true );
-        this.buttonList.add( this.substitutionsEnabledBtn );
-
-        this.substitutionsDisabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.DISABLED );
-        this.substitutionsDisabledBtn.setHalfSize( true );
-        this.buttonList.add( this.substitutionsDisabledBtn );
-
-        this.clearBtn = new GuiImgButton( this.guiLeft + 74, this.guiTop + this.ySize - 163, Settings.ACTIONS, ActionItems.CLOSE );
-        this.clearBtn.setHalfSize( true );
-        this.buttonList.add( this.clearBtn );
-
-        this.x3Btn = new GuiImgButton( this.guiLeft + 131, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.MULTIPLY_BY_THREE );
-        this.x3Btn.setHalfSize( true );
-        this.buttonList.add( this.x3Btn );
-
-        this.x2Btn = new GuiImgButton( this.guiLeft + 131, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.MULTIPLY_BY_TWO );
-        this.x2Btn.setHalfSize( true );
-        this.buttonList.add( this.x2Btn );
-
-        this.plusOneBtn = new GuiImgButton( this.guiLeft + 131, this.guiTop + this.ySize - 110, Settings.ACTIONS, ActionItems.INCREASE_BY_ONE );
-        this.plusOneBtn.setHalfSize( true );
-        this.buttonList.add( this.plusOneBtn );
-
-        this.divThreeBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.DIVIDE_BY_THREE );
-        this.divThreeBtn.setHalfSize( true );
-        this.buttonList.add( this.divThreeBtn );
-
-        this.divTwoBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.DIVIDE_BY_TWO );
-        this.divTwoBtn.setHalfSize( true );
-        this.buttonList.add( this.divTwoBtn );
-
-        this.minusOneBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 110, Settings.ACTIONS, ActionItems.DECREASE_BY_ONE );
-        this.minusOneBtn.setHalfSize( true );
-        this.buttonList.add( this.minusOneBtn );
-
-        //this.maxCountBtn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 108, Settings.ACTIONS, ActionItems.MAX_COUNT );
-        //this.maxCountBtn.setHalfSize( true );
-        //this.buttonList.add( this.maxCountBtn );
-
-        this.encodeBtn = new GuiImgButton( this.guiLeft + 147, this.guiTop + this.ySize - 142, Settings.ACTIONS, ActionItems.ENCODE );
-        this.buttonList.add( this.encodeBtn );
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.tabCraftButton.visible = false;
-        this.tabProcessButton.visible = true;
-        this.substitutionsEnabledBtn.visible = false;
-        this.substitutionsDisabledBtn.visible = false;
-        this.x2Btn.visible = true;
-        this.x3Btn.visible = true;
-        this.divTwoBtn.visible = true;
-        this.divThreeBtn.visible = true;
-        this.plusOneBtn.visible = true;
-        this.minusOneBtn.visible = true;
-        //this.maxCountBtn.visible = true;
-
-        super.drawFG( offsetX, offsetY, mouseX, mouseY );
-        this.fontRenderer.drawString( GuiText.PatternTerminal.getLocal(), 8, this.ySize - 96 + 2 - this.getReservedSpace(), 4210752 );
-    }
-
-    @Override
-    protected String getBackground()
-    {
-        return BACKGROUND_EXPANDED_PROCESSING_MODE;
-    }
-
-    @Override
-    protected void repositionSlot( final AppEngSlot s )
-    {
-        final int offsetPlayerSide = s.isPlayerSide() ? 5 : 3;
-
-        s.yPos = s.getY() + this.ySize - 78 - offsetPlayerSide;
-    }
-
-    @Override
-    public List<IGhostIngredientHandler.Target<?>> getPhantomTargets( Object ingredient )
-    {
-        if( !( ingredient instanceof ItemStack ) )
-        {
-            return Collections.emptyList();
-        }
-        List<IGhostIngredientHandler.Target<?>> targets = new ArrayList<>();
-        for( Slot slot : this.inventorySlots.inventorySlots )
-        {
-            if( slot instanceof SlotFake )
-            {
-                ItemStack itemStack = (ItemStack) ingredient;
-                IGhostIngredientHandler.Target<Object> target = new IGhostIngredientHandler.Target<Object>()
-                {
-                    @Override
-                    public Rectangle getArea()
-                    {
-                        return new Rectangle( getGuiLeft() + slot.xPos, getGuiTop() + slot.yPos, 16, 16 );
-                    }
-
-                    @Override
-                    public void accept( Object ingredient )
-                    {
-                        final PacketInventoryAction p;
-                        try
-                        {
-                            p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (SlotFake) slot, AEItemStack.fromItemStack( itemStack ) );
-                            NetworkHandler.instance().sendToServer( p );
-
-                        }
-                        catch( IOException e )
-                        {
-                            e.printStackTrace();
-                        }
-                    }
-                };
-                targets.add( target );
-                mapTargetSlot.putIfAbsent( target, slot );
-            }
-        }
-        return targets;
-    }
-
-    @Override
-    public Map<IGhostIngredientHandler.Target<?>, Object> getFakeSlotTargetMap()
-    {
-        return mapTargetSlot;
-    }
-}
-
@@ -50,7 +50,7 @@ public class GuiInterface extends GuiUpgradeable
 	public GuiInterface( final InventoryPlayer inventoryPlayer, final IInterfaceHost te )
 	{
 		super( new ContainerInterface( inventoryPlayer, te ) );
-		this.ySize = 256;
+		this.ySize = 211;
 	}

 	@Override
@@ -62,7 +62,8 @@ public class GuiInterface extends GuiUpgradeable
 		this.BlockMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO );
 		this.buttonList.add( this.BlockMode );

-		this.interfaceMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal.getLocal(), GuiText.InterfaceTerminalHint.getLocal() );
+		this.interfaceMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal
+				.getLocal(), GuiText.InterfaceTerminalHint.getLocal() );
 		this.buttonList.add( this.interfaceMode );
 	}

@@ -85,20 +86,13 @@ public class GuiInterface extends GuiUpgradeable
 		this.fontRenderer.drawString( GuiText.StoredItems.getLocal(), 8, 6 + 60 + 7, 4210752 );
 		this.fontRenderer.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 );

+		this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
 	}

 	@Override
 	protected String getBackground()
 	{
-		int upgrades = ( (ContainerInterface) this.cvb ).getPatternUpgrades();
-		if( upgrades == 0 )
-		{
-			return "guis/newinterface.png";
-		}
-		else
-		{
-			return "guis/newinterface" + upgrades + ".png";
-		}
+		return "guis/interface.png";
 	}

 	@Override
@@ -123,5 +117,4 @@ public class GuiInterface extends GuiUpgradeable
 			NetworkHandler.instance().sendToServer( new PacketConfigButton( this.BlockMode.getSetting(), backwards ) );
 		}
 	}
-
 }
@@ -20,23 +20,20 @@ package appeng.client.gui.implementations;


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

-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.core.worlddata.IWorldPlayerMapping;
-import appeng.helpers.DualityInterface;
-import appeng.parts.misc.PartInterface;
-import appeng.tile.inventory.AppEngInternalInventory;
-import appeng.tile.misc.TileInterface;
-import appeng.util.BlockPosUtils;
 import com.google.common.collect.HashMultimap;

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


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

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

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

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

 	private boolean refreshList = false;
-	private MEGuiTextField searchFieldOutputs;
-	private MEGuiTextField searchFieldInputs;
-	private PartInterfaceTerminal partInterfaceTerminal;
-	private GuiButton guiButtonHide;
-	private GuiButton guiButtonNextAssembler;
-	private HashMap<ClientDCInternalInv,Integer> dimHashMap = new HashMap<>();
+	private MEGuiTextField searchField;

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

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

 	@Override
@@ -105,79 +84,45 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		super.initGui();

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

-		this.searchFieldInputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 32, this.offsetX ), this.guiTop + 25, 65, 12 );
-		this.searchFieldInputs.setEnableBackgroundDrawing( false );
-		this.searchFieldInputs.setMaxStringLength( 25 );
-		this.searchFieldInputs.setTextColor( 0xFFFFFF );
-		this.searchFieldInputs.setVisible( true );
-		this.searchFieldInputs.setFocused( false );
-
-		this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 32, this.offsetX ), this.guiTop + 38, 65, 12 );
-		this.searchFieldOutputs.setEnableBackgroundDrawing( false );
-		this.searchFieldOutputs.setMaxStringLength( 25 );
-		this.searchFieldOutputs.setTextColor( 0xFFFFFF );
-		this.searchFieldOutputs.setVisible( true );
-		this.searchFieldOutputs.setFocused( true );
-
-		this.searchFieldInputs.setText( partInterfaceTerminal.in );
-		this.searchFieldOutputs.setText( partInterfaceTerminal.out );
-	}
-
-	@Override
-	public void onGuiClosed()
-	{
-		partInterfaceTerminal.saveSearchStrings( this.searchFieldInputs.getText().toLowerCase(), this.searchFieldOutputs.getText().toLowerCase() );
-		super.onGuiClosed();
+		this.searchField = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 );
+		this.searchField.setEnableBackgroundDrawing( false );
+		this.searchField.setMaxStringLength( 25 );
+		this.searchField.setTextColor( 0xFFFFFF );
+		this.searchField.setVisible( true );
+		this.searchField.setFocused( true );
 	}

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

-		final int currentScroll = this.getScrollBar().getCurrentScroll();
+		final int ex = this.getScrollBar().getCurrentScroll();

-		this.guiButtonNextAssembler = new GuiImgButton( guiLeft + 123, guiTop + 25, Settings.ACTIONS, ActionItems.FREE_MOLECULAR_SLOT_SHORTCUT );
-		this.buttonList.add( guiButtonNextAssembler );
-
-		guiButtonHide = new GuiImgButton( guiLeft + 141, guiTop + 25, Settings.ACTIONS, this.partInterfaceTerminal.onlyInterfacesWithFreeSlots ? ActionItems.TOGGLE_SHOW_FULL_INTERFACES_OFF : ActionItems.TOGGLE_SHOW_FULL_INTERFACES_ON );
-		this.buttonList.add( guiButtonHide );
-
-		this.inventorySlots.inventorySlots.removeIf( slot -> slot instanceof SlotDisconnected );
-
-		int offset = 52;
-		int linesDraw = 0;
-		for( int x = 0; x < LINES_ON_PAGE && linesDraw < LINES_ON_PAGE && currentScroll + x < this.lines.size(); x++ )
+		final Iterator<Slot> o = this.inventorySlots.inventorySlots.iterator();
+		while( o.hasNext() )
 		{
-			final Object lineObj = this.lines.get( currentScroll + x );
+			if( o.next() instanceof SlotDisconnected )
+			{
+				o.remove();
+			}
+		}
+
+		int offset = 17;
+		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
+		{
+			final Object lineObj = this.lines.get( ex + x );
 			if( lineObj instanceof ClientDCInternalInv )
 			{
 				final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
-
-				GuiButton guiButton = new GuiImgButton( guiLeft + 4, guiTop + offset, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE );
-				guiButtonHashMap.put( guiButton, inv );
-				this.buttonList.add( guiButton );
-				int extraLines = numUpgradesMap.get( inv );
-
-				for( int row = 0; row < 1 + extraLines && linesDraw < LINES_ON_PAGE ; ++row )
+				for( int z = 0; z < inv.getInventory().getSlots(); z++ )
 				{
-					for( int z = 0; z < 9 ; z++ )
-					{
-						this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z + ( row * 9 ), ( z * 18 + 22 ), offset ) );
-						if( this.matchedStacks.contains( inv.getInventory().getStackInSlot( z + ( row * 9 ) ) ) )
-						{
-							drawRect( z * 18 + 22, offset, z * 18 + 22 + 16, offset + 16, 0x2A00FF00 );
-						}
-					}
-					linesDraw++;
-					offset += 18;
+					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) );
 				}
 			}
 			else if( lineObj instanceof String )
@@ -189,130 +134,57 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					name = name + " (" + rows + ')';
 				}

-				while ( name.length() > 2 && this.fontRenderer.getStringWidth( name ) > 155 )
+				while( name.length() > 2 && this.fontRenderer.getStringWidth( name ) > 155 )
 				{
 					name = name.substring( 0, name.length() - 1 );
 				}
-				this.fontRenderer.drawString( name, this.offsetX + 2, 5 + offset, 4210752 );
-				linesDraw++;
-				offset += 18;
+
+				this.fontRenderer.drawString( name, 10, 6 + offset, 4210752 );
 			}
+			offset += 18;
 		}
-
-		if( searchFieldInputs.isMouseIn( mouseX, mouseY ) ) drawTooltip( Mouse.getEventX() * this.width / this.mc.displayWidth - offsetX, mouseY - guiTop, "Inputs OR names" );
-		else if( searchFieldOutputs.isMouseIn( mouseX, mouseY ) ) drawTooltip( Mouse.getEventX() * this.width / this.mc.displayWidth - offsetX, mouseY - guiTop, "Outputs OR names" );
-
 	}

 	@Override
 	protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
 	{
-		this.searchFieldInputs.mouseClicked( xCoord, yCoord, btn );
+		this.searchField.mouseClicked( xCoord, yCoord, btn );

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

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

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

-		int offset = 51;
+		int offset = 17;
 		final int ex = this.getScrollBar().getCurrentScroll();
-		int linesDraw = 0;
-		for( int x = 0; x < LINES_ON_PAGE && linesDraw < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
+
+		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
 		{
 			final Object lineObj = this.lines.get( ex + x );
 			if( lineObj instanceof ClientDCInternalInv )
 			{
+				final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
+
 				GlStateManager.color( 1, 1, 1, 1 );
-				final int width = 9 * 18;
-
-				int extraLines = numUpgradesMap.get( lineObj );
-
-				for( int row = 0; row < 1 + extraLines && linesDraw < LINES_ON_PAGE; ++row )
-				{
-					this.drawTexturedModalRect( offsetX + 20, offsetY + offset , 20, 173, width, 18 );
-					offset += 18;
-					linesDraw++;
-				}
-			}
-			else {
-				offset += 18;
-				linesDraw++;
+				final int width = inv.getInventory().getSlots() * 18;
+				this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 139, width, 18 );
 			}
+			offset += 18;
 		}

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

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

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

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

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

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

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

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

 			// Search if the current inventory holds a pattern containing the search term.
-			if( !found )
+			if( !found && !searchFilterLowerCase.isEmpty() )
 			{
-				int slot = 0;
 				for( final ItemStack itemStack : entry.getInventory() )
 				{
-					if (slot > 8 + numUpgradesMap.get(entry) * 9) {
+					found = this.itemStackMatchesSearchTerm( itemStack, searchFilterLowerCase );
+					if( found )
+					{
 						break;
 					}
-					if( !searchFieldInputs.isEmpty() && !searchFieldOutputs.isEmpty() ) {
-						if (this.itemStackMatchesSearchTerm(itemStack, searchFieldInputs, 0) || this.itemStackMatchesSearchTerm(itemStack, searchFieldOutputs, 1)) {
-							found = true;
-							matchedStacks.add(itemStack);
-						}
-					}
-					else if( !searchFieldInputs.isEmpty() ) {
-						if (this.itemStackMatchesSearchTerm(itemStack, searchFieldInputs, 0)) {
-							found = true;
-							matchedStacks.add(itemStack);
-						}
-					}
-					else if( !searchFieldOutputs.isEmpty() ) {
-						if (this.itemStackMatchesSearchTerm(itemStack, searchFieldOutputs, 1)) {
-							found = true;
-							matchedStacks.add(itemStack);
-						}
-					}
-					// If only Interfaces with empty slots should be shown, check that here
-					if(itemStack.isEmpty())
-						interfaceHasFreeSlots = true;
-					slot++;
 				}
 			}
+
 			// if found, filter skipped or machine name matching the search term, add it
-			if( found || (entry.getName().toLowerCase().contains( searchFieldInputs ) && entry.getName().toLowerCase().contains( searchFieldOutputs )))
+			if( found || entry.getName().toLowerCase().contains( searchFilterLowerCase ) )
 			{
-				if (!partInterfaceTerminal.onlyInterfacesWithFreeSlots)
-				{
-					this.byName.put( entry.getName(), entry );
-					cachedSearch.add( entry );
-				}
-				else if ( interfaceHasFreeSlots ){
-					this.byName.put( entry.getName(), entry );
-					cachedSearch.add( entry );
-				}
+				this.byName.put( entry.getName(), entry );
+				cachedSearch.add( entry );
 			}
 			else
 			{
@@ -490,10 +321,10 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			this.lines.addAll( clientInventories );
 		}

-		this.getScrollBar().setRange( 0, this.lines.size() - 1, 1 );
+		this.getScrollBar().setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 );
 	}

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

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

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

-			final ItemStack parsedItemStack = new ItemStack( tag.getCompoundTagAt( i ) );
+			final ItemStack parsedItemStack = new ItemStack( outTag.getCompoundTagAt( i ) );
 			if( !parsedItemStack.isEmpty() )
 			{
 				final String displayName = Platform
@@ -580,7 +404,7 @@ public class GuiInterfaceTerminal extends AEBaseGui

 		if( o == null )
 		{
-			this.byId.put( id, o = new ClientDCInternalInv( DualityInterface.NUMBER_OF_PATTERN_SLOTS, id, sortBy, string ) );
+			this.byId.put( id, o = new ClientDCInternalInv( 9, id, sortBy, string ) );
 			this.refreshList = true;
 		}

@@ -1,179 +0,0 @@
-package appeng.client.gui.implementations;
-
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.gui.widgets.MEGuiTextField;
-import appeng.container.implementations.ContainerOreDictStorageBus;
-import appeng.core.AELog;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.GuiBridge;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketConfigButton;
-import appeng.core.sync.packets.PacketSwitchGuis;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.parts.misc.PartOreDicStorageBus;
-import appeng.util.item.OreDictFilterMatcher;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import org.lwjgl.input.Mouse;
-
-import java.io.IOException;
-import java.util.regex.Pattern;
-
-
-public class GuiOreDictStorageBus extends AEBaseGui
-{
-    private final ContainerOreDictStorageBus container;
-    PartOreDicStorageBus part;
-    private GuiTabButton priority;
-    private GuiImgButton partition;
-    private GuiImgButton storageFilter;
-    private GuiImgButton rwMode;
-    private static final Pattern ORE_DICTIONARY_FILTER = Pattern.compile( "[(!]* *[0-9a-zA-Z*]* *\\)*( *[&|^]? *[(!]* *[0-9a-zA-Z*]* *\\)*)*" );
-    private MEGuiTextField searchFieldInputs;
-
-    public GuiOreDictStorageBus( final InventoryPlayer inventoryPlayer, final PartOreDicStorageBus te )
-    {
-        super( new ContainerOreDictStorageBus( inventoryPlayer, te ) );
-        this.container = (ContainerOreDictStorageBus) super.inventorySlots;
-        part = te;
-        this.ySize = 84;
-    }
-
-    @Override
-    public void initGui()
-    {
-        super.initGui();
-
-        this.searchFieldInputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + 3, this.guiTop + 22, 170, 12 );
-        this.searchFieldInputs.setEnableBackgroundDrawing( false );
-        this.searchFieldInputs.setMaxStringLength( 512 );
-        this.searchFieldInputs.setTextColor( 0xFFFFFF );
-        this.searchFieldInputs.setVisible( true );
-        this.searchFieldInputs.setFocused( false );
-        this.searchFieldInputs.setValidator( str -> ORE_DICTIONARY_FILTER.matcher( str ).matches() );
-
-        this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) );
-        this.buttonList.add( this.partition = new GuiImgButton( this.guiLeft - 18, this.guiTop + 28, Settings.ACTIONS, ActionItems.WRENCH ) );
-        this.buttonList.add( this.rwMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.ACCESS, AccessRestriction.READ_WRITE ) );
-        this.buttonList.add( this.storageFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY ) );
-
-        try
-        {
-            NetworkHandler.instance().sendToServer( new PacketValueConfig( "OreDictStorageBus.getRegex", "1" ) );
-        }
-        catch( IOException e )
-        {
-            e.printStackTrace();
-        }
-
-    }
-
-    public void fillRegex( String regex )
-    {
-        this.searchFieldInputs.setText( regex );
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn ) throws IOException
-    {
-        super.actionPerformed( btn );
-
-        final boolean backwards = Mouse.isButtonDown( 1 );
-
-        try
-        {
-            if( btn == this.priority )
-            {
-                NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) );
-            }
-            else if( btn == this.partition )
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "StorageBus.Action", "Partition" ) );
-            }
-            else if( btn == this.rwMode )
-            {
-                NetworkHandler.instance().sendToServer( new PacketConfigButton( this.rwMode.getSetting(), backwards ) );
-            }
-            else if( btn == this.storageFilter )
-            {
-                NetworkHandler.instance().sendToServer( new PacketConfigButton( this.storageFilter.getSetting(), backwards ) );
-            }
-        }
-        catch( final IOException e )
-        {
-            AELog.debug( e );
-        }
-    }
-
-    @Override
-    protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
-    {
-        boolean wasFocused = this.searchFieldInputs.isFocused();
-        this.searchFieldInputs.mouseClicked( xCoord, yCoord, btn );
-
-        if( btn == 1 && this.searchFieldInputs.isMouseIn( xCoord, yCoord ) )
-        {
-            this.searchFieldInputs.setText( "" );
-        }
-
-        if( !searchFieldInputs.isFocused() && wasFocused )
-        {
-            searchFieldInputs.setText( OreDictFilterMatcher.validateExp( searchFieldInputs.getText() ) );
-            NetworkHandler.instance().sendToServer( new PacketValueConfig( "OreDictStorageBus.save", searchFieldInputs.getText() ) );
-        }
-
-        super.mouseClicked( xCoord, yCoord, btn );
-    }
-
-    @Override
-    protected void keyTyped( final char character, final int key ) throws IOException
-    {
-        if( !this.checkHotbarKeys( key ) )
-        {
-            if( !this.searchFieldInputs.textboxKeyTyped( character, key ) )
-            {
-                super.keyTyped( character, key );
-            }
-        }
-    }
-
-    @Override
-    public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
-    {
-        this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.OreDictStorageBus.getLocal() ), 8, 6, 4210752 );
-        this.fontRenderer.drawString( this.searchFieldInputs.getText().length() + " / " + this.searchFieldInputs.getMaxStringLength(), 120, 36, 4210752 );
-        this.fontRenderer.drawString( "& = AND    " + "| = OR", 8, 36, 4210752 );
-        this.fontRenderer.drawString( "^ = XOR    " + "! = NOT", 8, 48, 4210752 );
-        this.fontRenderer.drawString( "() for priority    " + "* for wildcard", 8, 60, 4210752 );
-        this.fontRenderer.drawString( "Ex.: *Redstone*&!dustRedstone", 8, 72, 4210752 );
-
-        if( this.storageFilter != null )
-        {
-            this.storageFilter.set( container.getStorageFilter() );
-        }
-
-        if( this.rwMode != null )
-        {
-            this.rwMode.set( container.getReadWriteMode() );
-        }
-    }
-
-    @Override
-    public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
-    {
-        this.bindTexture( "guis/oredictstoragebus.png" );
-        this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 175, 85 );
-
-        if( this.searchFieldInputs != null )
-        {
-            this.searchFieldInputs.drawTextBox();
-        }
-    }
-
-}
@@ -19,21 +19,11 @@
 package appeng.client.gui.implementations;


-import java.awt.*;
 import java.io.IOException;
-import java.util.*;
-import java.util.List;

-import appeng.container.interfaces.IJEIGhostIngredients;
-import appeng.container.slot.SlotFake;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.helpers.InventoryAction;
-import appeng.util.item.AEItemStack;
-import mezz.jei.api.gui.IGhostIngredientHandler.Target;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;

 import appeng.api.config.ActionItems;
@@ -50,7 +40,7 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketValueConfig;


-public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredients
+public class GuiPatternTerm extends GuiMEMonitorable
 {

 	private static final String BACKGROUND_CRAFTING_MODE = "guis/pattern.png";
@@ -70,14 +60,6 @@ public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredi
 	private GuiImgButton substitutionsDisabledBtn;
 	private GuiImgButton encodeBtn;
 	private GuiImgButton clearBtn;
-	private GuiImgButton x2Btn;
-	private GuiImgButton x3Btn;
-	private GuiImgButton plusOneBtn;
-	private GuiImgButton divTwoBtn;
-	private GuiImgButton divThreeBtn;
-	private GuiImgButton minusOneBtn;
-	private GuiImgButton maxCountBtn;
-	public Map<Target<?>,Object> mapTargetSlot = new HashMap<>();

 	public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
 	{
@@ -103,13 +85,7 @@ public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredi

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

 			if( this.clearBtn == btn )
@@ -117,41 +93,6 @@ public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredi
 				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) );
 			}

-			if( this.x2Btn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByTwo", "1" ) );
-			}
-
-			if( this.x3Btn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByThree", "1" ) );
-			}
-
-			if( this.divTwoBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByTwo", "1" ) );
-			}
-
-			if( this.divThreeBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByThree", "1" ) );
-			}
-
-			if( this.plusOneBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.IncreaseByOne", "1" ) );
-			}
-
-			if( this.minusOneBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DecreaseByOne", "1" ) );
-			}
-
-			if( this.maxCountBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MaximizeCount", "1" ) );
-			}
-
 			if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
 			{
 				NetworkHandler.instance()
@@ -190,34 +131,6 @@ public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredi
 		this.clearBtn.setHalfSize( true );
 		this.buttonList.add( this.clearBtn );

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

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

 		super.drawFG( offsetX, offsetY, mouseX, mouseY );
@@ -285,52 +184,4 @@ public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredi

 		s.yPos = s.getY() + this.ySize - 78 - offsetPlayerSide;
 	}
-
-	@Override
-	public List<Target<?>> getPhantomTargets(Object ingredient) {
-		if (!(ingredient instanceof ItemStack )) {
-			return Collections.emptyList();
-		}
-		List<Target<?>> targets = new ArrayList<>();
-		for( Slot slot : this.inventorySlots.inventorySlots )
-		{
-			if( slot instanceof SlotFake )
-			{
-				ItemStack itemStack = (ItemStack) ingredient;
-				Target<Object> target = new Target<Object>()
-				{
-					@Override
-					public Rectangle getArea()
-					{
-						return new Rectangle( getGuiLeft() + slot.xPos, getGuiTop() + slot.yPos, 16, 16 );
-					}
-
-					@Override
-					public void accept( Object ingredient )
-					{
-						final PacketInventoryAction p;
-						try
-						{
-							p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (SlotFake) slot, AEItemStack.fromItemStack( itemStack ) );
-							NetworkHandler.instance().sendToServer( p );
-
-						}
-						catch( IOException e )
-						{
-							e.printStackTrace();
-						}
-					}
-				};
-				targets.add( target );
-				mapTargetSlot.putIfAbsent( target, slot );
-			}
-		}
-		return targets;
-	}
-
-	@Override
-	public Map<Target<?>, Object> getFakeSlotTargetMap()
-	{
-		return mapTargetSlot;
-	}
 }
@@ -19,24 +19,8 @@
 package appeng.client.gui.implementations;


-import java.awt.*;
 import java.io.IOException;
-import java.util.*;
-import java.util.List;

-import appeng.client.gui.widgets.GuiCustomSlot;
-import appeng.container.interfaces.IJEIGhostIngredients;
-import appeng.container.slot.IJEITargetSlot;
-import appeng.container.slot.SlotFake;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.fluids.client.gui.widgets.GuiFluidSlot;
-import appeng.fluids.util.AEFluidStack;
-import appeng.helpers.InventoryAction;
-import appeng.util.item.AEItemStack;
-import mezz.jei.api.gui.IGhostIngredientHandler.Target;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.*;
 import org.lwjgl.input.Mouse;

 import net.minecraft.client.gui.GuiButton;
@@ -59,9 +43,9 @@ import appeng.parts.automation.PartExportBus;
 import appeng.parts.automation.PartImportBus;


-public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients
+public class GuiUpgradeable extends AEBaseGui
 {
-	private final Map<Target<?>,Object> mapTargetSlot = new HashMap<>();
+
 	protected final ContainerUpgradeable cvb;
 	protected final IUpgradeableHost bc;

@@ -216,111 +200,4 @@ public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients
 			NetworkHandler.instance().sendToServer( new PacketConfigButton( this.schedulingMode.getSetting(), backwards ) );
 		}
 	}
-
-	@Override
-	public List<Target<?>> getPhantomTargets(Object ingredient)
-	{
-		mapTargetSlot.clear();
-
-		FluidStack fluidStack = null;
-		ItemStack itemStack = ItemStack.EMPTY;
-
-		if( ingredient instanceof ItemStack )
-		{
-			itemStack = (ItemStack) ingredient;
-			fluidStack = FluidUtil.getFluidContained( itemStack );
-		}
-		else if( ingredient instanceof FluidStack )
-		{
-			fluidStack = (FluidStack) ingredient;
-		}
-
-		if( !( ingredient instanceof ItemStack ) && !( ingredient instanceof FluidStack ) )
-			return Collections.emptyList();
-
-		List<Target<?>> targets = new ArrayList<>();
-
-		List<IJEITargetSlot> slots = new ArrayList<>();
-		if( this.inventorySlots.inventorySlots.size() > 0 )
-		{
-			for( Slot slot : this.inventorySlots.inventorySlots )
-			{
-				if( slot instanceof SlotFake && ( !itemStack.isEmpty() || this instanceof GuiCellWorkbench && fluidStack != null ) )
-				{
-					slots.add( (IJEITargetSlot) slot );
-				}
-			}
-		}
-		if( this.getGuiSlots().size() > 0 )
-		{
-			for( GuiCustomSlot slot : this.getGuiSlots() )
-			{
-				if( slot instanceof GuiFluidSlot && fluidStack != null )
-				{
-					slots.add( (IJEITargetSlot) slot );
-				}
-			}
-		}
-		for( Object slot : slots )
-		{
-			ItemStack finalItemStack = itemStack;
-			FluidStack finalFluidStack = fluidStack;
-			Target<Object> targetItem = new Target<Object>()
-			{
-				@Override
-				public Rectangle getArea()
-				{
-					if( slot instanceof SlotFake && ( (SlotFake) slot ).isSlotEnabled() )
-					{
-						return new Rectangle( getGuiLeft() + ( (SlotFake) slot ).xPos, getGuiTop() + ( (SlotFake) slot ).yPos, 16, 16 );
-					}
-					else if( slot instanceof GuiFluidSlot && ( (GuiFluidSlot) slot ).isSlotEnabled() )
-					{
-						return new Rectangle( getGuiLeft() + ( (GuiFluidSlot) slot ).xPos(), getGuiTop() + ( (GuiFluidSlot) slot ).yPos(), 16, 16 );
-					}
-					return new Rectangle();
-				}
-
-				@Override
-				public void accept( Object ingredient )
-				{
-					PacketInventoryAction p = null;
-					try
-					{
-						if( slot instanceof SlotFake && ( (SlotFake) slot ).isSlotEnabled() )
-						{
-							if( finalItemStack.isEmpty() && finalFluidStack != null )
-							{
-								p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (IJEITargetSlot) slot, AEItemStack.fromItemStack( FluidUtil.getFilledBucket( finalFluidStack ) ) );
-							}
-							else if( !finalItemStack.isEmpty() )
-							{
-								p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (IJEITargetSlot) slot, AEItemStack.fromItemStack( finalItemStack ) );
-							}
-						}
-						else
-						{
-							if( finalFluidStack == null ) return;
-							p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (IJEITargetSlot) slot, AEItemStack.fromItemStack( AEFluidStack.fromFluidStack( finalFluidStack ).asItemStackRepresentation() ) );
-						}
-						NetworkHandler.instance().sendToServer( p );
-
-					}
-					catch( IOException e )
-					{
-						e.printStackTrace();
-					}
-				}
-			};
-			targets.add( targetItem );
-			mapTargetSlot.putIfAbsent( targetItem, slot );
-		}
-		return targets;
-	}
-
-	@Override
-	public Map<Target<?>, Object> getFakeSlotTargetMap()
-	{
-		return mapTargetSlot;
-	}
 }
@@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack;

 public abstract class GuiCustomSlot extends Gui implements ITooltip
 {
-	protected final int x;
-	protected final int y;
-	protected final int id;
+	private final int x;
+	private final int y;
+	private final int id;

 	public GuiCustomSlot( final int id, final int x, final int y )
 	{
@@ -87,7 +87,6 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			this.registerApp( 16 * 10, Settings.POWER_UNITS, PowerUnits.AE, ButtonToolTips.PowerUnits, PowerUnits.AE.unlocalizedName );
 			this.registerApp( 16 * 10 + 1, Settings.POWER_UNITS, PowerUnits.EU, ButtonToolTips.PowerUnits, PowerUnits.EU.unlocalizedName );
 			this.registerApp( 16 * 10 + 4, Settings.POWER_UNITS, PowerUnits.RF, ButtonToolTips.PowerUnits, PowerUnits.RF.unlocalizedName );
-			this.registerApp( 16 * 10 + 1, Settings.POWER_UNITS, PowerUnits.GTEU, ButtonToolTips.PowerUnits, PowerUnits.EU.unlocalizedName );

 			this.registerApp( 3, Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE, ButtonToolTips.RedstoneMode, ButtonToolTips.AlwaysActive );
 			this.registerApp( 0, Settings.REDSTONE_CONTROLLED, RedstoneMode.LOW_SIGNAL, ButtonToolTips.RedstoneMode, ButtonToolTips.ActiveWithoutSignal );
@@ -109,11 +108,15 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			this.registerApp( 16 * 2 + 3, Settings.SEARCH_MODE, SearchBoxMode.AUTOSEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_Auto );
 			this.registerApp( 16 * 2 + 4, Settings.SEARCH_MODE, SearchBoxMode.MANUAL_SEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_Standard );
 			this.registerApp( 16 * 2 + 5, Settings.SEARCH_MODE, SearchBoxMode.JEI_AUTOSEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIAuto );
-			this.registerApp( 16 * 2 + 6, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIStandard );
+			this.registerApp( 16 * 2 + 6, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH, ButtonToolTips.SearchMode,
+					ButtonToolTips.SearchMode_JEIStandard );
 			this.registerApp( 16 * 2 + 7, Settings.SEARCH_MODE, SearchBoxMode.AUTOSEARCH_KEEP, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_AutoKeep );
-			this.registerApp( 16 * 2 + 8, Settings.SEARCH_MODE, SearchBoxMode.MANUAL_SEARCH_KEEP, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_StandardKeep );
-			this.registerApp( 16 * 2 + 9, Settings.SEARCH_MODE, SearchBoxMode.JEI_AUTOSEARCH_KEEP, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIAutoKeep );
-			this.registerApp( 16 * 2 + 10, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH_KEEP, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIStandardKeep );
+			this.registerApp( 16 * 2 + 8, Settings.SEARCH_MODE, SearchBoxMode.MANUAL_SEARCH_KEEP, ButtonToolTips.SearchMode,
+					ButtonToolTips.SearchMode_StandardKeep );
+			this.registerApp( 16 * 2 + 9, Settings.SEARCH_MODE, SearchBoxMode.JEI_AUTOSEARCH_KEEP, ButtonToolTips.SearchMode,
+					ButtonToolTips.SearchMode_JEIAutoKeep );
+			this.registerApp( 16 * 2 + 10, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH_KEEP, ButtonToolTips.SearchMode,
+					ButtonToolTips.SearchMode_JEIStandardKeep );

 			this.registerApp( 16 * 5 + 3, Settings.LEVEL_TYPE, LevelType.ENERGY_LEVEL, ButtonToolTips.LevelType, ButtonToolTips.LevelType_Energy );
 			this.registerApp( 16 * 4 + 3, Settings.LEVEL_TYPE, LevelType.ITEM_LEVEL, ButtonToolTips.LevelType, ButtonToolTips.LevelType_Item );
@@ -131,19 +134,6 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			this.registerApp( 6, Settings.ACTIONS, ActionItems.CLOSE, ButtonToolTips.Clear, ButtonToolTips.ClearSettings );
 			this.registerApp( 6, Settings.ACTIONS, ActionItems.STASH, ButtonToolTips.Stash, ButtonToolTips.StashDesc );

-			this.registerApp( 6 + 4 * 16, Settings.ACTIONS, ActionItems.MULTIPLY_BY_TWO, ButtonToolTips.MultiplyByTwo, ButtonToolTips.MultiplyByTwoDesc );
-			this.registerApp( 7 + 4 * 16, Settings.ACTIONS, ActionItems.MULTIPLY_BY_THREE, ButtonToolTips.MultiplyByThree, ButtonToolTips.MultiplyByThreeDesc );
-			this.registerApp( 8 + 4 * 16, Settings.ACTIONS, ActionItems.INCREASE_BY_ONE, ButtonToolTips.IncreaseByOne, ButtonToolTips.IncreaseByOneDesc );
-			this.registerApp( 9 + 4 * 16, Settings.ACTIONS, ActionItems.DIVIDE_BY_TWO, ButtonToolTips.DivideByTwo, ButtonToolTips.DivideByTwoDesc );
-			this.registerApp( 10 + 4 * 16, Settings.ACTIONS, ActionItems.DIVIDE_BY_THREE, ButtonToolTips.DivideByThree, ButtonToolTips.DivideByThreeDesc );
-			this.registerApp( 11 + 4 * 16, Settings.ACTIONS, ActionItems.DECREASE_BY_ONE, ButtonToolTips.DecreaseByOne, ButtonToolTips.DecreaseByOneDesc );
-			this.registerApp( 12 + 4 * 16, Settings.ACTIONS, ActionItems.MAX_COUNT, ButtonToolTips.MaxCount, ButtonToolTips.MaxCountDesc );
-
-			this.registerApp( 6 + 5 * 16, Settings.ACTIONS, ActionItems.FREE_MOLECULAR_SLOT_SHORTCUT, ButtonToolTips.FreeMolecularSlotShortcut, ButtonToolTips.FreeMolecularSlotShortcutDesc );
-			this.registerApp( 7 + 5 * 16, Settings.ACTIONS, ActionItems.TOGGLE_SHOW_FULL_INTERFACES_ON, ButtonToolTips.ToggleShowFullInterfaces, ButtonToolTips.ToggleShowFullInterfacesOnDesc );
-			this.registerApp( 8 + 5 * 16, Settings.ACTIONS, ActionItems.TOGGLE_SHOW_FULL_INTERFACES_OFF, ButtonToolTips.ToggleShowFullInterfaces, ButtonToolTips.ToggleShowFullInterfacesOffDesc );
-			this.registerApp( 6 + 6 * 16, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE, ButtonToolTips.HighlightInterface, "" );
-
 			this.registerApp( 8, Settings.ACTIONS, ActionItems.ENCODE, ButtonToolTips.Encode, ButtonToolTips.EncodeDescription );
 			this.registerApp( 4 + 3 * 16, Settings.ACTIONS, ItemSubstitution.ENABLED, ButtonToolTips.Substitutions, ButtonToolTips.SubstitutionsDescEnabled );
 			this.registerApp( 7 + 3 * 16, Settings.ACTIONS, ItemSubstitution.DISABLED, ButtonToolTips.Substitutions, ButtonToolTips.SubstitutionsDescDisabled );
@@ -171,15 +161,19 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			this.registerApp( 16 * 11 + 2, Settings.CRAFT_VIA_REDSTONE, YesNo.YES, ButtonToolTips.EmitterMode, ButtonToolTips.CraftViaRedstone );
 			this.registerApp( 16 * 11 + 1, Settings.CRAFT_VIA_REDSTONE, YesNo.NO, ButtonToolTips.EmitterMode, ButtonToolTips.EmitWhenCrafting );

-			this.registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsNo );
-			this.registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsYes );
+			this.registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems,
+					ButtonToolTips.ReportInaccessibleItemsNo );
+			this.registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems,
+					ButtonToolTips.ReportInaccessibleItemsYes );

 			this.registerApp( 16 * 14, Settings.PLACE_BLOCK, YesNo.YES, ButtonToolTips.BlockPlacement, ButtonToolTips.BlockPlacementYes );
 			this.registerApp( 16 * 14 + 1, Settings.PLACE_BLOCK, YesNo.NO, ButtonToolTips.BlockPlacement, ButtonToolTips.BlockPlacementNo );

 			this.registerApp( 16 * 15, Settings.SCHEDULING_MODE, SchedulingMode.DEFAULT, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeDefault );
-			this.registerApp( 16 * 15 + 1, Settings.SCHEDULING_MODE, SchedulingMode.ROUNDROBIN, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeRoundRobin );
-			this.registerApp( 16 * 15 + 2, Settings.SCHEDULING_MODE, SchedulingMode.RANDOM, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeRandom );
+			this.registerApp( 16 * 15 + 1, Settings.SCHEDULING_MODE, SchedulingMode.ROUNDROBIN, ButtonToolTips.SchedulingMode,
+					ButtonToolTips.SchedulingModeRoundRobin );
+			this.registerApp( 16 * 15 + 2, Settings.SCHEDULING_MODE, SchedulingMode.RANDOM, ButtonToolTips.SchedulingMode,
+					ButtonToolTips.SchedulingModeRandom );
 		}
 	}

@@ -329,7 +323,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			{
 				i = 0;
 			}
-			while ( i + 30 < sb.length() && ( i = sb.lastIndexOf( " ", i + 30 ) ) != -1 )
+			while( i + 30 < sb.length() && ( i = sb.lastIndexOf( " ", i + 30 ) ) != -1 )
 			{
 				sb.replace( i, i + 1, "\n" );
 			}
@@ -37,7 +37,7 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>

 	public ClientDCInternalInv( final int size, final long id, final long sortBy, final String unlocalizedName )
 	{
-		this.inventory = new AppEngInternalInventory( null, size, 1 );
+		this.inventory = new AppEngInternalInventory( null, size );
 		this.unlocalizedName = unlocalizedName;
 		this.id = id;
 		this.sortBy = sortBy;
@@ -1,34 +0,0 @@
-package appeng.client.render;
-
-import net.minecraft.util.math.BlockPos;
-
-// taken from McJty's McJtyLib
-public class BlockPosHighlighter
-{
-    private static BlockPos hilightedBlock;
-    private static long expireHilight;
-
-
-
-    private static int dimension;
-
-    public static void hilightBlock( BlockPos c, long expireHilight, int dimension ) {
-        hilightedBlock = c;
-        BlockPosHighlighter.expireHilight = expireHilight;
-        BlockPosHighlighter.dimension = dimension;
-    }
-
-    public static BlockPos getHilightedBlock() {
-        return hilightedBlock;
-    }
-
-    public static long getExpireHilight() {
-        return expireHilight;
-    }
-
-    public static int getDimension()
-    {
-        return dimension;
-    }
-
-}
@@ -19,21 +19,17 @@
 package appeng.client.render;


-import appeng.api.storage.data.IAEFluidStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.renderer.*;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;

 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.ReadableNumberConverter;
-import net.minecraftforge.fluids.FluidStack;
-import org.lwjgl.opengl.GL11;


 /**
@@ -123,49 +119,6 @@ public class TesrRenderHelper
 		}
 	}

-	public static void renderFluid2d( FluidStack fluidStack, float scale )
-	{
-		if( fluidStack != null )
-		{
-			GlStateManager.pushMatrix();
-			int color = fluidStack.getFluid().getColor( fluidStack );
-			float r = ( color >> 16 & 255 ) / 255.0f;
-			float g = ( color >> 8 & 255 ) / 255.0f;
-			float b = ( color & 255 ) / 255.0f;
-			TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( fluidStack.getFluid().getStill( fluidStack ).toString() );
-			GlStateManager.enableBlend();
-			GlStateManager.blendFunc( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA );
-			GlStateManager.disableAlpha();
-			GlStateManager.disableLighting();
-			Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-			Tessellator tess = Tessellator.getInstance();
-			BufferBuilder buf = tess.getBuffer();
-
-			float width = 0.4f;
-			float height = 0.4f;
-			float alpha = 1.0f;
-			float z = 0.0001f;
-			float x = -0.20f;
-			float y = -0.25f;
-
-			buf.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR );
-			double uMin = sprite.getInterpolatedU( 16D - width * 16D ), uMax = sprite.getInterpolatedU( width * 16D );
-			double vMin = sprite.getMinV(), vMax = sprite.getInterpolatedV( height * 16D );
-			buf.pos( x, y, z ).tex( uMin, vMin ).color( r, g, b, alpha ).endVertex();
-			buf.pos( x, y + height, z ).tex( uMin, vMax ).color( r, g, b, alpha ).endVertex();
-			buf.pos( x + width, y + height, z ).tex( uMax, vMax ).color( r, g, b, alpha ).endVertex();
-			buf.pos( x + width, y, z ).tex( uMax, vMin ).color( r, g, b, alpha ).endVertex();
-
-			tess.draw();
-			GlStateManager.enableLighting();
-			GlStateManager.enableAlpha();
-			GlStateManager.disableBlend();
-			GlStateManager.color( 1F, 1F, 1F, 1F );
-			GlStateManager.popMatrix();
-
-		}
-	}
-
 	/**
 	 * Render an item in 2D and the given text below it.
 	 *
@@ -190,23 +143,4 @@ public class TesrRenderHelper

 	}

-	public static void renderFluid2dWithAmount( IAEFluidStack fluidStack, float scale, float spacing )
-	{
-		final FluidStack renderStack = fluidStack.getFluidStack();
-
-		TesrRenderHelper.renderFluid2d( renderStack, scale );
-
-		final long stackSize = fluidStack.getStackSize() / 1000;
-		final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";
-
-		// Render the item count
-		final FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
-		final int width = fr.getStringWidth( renderedStackSize );
-		GlStateManager.translate( 0.0f, spacing, 0 );
-		GlStateManager.scale( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f );
-		GlStateManager.translate( -0.5f * width, 0.0f, 0.5f );
-		fr.drawString( renderedStackSize, 0, 0, 0 );
-
-	}
-
 }
@@ -19,9 +19,14 @@
 package appeng.client.render.model;


-import appeng.block.storage.BlockDrive;
-import appeng.block.storage.DriveSlotState;
-import appeng.block.storage.DriveSlotsState;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.vecmath.Matrix4f;
+import javax.vecmath.Vector3f;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -32,12 +37,9 @@ import net.minecraft.util.EnumFacing;
 import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
 import net.minecraftforge.common.property.IExtendedBlockState;

-import javax.annotation.Nullable;
-import javax.vecmath.Matrix4f;
-import javax.vecmath.Vector3f;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import appeng.block.storage.BlockDrive;
+import appeng.block.storage.DriveSlotState;
+import appeng.block.storage.DriveSlotsState;


 public class DriveBakedModel implements IBakedModel
@@ -55,17 +57,13 @@ public class DriveBakedModel implements IBakedModel
 	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
 	{

-		List<BakedQuad> result = new ArrayList<>( this.bakedBase.getQuads( state, side, rand ) );
+		List<BakedQuad> result = new ArrayList<>();
+
+		result.addAll( this.bakedBase.getQuads( state, side, rand ) );

 		if( side == null && state instanceof IExtendedBlockState )
 		{
 			IExtendedBlockState extState = (IExtendedBlockState) state;
-
-			if (!extState.getUnlistedNames().contains( BlockDrive.SLOTS_STATE ))
-			{
-				return result;
-			}
-
 			DriveSlotsState slotsState = extState.getValue( BlockDrive.SLOTS_STATE );

 			for( int row = 0; row < 5; row++ )
@@ -699,23 +699,8 @@ public abstract class AEBaseContainer extends Container
 							is.setCount( 1 );
 							s.putStack( is );
 						}
-						else
-						{
-							final ItemStack is = s.getStack().copy();
-							if (is.getCount() < is.getMaxStackSize())
-								is.grow( 1 );
-							s.putStack( is );
-						}
+
 						break;
-					case PICKUP_SINGLE:
-						if( hand.isEmpty() )
-						{
-							final ItemStack is = s.getStack().copy();
-							if (is.getCount() > 1)
-								is.shrink( 1 );
-							s.putStack( is );
-						}
-					break;
 					case SPLIT_OR_PLACE_SINGLE:

 						ItemStack is = s.getStack();
@@ -51,12 +51,6 @@ public class ContainerCraftAmount extends AEBaseContainer
 		this.addSlotToContainer( this.getCraftingItem() );
 	}

-	@Override
-	public Slot getSlot( int slotId )
-	{
-		return super.getSlot( 0 );
-	}
-
 	@Override
 	public void detectAndSendChanges()
 	{
@@ -26,7 +26,6 @@ import java.util.concurrent.Future;

 import javax.annotation.Nonnull;

-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import com.google.common.collect.ImmutableSet;

 import net.minecraft.entity.player.EntityPlayer;
@@ -150,7 +149,6 @@ public class ContainerCraftConfirm extends AEBaseContainer
 				if( ccr.getCpu() == c )
 				{
 					found = true;
-					break;
 				}
 			}

@@ -347,15 +345,11 @@ public class ContainerCraftConfirm extends AEBaseContainer
 			originalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}

-		if( ah instanceof PartExpandedProcessingPatternTerminal )
-		{
-			originalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
-
 		if( this.result != null && !this.isSimulation() )
 		{
 			final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
-			final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() );
+			final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true,
+					this.getActionSrc() );
 			this.setAutoStart( false );
 			if( g != null && originalGui != null && this.getOpenContext() != null )
 			{
@@ -159,58 +159,56 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
 	@Override
 	public void detectAndSendChanges()
 	{
-		if( Platform.isServer() && this.getMonitor() != null )
+		if( Platform.isServer() && this.getMonitor() != null && !this.list.isEmpty() )
 		{
-			if( this.getEstimatedTime() >= 0 )
+			try
 			{
-				final long elapsedTime = this.getMonitor().getElapsedTime();
-				final double remainingItems = this.getMonitor().getRemainingItemCount();
-				final double startItems = this.getMonitor().getStartItemCount();
-				final long eta = (long) ( elapsedTime / Math.max( 1d, ( startItems - remainingItems ) ) * remainingItems );
-				this.setEstimatedTime( eta );
-			}
-			if( !this.list.isEmpty() )
-			{
-				try
+				if( this.getEstimatedTime() >= 0 )
 				{
-					final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate( (byte) 0 );
-					final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 );
-					final PacketMEInventoryUpdate c = new PacketMEInventoryUpdate( (byte) 2 );
+					final long elapsedTime = this.getMonitor().getElapsedTime();
+					final double remainingItems = this.getMonitor().getRemainingItemCount();
+					final double startItems = this.getMonitor().getStartItemCount();
+					final long eta = (long) ( elapsedTime / Math.max( 1d, ( startItems - remainingItems ) ) * remainingItems );
+					this.setEstimatedTime( eta );
+				}

-					for( final IAEItemStack out : this.list )
+				final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate( (byte) 0 );
+				final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 );
+				final PacketMEInventoryUpdate c = new PacketMEInventoryUpdate( (byte) 2 );
+
+				for( final IAEItemStack out : this.list )
+				{
+					a.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.STORAGE ) );
+					b.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.ACTIVE ) );
+					c.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.PENDING ) );
+				}
+
+				this.list.resetStatus();
+
+				for( final Object g : this.listeners )
+				{
+					if( g instanceof EntityPlayer )
 					{
-						a.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.STORAGE ) );
-						b.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.ACTIVE ) );
-						c.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.PENDING ) );
-					}
-
-					this.list.resetStatus();
-
-					for( final Object g : this.listeners )
-					{
-						if( g instanceof EntityPlayer )
+						if( !a.isEmpty() )
 						{
-							if( !a.isEmpty() )
-							{
-								NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g );
-							}
+							NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g );
+						}

-							if( !b.isEmpty() )
-							{
-								NetworkHandler.instance().sendTo( b, (EntityPlayerMP) g );
-							}
+						if( !b.isEmpty() )
+						{
+							NetworkHandler.instance().sendTo( b, (EntityPlayerMP) g );
+						}

-							if( !c.isEmpty() )
-							{
-								NetworkHandler.instance().sendTo( c, (EntityPlayerMP) g );
-							}
+						if( !c.isEmpty() )
+						{
+							NetworkHandler.instance().sendTo( c, (EntityPlayerMP) g );
 						}
 					}
 				}
-				catch( final IOException e )
-				{
-					// :P
-				}
+			}
+			catch( final IOException e )
+			{
+				// :P
 			}
 		}
 		super.detectAndSendChanges();
@@ -1,528 +0,0 @@
-package appeng.container.implementations;
-
-import appeng.api.AEApi;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.storage.ITerminalHost;
-import appeng.container.slot.*;
-import appeng.helpers.IContainerCraftingPacket;
-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
-import appeng.util.Platform;
-import appeng.util.inv.IAEAppEngInventory;
-import appeng.util.inv.InvOperation;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.wrapper.PlayerInvWrapper;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static appeng.helpers.PatternHelper.PROCESSING_INPUT_LIMIT;
-import static appeng.helpers.PatternHelper.PROCESSING_OUTPUT_LIMIT;
-
-
-public class ContainerExpandedProcessingPatternTerm extends ContainerMEMonitorable implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket
-{
-    private final IItemHandler crafting;
-    private final SlotFakeCraftingMatrix[] gridSlots = new SlotFakeCraftingMatrix[PROCESSING_INPUT_LIMIT];
-    private final OptionalSlotFake[] outputSlots = new OptionalSlotFake[PROCESSING_OUTPUT_LIMIT];
-    private final SlotRestrictedInput patternSlotIN;
-    private final SlotRestrictedInput patternSlotOUT;
-    private final PartExpandedProcessingPatternTerminal expandedProcessingPatternTerminal;
-
-    public ContainerExpandedProcessingPatternTerm( InventoryPlayer ip, ITerminalHost monitorable )
-    {
-        super( ip, monitorable, false );
-
-        this.expandedProcessingPatternTerminal = (PartExpandedProcessingPatternTerminal) monitorable;
-
-        final IItemHandler patternInv = this.getExpandedPatternTerminal().getInventoryByName( "pattern" );
-        final IItemHandler output = this.getExpandedPatternTerminal().getInventoryByName( "output" );
-
-        this.crafting = this.getExpandedPatternTerminal().getInventoryByName( "crafting" );
-
-        for( int y = 0; y < 4; y++ )
-        {
-            for( int x = 0; x < 4; x++ )
-            {
-                this.addSlotToContainer( this.gridSlots[x + y * 4] = new SlotFakeCraftingMatrix( this.crafting, x + y * 4, 4 + x * 18, -85 + y * 18 ) );
-            }
-        }
-
-        for( int y = 0; y < 3; y++ )
-        {
-            for( int x = 0; x < 2; x++ )
-            {
-                this.addSlotToContainer( this.outputSlots[x + y * 2] = new SlotPatternOutputs( output, this, x + y * 2, 96 + x * 18, -76 + y * 18, 0, 0, 1 ) );
-                this.outputSlots[x + y * 2].setRenderDisabled( false );
-                this.outputSlots[x + y * 2].setIIcon( -1 );
-            }
-        }
-
-        this.addSlotToContainer( this.patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this.getInventoryPlayer() ) );
-        this.addSlotToContainer( this.patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this.getInventoryPlayer() ) );
-
-        this.patternSlotOUT.setStackLimit( 1 );
-
-        this.bindPlayerInventory( ip, 0, 0 );
-    }
-
-    @Override
-    public ItemStack transferStackInSlot( final EntityPlayer p, final int idx )
-    {
-        if( Platform.isClient() )
-        {
-            return ItemStack.EMPTY;
-        }
-        if( this.inventorySlots.get( idx ) instanceof SlotPlayerInv || this.inventorySlots.get( idx ) instanceof SlotPlayerHotBar )
-        {
-            final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots!
-            ItemStack itemStack = clickSlot.getStack();
-            if( AEApi.instance().definitions().materials().blankPattern().isSameAs( itemStack ) )
-            {
-                IItemHandler patternInv = this.getExpandedPatternTerminal().getInventoryByName( "pattern" );
-                ItemStack remainder = patternInv.insertItem( 0, itemStack, false );
-                clickSlot.putStack( remainder );
-            }
-        }
-        return super.transferStackInSlot( p, idx );
-    }
-
-    @Override
-    public void saveChanges()
-    {
-
-    }
-
-    @Override
-    public void onChangeInventory( final IItemHandler inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack )
-    {
-
-    }
-
-    public void encodeAndMoveToInventory()
-    {
-        encode();
-        ItemStack output = this.patternSlotOUT.getStack();
-        if( !output.isEmpty() )
-        {
-            if( !getPlayerInv().addItemStackToInventory( output ) )
-            {
-                getPlayerInv().player.dropItem( output, false );
-            }
-            this.patternSlotOUT.putStack( ItemStack.EMPTY );
-        }
-    }
-
-    public void encode()
-    {
-        ItemStack output = this.patternSlotOUT.getStack();
-
-        final ItemStack[] in = this.getInputs();
-        final ItemStack[] out = this.getOutputs();
-
-        // if there is no input, this would be silly.
-        if( in == null || out == null )
-        {
-            return;
-        }
-
-        // first check the output slots, should either be null, or a pattern
-        if( !output.isEmpty() && !this.isPattern( output ) )
-        {
-            return;
-        } // if nothing is there we should snag a new pattern.
-        else if( output.isEmpty() )
-        {
-            output = this.patternSlotIN.getStack();
-            if( output.isEmpty() || !this.isPattern( output ) )
-            {
-                return; // no blanks.
-            }
-
-            // remove one, and clear the input slot.
-            output.setCount( output.getCount() - 1 );
-            if( output.getCount() == 0 )
-            {
-                this.patternSlotIN.putStack( ItemStack.EMPTY );
-            }
-
-            // add a new encoded pattern.
-            Optional<ItemStack> maybePattern = AEApi.instance().definitions().items().encodedPattern().maybeStack( 1 );
-            if( maybePattern.isPresent() )
-            {
-                output = maybePattern.get();
-                this.patternSlotOUT.putStack( output );
-            }
-        }
-
-        // encode the slot.
-        final NBTTagCompound encodedValue = new NBTTagCompound();
-
-        final NBTTagList tagIn = new NBTTagList();
-        final NBTTagList tagOut = new NBTTagList();
-
-        for( final ItemStack i : in )
-        {
-            tagIn.appendTag( this.createItemTag( i ) );
-        }
-
-        for( final ItemStack i : out )
-        {
-            tagOut.appendTag( this.createItemTag( i ) );
-        }
-
-        encodedValue.setTag( "in", tagIn );
-        encodedValue.setTag( "out", tagOut );
-        encodedValue.setBoolean( "crafting", false );
-        encodedValue.setBoolean( "substitute", false );
-
-        output.setTagCompound( encodedValue );
-    }
-
-    boolean isPattern( final ItemStack output )
-    {
-        if( output.isEmpty() )
-        {
-            return false;
-        }
-
-        final IDefinitions definitions = AEApi.instance().definitions();
-
-        boolean isPattern = definitions.items().encodedPattern().isSameAs( output );
-        isPattern |= definitions.materials().blankPattern().isSameAs( output );
-
-        return isPattern;
-    }
-
-    NBTBase createItemTag( final ItemStack i )
-    {
-        final NBTTagCompound c = new NBTTagCompound();
-
-        if( !i.isEmpty() )
-        {
-            i.writeToNBT( c );
-        }
-
-        return c;
-    }
-
-    @Override
-    public boolean isSlotEnabled( final int idx )
-    {
-        return true;
-    }
-
-    protected ItemStack[] getInputs()
-    {
-        final ItemStack[] input = new ItemStack[16];
-        boolean hasValue = false;
-
-        for( int x = 0; x < this.gridSlots.length; x++ )
-        {
-            input[x] = this.gridSlots[x].getStack();
-            if( !input[x].isEmpty() )
-            {
-                hasValue = true;
-            }
-        }
-
-        if( hasValue )
-        {
-            return input;
-        }
-
-        return null;
-    }
-
-    protected ItemStack[] getOutputs()
-    {
-        final List<ItemStack> list = new ArrayList<>( 3 );
-        boolean hasValue = false;
-
-        for( final OptionalSlotFake outputSlot : this.outputSlots )
-        {
-            final ItemStack out = outputSlot.getStack();
-
-            if( !out.isEmpty() && out.getCount() > 0 )
-            {
-                list.add( out );
-                hasValue = true;
-            }
-        }
-
-        if( hasValue )
-        {
-            return list.toArray( new ItemStack[0] );
-        }
-        return null;
-    }
-
-    public void clear()
-    {
-        for( final Slot s : this.gridSlots )
-        {
-            s.putStack( ItemStack.EMPTY );
-        }
-
-        for( final Slot s : this.outputSlots )
-        {
-            s.putStack( ItemStack.EMPTY );
-        }
-
-        this.detectAndSendChanges();
-    }
-
-    @Override
-    public IItemHandler getInventoryByName( final String name )
-    {
-        if( name.equals( "player" ) )
-        {
-            return new PlayerInvWrapper( this.getInventoryPlayer() );
-        }
-        return this.getExpandedPatternTerminal().getInventoryByName( name );
-    }
-
-    @Override
-    public boolean useRealItems()
-    {
-        return false;
-    }
-
-    public PartExpandedProcessingPatternTerminal getExpandedPatternTerminal()
-    {
-        return this.expandedProcessingPatternTerminal;
-    }
-
-    public void multiply( int multiple )
-    {
-        ItemStack[] input = new ItemStack[gridSlots.length];
-        boolean canMultiplyInputs = true;
-        boolean canMultiplyOutputs = true;
-
-        for( int x = 0; x < this.gridSlots.length; x++ )
-        {
-            input[x] = this.gridSlots[x].getStack();
-            if( !input[x].isEmpty() && input[x].getCount() * multiple > input[x].getMaxStackSize() )
-            {
-                canMultiplyInputs = false;
-            }
-        }
-        for( final OptionalSlotFake outputSlot : this.outputSlots )
-        {
-            final ItemStack out = outputSlot.getStack();
-            if( !out.isEmpty() && out.getCount() * multiple > out.getMaxStackSize() )
-            {
-                canMultiplyOutputs = false;
-            }
-        }
-        if( canMultiplyInputs && canMultiplyOutputs )
-        {
-            for( SlotFakeCraftingMatrix craftingSlot : this.gridSlots )
-            {
-                ItemStack stack = craftingSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    craftingSlot.getStack().setCount( stack.getCount() * multiple );
-                }
-            }
-            for( OptionalSlotFake outputSlot : this.outputSlots )
-            {
-                ItemStack stack = outputSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    outputSlot.getStack().setCount( stack.getCount() * multiple );
-                }
-            }
-        }
-    }
-
-    public void divide( int divide )
-    {
-        ItemStack[] input = new ItemStack[gridSlots.length];
-        boolean canDivideInputs = true;
-        boolean canDivideOutputs = true;
-
-        for( int x = 0; x < this.gridSlots.length; x++ )
-        {
-            input[x] = this.gridSlots[x].getStack();
-            if( !input[x].isEmpty() && input[x].getCount() % divide != 0 )
-            {
-                canDivideInputs = false;
-            }
-        }
-        for( final OptionalSlotFake outputSlot : this.outputSlots )
-        {
-            final ItemStack out = outputSlot.getStack();
-            if( !out.isEmpty() && out.getCount() % divide != 0 )
-            {
-                canDivideOutputs = false;
-            }
-        }
-        if( canDivideInputs && canDivideOutputs )
-        {
-            for( SlotFakeCraftingMatrix craftingSlot : this.gridSlots )
-            {
-                ItemStack stack = craftingSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    craftingSlot.getStack().setCount( stack.getCount() / divide );
-                }
-            }
-            for( OptionalSlotFake outputSlot : this.outputSlots )
-            {
-                ItemStack stack = outputSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    outputSlot.getStack().setCount( stack.getCount() / divide );
-                }
-            }
-        }
-    }
-
-    public void increase( int increase )
-    {
-        ItemStack[] input = new ItemStack[gridSlots.length];
-        boolean canIncreaseInputs = true;
-        boolean canIncreaseOutputs = true;
-
-        for( int x = 0; x < this.gridSlots.length; x++ )
-        {
-            input[x] = this.gridSlots[x].getStack();
-            if( !input[x].isEmpty() && input[x].getCount() + increase > input[x].getMaxStackSize() )
-            {
-                canIncreaseInputs = false;
-            }
-        }
-        for( final OptionalSlotFake outputSlot : this.outputSlots )
-        {
-            final ItemStack out = outputSlot.getStack();
-            if( !out.isEmpty() && out.getCount() + increase > out.getMaxStackSize() )
-            {
-                canIncreaseOutputs = false;
-            }
-        }
-        if( canIncreaseInputs && canIncreaseOutputs )
-        {
-            for( SlotFakeCraftingMatrix craftingSlot : this.gridSlots )
-            {
-                ItemStack stack = craftingSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    craftingSlot.getStack().setCount( stack.getCount() + increase );
-                }
-            }
-            for( OptionalSlotFake outputSlot : this.outputSlots )
-            {
-                ItemStack stack = outputSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    outputSlot.getStack().setCount( stack.getCount() + increase );
-                }
-            }
-        }
-    }
-
-    public void decrease( int decrease )
-    {
-        ItemStack[] input = new ItemStack[gridSlots.length];
-        boolean canDecreaseInputs = true;
-        boolean canDecreaseOutputs = true;
-
-        for( int x = 0; x < this.gridSlots.length; x++ )
-        {
-            input[x] = this.gridSlots[x].getStack();
-            if( !input[x].isEmpty() && input[x].getCount() - decrease < 1 )
-            {
-                canDecreaseInputs = false;
-            }
-        }
-        for( final OptionalSlotFake outputSlot : this.outputSlots )
-        {
-            final ItemStack out = outputSlot.getStack();
-            if( !out.isEmpty() && out.getCount() - decrease < 1 )
-            {
-                canDecreaseOutputs = false;
-            }
-        }
-        if( canDecreaseInputs && canDecreaseOutputs )
-        {
-            for( SlotFakeCraftingMatrix craftingSlot : this.gridSlots )
-            {
-                ItemStack stack = craftingSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    craftingSlot.getStack().setCount( stack.getCount() - decrease );
-                }
-            }
-            for( OptionalSlotFake outputSlot : this.outputSlots )
-            {
-                ItemStack stack = outputSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    outputSlot.getStack().setCount( stack.getCount() - decrease );
-                }
-            }
-        }
-    }
-
-    public void maximizeCount()
-    {
-        ItemStack[] input = new ItemStack[gridSlots.length];
-        boolean canGrowInputs = true;
-        boolean canGrowOutputs = true;
-        int maxInputStackGrowth = 0;
-        int maxOutputStackGrowth = 0;
-
-        for( int x = 0; x < this.gridSlots.length; x++ )
-        {
-            input[x] = this.gridSlots[x].getStack();
-            if( !input[x].isEmpty() && input[x].getMaxStackSize() - input[x].getCount() > maxInputStackGrowth )
-            {
-                maxInputStackGrowth = input[x].getMaxStackSize() - input[x].getCount();
-            }
-            if( !input[x].isEmpty() && input[x].getCount() + maxInputStackGrowth > input[x].getMaxStackSize() )
-            {
-                canGrowInputs = false;
-            }
-        }
-        for( final OptionalSlotFake outputSlot : this.outputSlots )
-        {
-            final ItemStack out = outputSlot.getStack();
-            {
-                maxOutputStackGrowth = out.getMaxStackSize() - out.getCount();
-            }
-            if( !out.isEmpty() && out.getCount() + maxOutputStackGrowth > out.getMaxStackSize() )
-            {
-                canGrowOutputs = false;
-            }
-        }
-        if( canGrowInputs && canGrowOutputs )
-        {
-            int maxStackGrowth = Math.min( maxInputStackGrowth, maxOutputStackGrowth );
-            for( SlotFakeCraftingMatrix craftingSlot : this.gridSlots )
-            {
-                ItemStack stack = craftingSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    craftingSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
-                }
-            }
-            for( OptionalSlotFake outputSlot : this.outputSlots )
-            {
-                ItemStack stack = outputSlot.getStack();
-                if( !stack.isEmpty() )
-                {
-                    outputSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
-                }
-            }
-        }
-    }
-
-}
@@ -19,9 +19,6 @@
 package appeng.container.implementations;


-import appeng.api.config.Upgrades;
-import appeng.container.slot.*;
-import appeng.util.Platform;
 import net.minecraft.entity.player.InventoryPlayer;

 import appeng.api.config.SecurityPermissions;
@@ -29,11 +26,14 @@ import appeng.api.config.Settings;
 import appeng.api.config.YesNo;
 import appeng.api.util.IConfigManager;
 import appeng.container.guisync.GuiSync;
+import appeng.container.slot.SlotFake;
+import appeng.container.slot.SlotNormal;
+import appeng.container.slot.SlotRestrictedInput;
 import appeng.helpers.DualityInterface;
 import appeng.helpers.IInterfaceHost;


-public class ContainerInterface extends ContainerUpgradeable implements IOptionalSlotHost
+public class ContainerInterface extends ContainerUpgradeable
 {

 	private final DualityInterface myDuality;
@@ -44,22 +44,16 @@ public class ContainerInterface extends ContainerUpgradeable implements IOptiona
 	@GuiSync( 4 )
 	public YesNo iTermMode = YesNo.YES;

-	@GuiSync( 7 )
-	public int patternExpansions = 0;
-
 	public ContainerInterface( final InventoryPlayer ip, final IInterfaceHost te )
 	{
 		super( ip, te.getInterfaceDuality().getHost() );

 		this.myDuality = te.getInterfaceDuality();

-		for (int row = 0 ; row < 4 ; ++row)
+		for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ )
 		{
-			for( int x = 0; x < 9; x++ )
-			{
-				this.addSlotToContainer( new OptionalSlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
-						.getPatterns(), this, x + row * 9, 8 + 18 * x, 97 + ( 18 * row ), row, this.getInventoryPlayer() ).setStackLimit( 1 ) );
-			}
+			this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
+					.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ) );
 		}

 		for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ )
@@ -76,7 +70,7 @@ public class ContainerInterface extends ContainerUpgradeable implements IOptiona
 	@Override
 	protected int getHeight()
 	{
-		return 256;
+		return 211;
 	}

 	@Override
@@ -88,35 +82,16 @@ public class ContainerInterface extends ContainerUpgradeable implements IOptiona
 	@Override
 	public int availableUpgrades()
 	{
-		return 4;
-	}
-
-	@Override
-	public boolean isSlotEnabled( final int idx )
-	{
-		return myDuality.getInstalledUpgrades(Upgrades.PATTERN_EXPANSION) >= idx;
+		return 1;
 	}

 	@Override
 	public void detectAndSendChanges()
 	{
 		this.verifyPermissions( SecurityPermissions.BUILD, false );
-
-		if (patternExpansions != getPatternUpgrades())
-		{
-			patternExpansions = getPatternUpgrades();
-			this.myDuality.dropExcessPatterns();
-		}
 		super.detectAndSendChanges();
 	}

-	@Override
-	public void onUpdate( final String field, final Object oldValue, final Object newValue ) {
-		super.onUpdate(field, oldValue, newValue);
-		if ( Platform.isClient() && field.equals("patternExpansions"))
-			this.myDuality.dropExcessPatterns();
-	}
-
 	@Override
 	protected void loadSettingsFromHost( final IConfigManager cm )
 	{
@@ -143,9 +118,4 @@ public class ContainerInterface extends ContainerUpgradeable implements IOptiona
 	{
 		this.iTermMode = iTermMode;
 	}
-
-	public int getPatternUpgrades()
-	{
-		return this.myDuality.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION );
-	}
 }
@@ -24,13 +24,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;

-import appeng.api.config.Upgrades;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.config.Settings;
@@ -81,7 +78,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			this.grid = anchor.getActionableNode().getGrid();
 		}

-		this.bindPlayerInventory( ip, 14, 256 - /* height of player inventory */82 );
+		this.bindPlayerInventory( ip, 0, 222 - /* height of player inventory */82 );
 	}

 	@Override
@@ -216,48 +213,35 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			final IItemHandler theSlot = new WrapperFilteredItemHandler( new WrapperRangeItemHandler( inv.server, slot, slot + 1 ), new PatternSlotFilter() );
 			final InventoryAdaptor interfaceSlot = new AdaptorItemHandler( theSlot );

-			IItemHandler interfaceHandler = inv.server;
-			boolean canInsert = true;
-
-			switch ( action )
+			switch( action )
 			{
 				case PICKUP_OR_SET_DOWN:
+
 					if( hasItemInHand )
 					{
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
+						ItemStack inSlot = theSlot.getStackInSlot( 0 );
+						if( inSlot.isEmpty() )
 						{
-							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
-							{
-								canInsert = false;
-								break;
-							}
+							player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
 						}
-						if( canInsert )
+						else
 						{
-							ItemStack inSlot = theSlot.getStackInSlot( 0 );
-							if( inSlot.isEmpty() )
+							inSlot = inSlot.copy();
+							final ItemStack inHand = player.inventory.getItemStack().copy();
+
+							ItemHandlerUtil.setStackInSlot( theSlot, 0, ItemStack.EMPTY );
+							player.inventory.setItemStack( ItemStack.EMPTY );
+
+							player.inventory.setItemStack( interfaceSlot.addItems( inHand.copy() ) );
+
+							if( player.inventory.getItemStack().isEmpty() )
 							{
-								player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
+								player.inventory.setItemStack( inSlot );
 							}
 							else
 							{
-								inSlot = inSlot.copy();
-								final ItemStack inHand = player.inventory.getItemStack().copy();
-
-								ItemHandlerUtil.setStackInSlot( theSlot, 0, ItemStack.EMPTY );
-								player.inventory.setItemStack( ItemStack.EMPTY );
-
-								player.inventory.setItemStack( interfaceSlot.addItems( inHand.copy() ) );
-
-								if( player.inventory.getItemStack().isEmpty() )
-								{
-									player.inventory.setItemStack( inSlot );
-								}
-								else
-								{
-									player.inventory.setItemStack( inHand );
-									ItemHandlerUtil.setStackInSlot( theSlot, 0, inSlot );
-								}
+								player.inventory.setItemStack( inHand );
+								ItemHandlerUtil.setStackInSlot( theSlot, 0, inSlot );
 							}
 						}
 					}
@@ -268,27 +252,17 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer

 					break;
 				case SPLIT_OR_PLACE_SINGLE:
+
 					if( hasItemInHand )
 					{
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
+						ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
+						if( !extra.isEmpty() )
 						{
-							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
-							{
-								canInsert = false;
-								break;
-							}
+							extra = interfaceSlot.addItems( extra );
 						}
-						if( canInsert )
+						if( !extra.isEmpty() )
 						{
-							ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
-							if( !extra.isEmpty() && !interfaceSlot.containsItems() )
-							{
-								extra = interfaceSlot.addItems( extra );
-							}
-							if( !extra.isEmpty() )
-							{
-								playerHand.addItems( extra );
-							}
+							playerHand.addItems( extra );
 						}
 					}
 					else if( !is.isEmpty() )
@@ -404,9 +378,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		{
 			tag.setLong( "sortBy", inv.sortBy );
 			tag.setString( "un", inv.unlocalizedName );
-			tag.setTag( "pos", NBTUtil.createPosTag( inv.pos ) );
-			tag.setInteger( "dim", inv.dim );
-			tag.setInteger( "numUpgrades", inv.numUpgrades );
 		}

 		for( int x = 0; x < length; x++ )
@@ -437,9 +408,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		private final String unlocalizedName;
 		private final IItemHandler client;
 		private final IItemHandler server;
-		private final BlockPos pos;
-		private final int dim;
-		private final int numUpgrades;

 		public InvTracker( final DualityInterface dual, final IItemHandler patterns, final String unlocalizedName )
 		{
@@ -447,9 +415,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			this.client = new AppEngInternalInventory( null, this.server.getSlots() );
 			this.unlocalizedName = unlocalizedName;
 			this.sortBy = dual.getSortValue();
-			this.pos = dual.getLocation().getPos();
-			this.dim = dual.getLocation().getWorld().provider.getDimension();
-			this.numUpgrades = dual.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION);
 		}
 	}

@@ -1,140 +0,0 @@
-package appeng.container.implementations;
-
-import appeng.api.AEApi;
-import appeng.api.config.*;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.container.AEBaseContainer;
-import appeng.container.guisync.GuiSync;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.parts.misc.PartOreDicStorageBus;
-import appeng.util.Platform;
-import appeng.util.item.AEItemStack;
-import appeng.util.item.OreReference;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-
-public class ContainerOreDictStorageBus extends AEBaseContainer
-{
-    private final PartOreDicStorageBus part;
-
-    @GuiSync( 3 )
-    public AccessRestriction rwMode = AccessRestriction.READ_WRITE;
-
-    @GuiSync( 4 )
-    public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY;
-
-    public ContainerOreDictStorageBus( final InventoryPlayer ip, final PartOreDicStorageBus anchor )
-    {
-        super( ip, anchor );
-        this.part = anchor;
-
-        this.bindPlayerInventory( ip, 14, 256 - /* height of player inventory */82 );
-    }
-
-    @Override
-    public void detectAndSendChanges()
-    {
-        this.verifyPermissions( SecurityPermissions.BUILD, false );
-
-        if( Platform.isServer() )
-        {
-            this.setReadWriteMode( (AccessRestriction) part.getConfigManager().getSetting( Settings.ACCESS ) );
-            this.setStorageFilter( (StorageFilter) part.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
-        }
-
-        super.detectAndSendChanges();
-    }
-
-    public void partition()
-    {
-        final IMEInventory<IAEItemStack> cellInv = this.part.getInternalHandler();
-
-        if( cellInv == null )
-        {
-            return;
-        }
-
-        Set<Integer> oreIDs = new HashSet<>();
-
-        for( IAEItemStack itemStack : cellInv.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) )
-        {
-            OreReference ref = ( (AEItemStack) itemStack ).getOre().orElse( null );
-            if( ref != null )
-            {
-                oreIDs.addAll( ref.getOres() );
-            }
-        }
-
-        String oreMatch = "(";
-        String append = "";
-
-        for( Iterator<Integer> it = oreIDs.iterator(); it.hasNext(); )
-        {
-            int oreID = it.next();
-            if( it.hasNext() )
-            {
-                append = ")|(";
-            }
-            else
-            {
-                append = ")";
-            }
-            oreMatch = oreMatch.concat( OreDictionary.getOreName( oreID ) + append );
-        }
-
-        if( oreMatch.equals( "(" ) )
-        {
-            oreMatch = "";
-        }
-        part.saveOreMatch( oreMatch );
-
-        this.detectAndSendChanges();
-    }
-
-    public void saveOreMatch( String value )
-    {
-        part.saveOreMatch( value );
-    }
-
-    public void sendRegex()
-    {
-        try
-        {
-            NetworkHandler.instance().sendTo( new PacketValueConfig( "OreDictStorageBus.sendRegex", part.getOreExp() ), (EntityPlayerMP) getInventoryPlayer().player );
-        }
-        catch( IOException e )
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public AccessRestriction getReadWriteMode()
-    {
-        return this.rwMode;
-    }
-
-    private void setReadWriteMode( final AccessRestriction rwMode )
-    {
-        this.rwMode = rwMode;
-    }
-
-    public StorageFilter getStorageFilter()
-    {
-        return this.storageFilter;
-    }
-
-    private void setStorageFilter( final StorageFilter storageFilter )
-    {
-        this.storageFilter = storageFilter;
-    }
-}
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

-import appeng.container.slot.*;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -52,6 +51,12 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerNull;
 import appeng.container.guisync.GuiSync;
+import appeng.container.slot.IOptionalSlotHost;
+import appeng.container.slot.OptionalSlotFake;
+import appeng.container.slot.SlotFakeCraftingMatrix;
+import appeng.container.slot.SlotPatternOutputs;
+import appeng.container.slot.SlotPatternTerm;
+import appeng.container.slot.SlotRestrictedInput;
 import appeng.core.sync.packets.PacketPatternSlot;
 import appeng.helpers.IContainerCraftingPacket;
 import appeng.items.storage.ItemViewCell;
@@ -127,28 +132,6 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		this.updateOrderOfOutputSlots();
 	}

-	@Override
-	public ItemStack transferStackInSlot( final EntityPlayer p, final int idx )
-	{
-		if( Platform.isClient() )
-		{
-			return ItemStack.EMPTY;
-		}
-		if( this.inventorySlots.get( idx ) instanceof SlotPlayerInv || this.inventorySlots.get( idx ) instanceof SlotPlayerHotBar )
-		{
-			final AppEngSlot clickSlot = ( AppEngSlot ) this.inventorySlots.get( idx ); // require AE SLots!
-			ItemStack itemStack = clickSlot.getStack();
-			if( AEApi.instance().definitions().materials().blankPattern().isSameAs( itemStack ) )
-			{
-				IItemHandler patternInv = this.getPatternTerminal().getInventoryByName( "pattern" );
-				ItemStack remainder = patternInv.insertItem( 0, itemStack, false );
-				clickSlot.putStack( remainder );
-			}
-		}
-		return super.transferStackInSlot( p, idx );
-	}
-
-
 	private void updateOrderOfOutputSlots()
 	{
 		if( !this.isCraftingMode() )
@@ -178,7 +161,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		this.getAndUpdateOutput();
 	}

-	protected ItemStack getAndUpdateOutput()
+	private ItemStack getAndUpdateOutput()
 	{
 		final World world = this.getPlayerInv().player.world;
 		final InventoryCrafting ic = new InventoryCrafting( this, 3, 3 );
@@ -220,19 +203,6 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA

 	}

-	public void encodeAndMoveToInventory()
-	{
-		encode();
-		ItemStack output = this.patternSlotOUT.getStack();
-		if ( !output.isEmpty() )
-		{
-			if (!getPlayerInv().addItemStackToInventory( output )){
-				getPlayerInv().player.dropItem( output , false );
-			}
-			this.patternSlotOUT.putStack( ItemStack.EMPTY );
-		}
-	}
-
 	public void encode()
 	{
 		ItemStack output = this.patternSlotOUT.getStack();
@@ -299,213 +269,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		output.setTagCompound( encodedValue );
 	}

-	public void multiply(int multiple)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canMultiplyInputs = true;
-		boolean canMultiplyOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() * multiple > input[x].getMaxStackSize() )
-			{
-				canMultiplyInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() * multiple > out.getMaxStackSize() )
-			{
-				canMultiplyOutputs = false;
-			}
-		}
-		if( canMultiplyInputs && canMultiplyOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() * multiple );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() * multiple );
-			}
-		}
-	}
-
-	public void divide(int divide)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canDivideInputs = true;
-		boolean canDivideOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() % divide != 0 )
-			{
-				canDivideInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() % divide != 0 )
-			{
-				canDivideOutputs = false;
-			}
-		}
-		if( canDivideInputs && canDivideOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() / divide );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() / divide );
-			}
-		}
-	}
-
-	public void increase(int increase)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canIncreaseInputs = true;
-		boolean canIncreaseOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() + increase > input[x].getMaxStackSize() )
-			{
-				canIncreaseInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() + increase > out.getMaxStackSize() )
-			{
-				canIncreaseOutputs = false;
-			}
-		}
-		if( canIncreaseInputs && canIncreaseOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() + increase );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() + increase );
-			}
-		}
-	}
-
-	public void decrease(int decrease)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canDecreaseInputs = true;
-		boolean canDecreaseOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() - decrease < 1 )
-			{
-				canDecreaseInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() - decrease < 1 )
-			{
-				canDecreaseOutputs = false;
-			}
-		}
-		if( canDecreaseInputs && canDecreaseOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() - decrease );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() - decrease );
-			}
-		}
-	}
-
-	public void maximizeCount()
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canGrowInputs = true;
-		boolean canGrowOutputs = true;
-		int maxInputStackGrowth = 0;
-		int maxOutputStackGrowth = 0;
-
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getMaxStackSize() - input[x].getCount() > maxInputStackGrowth )
-			{
-				maxInputStackGrowth = input[x].getMaxStackSize() - input[x].getCount();
-			}
-			if( !input[x].isEmpty() && input[x].getCount() + maxInputStackGrowth > input[x].getMaxStackSize() )
-			{
-				canGrowInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			{
-				maxOutputStackGrowth = out.getMaxStackSize() - out.getCount();
-			}
-			if( !out.isEmpty() && out.getCount() + maxOutputStackGrowth > out.getMaxStackSize() )
-			{
-				canGrowOutputs = false;
-			}
-		}
-		if( canGrowInputs && canGrowOutputs )
-		{
-			int maxStackGrowth = Math.min(maxInputStackGrowth,maxOutputStackGrowth);
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-					craftingSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-					outputSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
-			}
-		}
-	}
-
-	protected ItemStack[] getInputs()
+	private ItemStack[] getInputs()
 	{
 		final ItemStack[] input = new ItemStack[9];
 		boolean hasValue = false;
@@ -527,7 +291,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return null;
 	}

-	protected ItemStack[] getOutputs()
+	private ItemStack[] getOutputs()
 	{
 		if( this.isCraftingMode() )
 		{
@@ -535,7 +299,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA

 			if( !out.isEmpty() && out.getCount() > 0 )
 			{
-				return new ItemStack[]{out};
+				return new ItemStack[] { out };
 			}
 		}
 		else
@@ -563,7 +327,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return null;
 	}

-	boolean isPattern( final ItemStack output )
+	private boolean isPattern( final ItemStack output )
 	{
 		if( output.isEmpty() )
 		{
@@ -578,7 +342,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return isPattern;
 	}

-	NBTBase createItemTag( final ItemStack i )
+	private NBTBase createItemTag( final ItemStack i )
 	{
 		final NBTTagCompound c = new NBTTagCompound();

@@ -824,7 +588,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return this.patternTerminal;
 	}

-	boolean isSubstitute()
+	private boolean isSubstitute()
 	{
 		return this.substitute;
 	}
@@ -1,18 +0,0 @@
-package appeng.container.interfaces;
-
-import mezz.jei.api.gui.IGhostIngredientHandler.Target;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public interface IJEIGhostIngredients
-{
-    List<Target<?>> getPhantomTargets( Object ingredient );
-
-    default Map<Target<?>, Object> getFakeSlotTargetMap(){
-        return new HashMap<>();
-    }
-
-}
@@ -157,7 +157,7 @@ public class AppEngSlot extends Slot
 	{
 		if( this.isSlotEnabled() )
 		{
-			return !this.itemHandler.extractItem( this.index, Integer.MAX_VALUE, true ).isEmpty();
+			return !this.itemHandler.extractItem( this.index, 1, true ).isEmpty();
 		}
 		return false;
 	}
@@ -1,4 +0,0 @@
-package appeng.container.slot;
-
-public interface IJEITargetSlot {
-}
@@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;


-public class SlotFake extends AppEngSlot implements IJEITargetSlot
+public class SlotFake extends AppEngSlot
 {

 	public SlotFake( final IItemHandler inv, final int idx, final int x, final int y )
@@ -20,7 +20,11 @@ package appeng.core;


 import java.io.File;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Stream;

 import com.google.common.collect.Sets;
@@ -60,67 +64,13 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 	private static AEConfig instance;

 	// Default Grindstone ores
-	private static final String[] ORES_VANILLA = {
-			"Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold",
-			"Charcoal", "NetherQuartz"
-	};
-	private static final String[] ORES_AE = {"CertusQuartz", "Wheat", "Fluix"};
-	private static final String[] ORES_COMMON = {
-			"Copper", "Tin", "Silver", "Lead", "Bronze"
-	};
-	private static final String[] ORES_MISC = {
-			"Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum",
-			"Osmium", "Zinc"
-	};
-
-	private String[] nonBlockingItems = {
-			"[gregtech|actuallyadditions]", "gregtech:circuit.integrated",
-			"gregtech:shape.mold.plate", "gregtech:shape.mold.gear",
-			"gregtech:shape.mold.credit", "gregtech:shape.mold.bottle",
-			"gregtech:shape.mold.ingot", "gregtech:shape.mold.ball",
-			"gregtech:shape.mold.block", "gregtech:shape.mold.nugget",
-			"gregtech:shape.mold.cylinder", "gregtech:shape.mold.anvil",
-			"gregtech:shape.mold.name", "gregtech:shape.mold.gear.small",
-			"gregtech:shape.mold.rotor", "gregtech:shape.extruder.plate",
-			"gregtech:shape.extruder.rod", "gregtech:shape.extruder.bolt",
-			"gregtech:shape.extruder.ring", "gregtech:shape.extruder.cell",
-			"gregtech:shape.extruder.ingot", "gregtech:shape.extruder.wire",
-			"gregtech:shape.extruder.pipe.tiny",
-			"gregtech:shape.extruder.pipe.small",
-			"gregtech:shape.extruder.pipe.medium",
-			"gregtech:shape.extruder.pipe.normal",
-			"gregtech:shape.extruder.pipe.large",
-			"gregtech:shape.extruder.pipe.huge",
-			"gregtech:shape.extruder.block", "gregtech:shape.extruder.sword",
-			"gregtech:shape.extruder.pickaxe", "gregtech:shape.extruder.shovel",
-			"gregtech:shape.extruder.axe", "gregtech:shape.extruder.hoe",
-			"gregtech:shape.extruder.hammer", "gregtech:shape.extruder.file",
-			"gregtech:shape.extruder.saw", "gregtech:shape.extruder.gear",
-			"gregtech:shape.extruder.bottle", "gregtech:shape.extruder.foil",
-			"gregtech:shape.extruder.gear_small",
-			"gregtech:shape.extruder.rod_long", "gregtech:shape.extruder.rotor",
-			"gregtech:glass_lens.white", "gregtech:glass_lens.orange",
-			"gregtech:glass_lens.magenta", "gregtech:glass_lens.light_blue",
-			"gregtech:glass_lens.yellow", "gregtech:glass_lens.lime",
-			"gregtech:glass_lens.pink", "gregtech:glass_lens.gray",
-			"gregtech:glass_lens.light_gray", "gregtech:glass_lens.cyan",
-			"gregtech:glass_lens.purple", "gregtech:glass_lens.blue",
-			"gregtech:glass_lens.brown", "gregtech:glass_lens.green",
-			"gregtech:glass_lens.red", "gregtech:glass_lens.black",
-			"contenttweaker:smallgearextrudershape",
-			"contenttweaker:creativeportabletankmold", "ore:lensAlmandine",
-			"ore:lensBlueTopaz", "ore:lensDiamond", "ore:lensEmerald",
-			"ore:lensGreenSapphire", "ore:lensRutile", "ore:lensRuby",
-			"ore:lensSapphire", "ore:lensTopaz", "ore:lensJasper",
-			"ore:lensGlass", "ore:lensOlivine", "ore:lensOpal",
-			"ore:lensAmethyst", "ore:lensLapis", "ore:lensEnderPearl",
-			"ore:lensEnderEye", "ore:lensGarnetRed", "ore:lensGarnetYellow",
-			"ore:lensVinteum", "ore:lensNetherStar",
-	};
+	private static final String[] ORES_VANILLA = { "Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold", "Charcoal", "NetherQuartz" };
+	private static final String[] ORES_AE = { "CertusQuartz", "Wheat", "Fluix" };
+	private static final String[] ORES_COMMON = { "Copper", "Tin", "Silver", "Lead", "Bronze" };
+	private static final String[] ORES_MISC = { "Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" };

 	// Default Energy Conversion Rates
 	private static final double DEFAULT_IC2_EXCHANGE = 2.0;
-	private static final double DEFAULT_GTEU_EXCHANGE = 2.0;
 	private static final double DEFAULT_RF_EXCHANGE = 0.5;

 	private final IConfigManager settings = new ConfigManager( this );
@@ -140,10 +90,10 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 	private PowerUnits selectedPowerUnit = PowerUnits.AE;

 	// GUI Buttons
-	private final int[] craftByStacks = {1, 10, 100, 1000};
-	private final int[] priorityByStacks = {1, 10, 100, 1000};
-	private final int[] levelByStacks = {1, 10, 100, 1000};
-	private final int[] levelByMillibuckets = {10, 100, 1000, 10000};
+	private final int[] craftByStacks = { 1, 10, 100, 1000 };
+	private final int[] priorityByStacks = { 1, 10, 100, 1000 };
+	private final int[] levelByStacks = { 1, 10, 100, 1000 };
+	private final int[] levelByMillibuckets = { 10, 100, 1000, 10000 };

 	// Spatial IO/Dimension
 	private int storageProviderID = -1;
@@ -175,7 +125,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 	private int minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance;
 	private double meteoriteClusterChance = 0.1;
 	private int meteoriteMaximumSpawnHeight = 180;
-	private int[] meteoriteDimensionWhitelist = {0};
+	private int[] meteoriteDimensionWhitelist = { 0 };

 	// Wireless
 	private double wirelessBaseCost = 8;
@@ -198,7 +148,6 @@ public final class AEConfig extends Configuration implements IConfigurableObject

 		PowerUnits.EU.conversionRatio = this.get( "PowerRatios", "IC2", DEFAULT_IC2_EXCHANGE ).getDouble( DEFAULT_IC2_EXCHANGE );
 		PowerUnits.RF.conversionRatio = this.get( "PowerRatios", "ForgeEnergy", DEFAULT_RF_EXCHANGE ).getDouble( DEFAULT_RF_EXCHANGE );
-		PowerUnits.GTEU.conversionRatio = this.get( "PowerRatios", "GTEU", DEFAULT_GTEU_EXCHANGE ).getDouble( DEFAULT_GTEU_EXCHANGE );

 		final double usageEffective = this.get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 );
 		PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective );
@@ -206,24 +155,32 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 		CondenserOutput.MATTER_BALLS.requiredPower = this.get( "Condenser", "MatterBalls", 256 ).getInt( 256 );
 		CondenserOutput.SINGULARITY.requiredPower = this.get( "Condenser", "Singularity", 256000 ).getInt( 256000 );

-		this.removeCrashingItemsOnLoad = this.get( "general", "removeCrashingItemsOnLoad", false, "Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!" ).getBoolean();
+		this.removeCrashingItemsOnLoad = this.get( "general", "removeCrashingItemsOnLoad", false,
+				"Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!" ).getBoolean();

-		this.setCategoryComment( "BlockingMode", "Map of items to not block when blockingmode is enabled.\n[modid]\nmodid:item:metadata(optional,default:0)\nSupports more than one modid, so you can block different things between, for example, gregtech or enderio" );
-		this.nonBlockingItems = this.get( "BlockingMode", "nonBlockingItems", nonBlockingItems, "NonBlockingItems" ).getStringList();
-
-		this.setCategoryComment( "GrindStone", "Creates recipe of the following pattern automatically: '1 oreTYPE => 2 dustTYPE' and '(1 ingotTYPE or 1 crystalTYPE or 1 gemTYPE) => 1 dustTYPE'" );
-		this.grinderOres = this.get( "GrindStone", "grinderOres", this.grinderOres, "The list of types to handle. Specify without a prefix like ore or dust." ).getStringList();
-		this.grinderBlackList = Sets.newHashSet( this.get( "GrindStone", "blacklist", new String[]{}, "Blacklists the exact oredict name from being handled by any recipe." ).getStringList() );
-		this.oreDoublePercentage = this.get( "GrindStone", "oreDoublePercentage", this.oreDoublePercentage, "Chance to actually get an output with stacksize > 1." ).getDouble( this.oreDoublePercentage );
+		this.setCategoryComment( "GrindStone",
+				"Creates recipe of the following pattern automatically: '1 oreTYPE => 2 dustTYPE' and '(1 ingotTYPE or 1 crystalTYPE or 1 gemTYPE) => 1 dustTYPE'" );
+		this.grinderOres = this.get( "GrindStone", "grinderOres", this.grinderOres, "The list of types to handle. Specify without a prefix like ore or dust." )
+				.getStringList();
+		this.grinderBlackList = Sets.newHashSet(
+				this.get( "GrindStone", "blacklist", new String[] {}, "Blacklists the exact oredict name from being handled by any recipe." )
+						.getStringList() );
+		this.oreDoublePercentage = this
+				.get( "GrindStone", "oreDoublePercentage", this.oreDoublePercentage, "Chance to actually get an output with stacksize > 1." )
+				.getDouble( this.oreDoublePercentage );

 		this.settings.registerSetting( Settings.SEARCH_TOOLTIPS, YesNo.YES );
 		this.settings.registerSetting( Settings.TERMINAL_STYLE, TerminalStyle.TALL );
 		this.settings.registerSetting( Settings.SEARCH_MODE, SearchBoxMode.AUTOSEARCH );

-		this.spawnChargedChance = (float) ( 1.0 - this.get( "worldGen", "spawnChargedChance", 1.0 - this.spawnChargedChance ).getDouble( 1.0 - this.spawnChargedChance ) );
+		this.spawnChargedChance = (float) ( 1.0 - this.get( "worldGen", "spawnChargedChance", 1.0 - this.spawnChargedChance )
+				.getDouble(
+						1.0 - this.spawnChargedChance ) );
 		this.minMeteoriteDistance = this.get( "worldGen", "minMeteoriteDistance", this.minMeteoriteDistance ).getInt( this.minMeteoriteDistance );
 		this.meteoriteClusterChance = this.get( "worldGen", "meteoriteClusterChance", this.meteoriteClusterChance ).getDouble( this.meteoriteClusterChance );
-		this.meteoriteMaximumSpawnHeight = this.get( "worldGen", "meteoriteMaximumSpawnHeight", this.meteoriteMaximumSpawnHeight ).getInt( this.meteoriteMaximumSpawnHeight );
+		this.meteoriteMaximumSpawnHeight = this.get( "worldGen", "meteoriteMaximumSpawnHeight", this.meteoriteMaximumSpawnHeight )
+				.getInt(
+						this.meteoriteMaximumSpawnHeight );
 		this.meteoriteDimensionWhitelist = this.get( "worldGen", "meteoriteDimensionWhitelist", this.meteoriteDimensionWhitelist ).getIntList();

 		this.quartzOresPerCluster = this.get( "worldGen", "quartzOresPerCluster", this.quartzOresPerCluster ).getInt( this.quartzOresPerCluster );
@@ -231,16 +188,23 @@ public final class AEConfig extends Configuration implements IConfigurableObject

 		this.minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance;

-		this.addCustomCategoryComment( "wireless", "Range= wirelessBaseRange + wirelessBoosterRangeMultiplier * Math.pow( boosters, wirelessBoosterExp )\nPowerDrain= wirelessBaseCost + wirelessCostMultiplier * Math.pow( boosters, 1 + boosters / wirelessHighWirelessCount )" );
+		this.addCustomCategoryComment( "wireless",
+				"Range= wirelessBaseRange + wirelessBoosterRangeMultiplier * Math.pow( boosters, wirelessBoosterExp )\nPowerDrain= wirelessBaseCost + wirelessCostMultiplier * Math.pow( boosters, 1 + boosters / wirelessHighWirelessCount )" );

 		this.wirelessBaseCost = this.get( "wireless", "wirelessBaseCost", this.wirelessBaseCost ).getDouble( this.wirelessBaseCost );
 		this.wirelessCostMultiplier = this.get( "wireless", "wirelessCostMultiplier", this.wirelessCostMultiplier ).getDouble( this.wirelessCostMultiplier );
 		this.wirelessBaseRange = this.get( "wireless", "wirelessBaseRange", this.wirelessBaseRange ).getDouble( this.wirelessBaseRange );
-		this.wirelessBoosterRangeMultiplier = this.get( "wireless", "wirelessBoosterRangeMultiplier", this.wirelessBoosterRangeMultiplier ).getDouble( this.wirelessBoosterRangeMultiplier );
+		this.wirelessBoosterRangeMultiplier = this.get( "wireless", "wirelessBoosterRangeMultiplier", this.wirelessBoosterRangeMultiplier )
+				.getDouble(
+						this.wirelessBoosterRangeMultiplier );
 		this.wirelessBoosterExp = this.get( "wireless", "wirelessBoosterExp", this.wirelessBoosterExp ).getDouble( this.wirelessBoosterExp );
-		this.wirelessTerminalDrainMultiplier = this.get( "wireless", "wirelessTerminalDrainMultiplier", this.wirelessTerminalDrainMultiplier ).getDouble( this.wirelessTerminalDrainMultiplier );
+		this.wirelessTerminalDrainMultiplier = this.get( "wireless", "wirelessTerminalDrainMultiplier", this.wirelessTerminalDrainMultiplier )
+				.getDouble(
+						this.wirelessTerminalDrainMultiplier );

-		this.formationPlaneEntityLimit = this.get( "automation", "formationPlaneEntityLimit", this.formationPlaneEntityLimit ).getInt( this.formationPlaneEntityLimit );
+		this.formationPlaneEntityLimit = this.get( "automation", "formationPlaneEntityLimit", this.formationPlaneEntityLimit )
+				.getInt(
+						this.formationPlaneEntityLimit );

 		this.wirelessTerminalBattery = this.get( "battery", "wirelessTerminal", this.wirelessTerminalBattery ).getInt( this.wirelessTerminalBattery );
 		this.chargedStaffBattery = this.get( "battery", "chargedStaff", this.chargedStaffBattery ).getInt( this.chargedStaffBattery );
@@ -281,7 +245,8 @@ public final class AEConfig extends Configuration implements IConfigurableObject

 		try
 		{
-			this.selectedPowerUnit = PowerUnits.valueOf( this.get( "Client", "PowerUnit", this.selectedPowerUnit.name(), this.getListComment( this.selectedPowerUnit ) ).getString() );
+			this.selectedPowerUnit = PowerUnits.valueOf(
+					this.get( "Client", "PowerUnit", this.selectedPowerUnit.name(), this.getListComment( this.selectedPowerUnit ) ).getString() );
 		}
 		catch( final Throwable t )
 		{
@@ -297,13 +262,17 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 		{
 			this.storageProviderID = this.get( "spatialio", "storageProviderID", this.storageProviderID ).getInt( this.storageProviderID );
 			this.storageDimensionID = this.get( "spatialio", "storageDimensionID", this.storageDimensionID ).getInt( this.storageDimensionID );
-			this.spatialPowerMultiplier = this.get( "spatialio", "spatialPowerMultiplier", this.spatialPowerMultiplier ).getDouble( this.spatialPowerMultiplier );
+			this.spatialPowerMultiplier = this.get( "spatialio", "spatialPowerMultiplier", this.spatialPowerMultiplier )
+					.getDouble(
+							this.spatialPowerMultiplier );
 			this.spatialPowerExponent = this.get( "spatialio", "spatialPowerExponent", this.spatialPowerExponent ).getDouble( this.spatialPowerExponent );
 		}

 		if( this.isFeatureEnabled( AEFeature.CRAFTING_CPU ) )
 		{
-			this.craftingCalculationTimePerTick = this.get( "craftingCPU", "craftingCalculationTimePerTick", this.craftingCalculationTimePerTick ).getInt( this.craftingCalculationTimePerTick );
+			this.craftingCalculationTimePerTick = this.get( "craftingCPU", "craftingCalculationTimePerTick", this.craftingCalculationTimePerTick )
+					.getInt(
+							this.craftingCalculationTimePerTick );
 		}

 		this.updatable = true;
@@ -477,7 +446,8 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 			return true;
 		}

-		this.setCategoryComment( "OreCamouflage", "AE2 Automatically uses alternative ores present in your instance of MC to blend better with its surroundings, if you prefer you can disable this selectively using these flags; Its important to note, that some if these items even if enabled may not be craftable in game because other items are overriding their recipes." );
+		this.setCategoryComment( "OreCamouflage",
+				"AE2 Automatically uses alternative ores present in your instance of MC to blend better with its surroundings, if you prefer you can disable this selectively using these flags; Its important to note, that some if these items even if enabled may not be craftable in game because other items are overriding their recipes." );
 		final Property p = this.get( "OreCamouflage", mt.name(), true );
 		p.setComment( "OreDictionary Names: " + mt.getOreName() );

@@ -745,11 +715,6 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 		return this.quartzOresClusterAmount;
 	}

-	public String[] getNonBlockingItems()
-	{
-		return nonBlockingItems;
-	}
-
 	public int getChargedChange()
 	{
 		return this.chargedChange;
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit;

 import javax.annotation.Nonnull;

-import appeng.helpers.NonBlockingItems;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;

@@ -184,7 +183,8 @@ public final class AppEng
 		AELog.info( "Pre Initialization ( ended after " + watch.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );

 		// Instantiate all Plugins
-		List<Object> injectables = Lists.newArrayList( AEApi.instance() );
+		List<Object> injectables = Lists.newArrayList(
+				AEApi.instance() );
 		new PluginLoader().loadPlugins( injectables, event.getAsmData() );
 	}

@@ -239,8 +239,6 @@ public final class AppEng
 		AppEng.proxy.postInit();
 		AEConfig.instance().save();

-		NonBlockingItems.INSTANCE.init();
-
 		NetworkRegistry.INSTANCE.registerGuiHandler( this, GuiBridge.GUI_Handler );
 		NetworkHandler.init( "AE2" );

@@ -363,8 +363,6 @@ final class Registration
 		// Interface
 		Upgrades.CRAFTING.registerItem( parts.iface(), 1 );
 		Upgrades.CRAFTING.registerItem( blocks.iface(), 1 );
-		Upgrades.PATTERN_EXPANSION.registerItem( parts.iface(), 3 );
-		Upgrades.PATTERN_EXPANSION.registerItem( blocks.iface(), 3 );

 		// IO Port!
 		Upgrades.SPEED.registerItem( blocks.iOPort(), 3 );
@@ -175,7 +175,7 @@ public class ApiStorage implements IStorageHelper
 		@Override
 		public int transferFactor()
 		{
-			return 1000;
+			return 125;
 		}

 		@Override
@@ -616,12 +616,7 @@ public final class ApiBlocks implements IBlocks

 	private static IBlockDefinition makeStairs( String registryName, FeatureFactory registry, IBlockDefinition block )
 	{
-		if( !block.maybeBlock().isPresent() )
-		{
-			return new BlockDefinition( registryName, null, null );
-		}
-
-		IBlockDefinition stairs = registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) )
+		return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) )
 				.features( AEFeature.DECORATIVE_BLOCKS )
 				.rendering( new BlockRenderingCustomizer()
 				{
@@ -634,10 +629,6 @@ public final class ApiBlocks implements IBlocks
 					}
 				} )
 				.build();
-
-		Verify.verify(stairs.maybeBlock().isPresent());
-
-		return stairs;
 	}

 	@Override
@@ -86,7 +86,6 @@ public final class ApiMaterials implements IMaterials
 	private final IItemDefinition cardRedstone;
 	private final IItemDefinition cardSpeed;
 	private final IItemDefinition cardCapacity;
-	private final IItemDefinition cardPatternExpansion;
 	private final IItemDefinition cardFuzzy;
 	private final IItemDefinition cardInverter;
 	private final IItemDefinition cardCrafting;
@@ -205,7 +204,6 @@ public final class ApiMaterials implements IMaterials
 		this.cardRedstone = new DamagedItemDefinition( "material.card.redstone", materials.createMaterial( MaterialType.CARD_REDSTONE ) );
 		this.cardSpeed = new DamagedItemDefinition( "material.card.acceleration", materials.createMaterial( MaterialType.CARD_SPEED ) );
 		this.cardCapacity = new DamagedItemDefinition( "material.card.capacity", materials.createMaterial( MaterialType.CARD_CAPACITY ) );
-		this.cardPatternExpansion = new DamagedItemDefinition( "material.card.pattern.expansion", materials.createMaterial(MaterialType.CARD_PATTERN_EXPANSION) );
 		this.cardFuzzy = new DamagedItemDefinition( "material.card.fuzzy", materials.createMaterial( MaterialType.CARD_FUZZY ) );
 		this.cardInverter = new DamagedItemDefinition( "material.card.inverter", materials.createMaterial( MaterialType.CARD_INVERTER ) );
 		this.cardCrafting = new DamagedItemDefinition( "material.card.crafting", materials.createMaterial( MaterialType.CARD_CRAFTING ) );
@@ -426,9 +424,6 @@ public final class ApiMaterials implements IMaterials
 		return this.cardCapacity;
 	}

-	@Override
-	public IItemDefinition cardPatternExpansion(){ return this.cardPatternExpansion;}
-
 	@Override
 	public IItemDefinition cardFuzzy()
 	{
@@ -52,7 +52,6 @@ public final class ApiParts implements IParts
 	private final IItemDefinition toggleBus;
 	private final IItemDefinition invertedToggleBus;
 	private final IItemDefinition storageBus;
-	private final IItemDefinition oreDictStorageBus;
 	private final IItemDefinition importBus;
 	private final IItemDefinition exportBus;
 	private final IItemDefinition iface;
@@ -70,7 +69,6 @@ public final class ApiParts implements IParts
 	private final IItemDefinition p2PTunnelFluids;
 	private final IItemDefinition p2PTunnelEU;
 	private final IItemDefinition p2PTunnelFE;
-	private final IItemDefinition p2PTunnelGTEU;
 	private final IItemDefinition p2PTunnelLight;
 	// private final IItemDefinition p2PTunnelOpenComputers;
 	private final IItemDefinition cableAnchor;
@@ -79,7 +77,6 @@ public final class ApiParts implements IParts
 	private final IItemDefinition darkMonitor;
 	private final IItemDefinition interfaceTerminal;
 	private final IItemDefinition patternTerminal;
-	private final IItemDefinition expandedProcessingPatternTerminal;
 	private final IItemDefinition craftingTerminal;
 	private final IItemDefinition terminal;
 	private final IItemDefinition storageMonitor;
@@ -92,7 +89,9 @@ public final class ApiParts implements IParts
 	public ApiParts( FeatureFactory registry, PartModels partModels )
 	{
 		final ItemPart itemPart = new ItemPart();
-		registry.item( "part", () -> itemPart ).rendering( new ItemPartRendering( partModels, itemPart ) ).build();
+		registry.item( "part", () -> itemPart )
+				.rendering( new ItemPartRendering( partModels, itemPart ) )
+				.build();

 		// Register all part models
 		for( PartType partType : PartType.values() )
@@ -113,7 +112,6 @@ public final class ApiParts implements IParts
 		this.toggleBus = new DamagedItemDefinition( "part.toggle_bus", itemPart.createPart( PartType.TOGGLE_BUS ) );
 		this.invertedToggleBus = new DamagedItemDefinition( "part.toggle_bus.inverted", itemPart.createPart( PartType.INVERTED_TOGGLE_BUS ) );
 		this.storageBus = new DamagedItemDefinition( "part.bus.storage", itemPart.createPart( PartType.STORAGE_BUS ) );
-		this.oreDictStorageBus = new DamagedItemDefinition( "part.bus.oredict_storage", itemPart.createPart( PartType.OREDICT_STORAGE_BUS ) );
 		this.importBus = new DamagedItemDefinition( "part.bus.import", itemPart.createPart( PartType.IMPORT_BUS ) );
 		this.exportBus = new DamagedItemDefinition( "part.bus.export", itemPart.createPart( PartType.EXPORT_BUS ) );
 		this.iface = new DamagedItemDefinition( "part.interface", itemPart.createPart( PartType.INTERFACE ) );
@@ -121,7 +119,8 @@ public final class ApiParts implements IParts
 		this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemPart.createPart( PartType.LEVEL_EMITTER ) );
 		this.fluidLevelEmitter = new DamagedItemDefinition( "part.fluid_level_emitter", itemPart.createPart( PartType.FLUID_LEVEL_EMITTER ) );
 		this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemPart.createPart( PartType.ANNIHILATION_PLANE ) );
-		this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart.createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) );
+		this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart
+				.createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) );
 		this.fluidAnnihilationPlane = new DamagedItemDefinition( "part.plane.fluid_annihilation", itemPart.createPart( PartType.FLUID_ANNIHILATION_PLANE ) );
 		this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemPart.createPart( PartType.FORMATION_PLANE ) );
 		this.fluidFormationPlane = new DamagedItemDefinition( "part.plane.fluid_formation", itemPart.createPart( PartType.FLUID_FORMATION_PLANE ) );
@@ -131,7 +130,6 @@ public final class ApiParts implements IParts
 		this.p2PTunnelFluids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2P_TUNNEL_FLUIDS ) );
 		this.p2PTunnelEU = new DamagedItemDefinition( "part.tunnel.eu", itemPart.createPart( PartType.P2P_TUNNEL_IC2 ) );
 		this.p2PTunnelFE = new DamagedItemDefinition( "part.tunnel.fe", itemPart.createPart( PartType.P2P_TUNNEL_FE ) );
-		this.p2PTunnelGTEU = new DamagedItemDefinition( "part.tunnel.gteu", itemPart.createPart( PartType.P2P_TUNNEL_GTEU ) );
 		this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2P_TUNNEL_LIGHT ) );
 		// this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart(
 		// PartType.P2PTunnelOpenComputers ) );
@@ -141,7 +139,6 @@ public final class ApiParts implements IParts
 		this.darkMonitor = new DamagedItemDefinition( "part.monitor.dark", itemPart.createPart( PartType.DARK_MONITOR ) );
 		this.interfaceTerminal = new DamagedItemDefinition( "part.terminal.interface", itemPart.createPart( PartType.INTERFACE_TERMINAL ) );
 		this.patternTerminal = new DamagedItemDefinition( "part.terminal.pattern", itemPart.createPart( PartType.PATTERN_TERMINAL ) );
-		this.expandedProcessingPatternTerminal = new DamagedItemDefinition( "part.terminal.expanded_processing_pattern", itemPart.createPart( PartType.EXPANDED_PROCESSING_PATTERN_TERMINAL ) );
 		this.craftingTerminal = new DamagedItemDefinition( "part.terminal.crafting", itemPart.createPart( PartType.CRAFTING_TERMINAL ) );
 		this.terminal = new DamagedItemDefinition( "part.terminal", itemPart.createPart( PartType.TERMINAL ) );
 		this.storageMonitor = new DamagedItemDefinition( "part.monitor.storage", itemPart.createPart( PartType.STORAGE_MONITOR ) );
@@ -248,12 +245,6 @@ public final class ApiParts implements IParts
 		return this.storageBus;
 	}

-	@Override
-	public IItemDefinition oreDictStorageBus()
-	{
-		return this.oreDictStorageBus;
-	}
-
 	@Override
 	public IItemDefinition importBus()
 	{
@@ -338,11 +329,6 @@ public final class ApiParts implements IParts
 		return this.p2PTunnelFE;
 	}

-	public IItemDefinition p2PTunnelGTEU()
-	{
-		return this.p2PTunnelGTEU;
-	}
-
 	@Override
 	public IItemDefinition p2PTunnelLight()
 	{
@@ -393,12 +379,6 @@ public final class ApiParts implements IParts
 		return this.patternTerminal;
 	}

-	@Override
-	public IItemDefinition expandedProcessingPatternTerminal()
-	{
-		return this.expandedProcessingPatternTerminal;
-	}
-
 	@Override
 	public IItemDefinition craftingTerminal()
 	{
@@ -25,13 +25,13 @@ public enum AEFeature
 	// is just flat out required by tons of
 	// important stuff.
 	CORE( "Core", null )
-			{
-				@Override
-				public boolean isVisible()
-				{
-					return false;
-				}
-			},
+	{
+		@Override
+		public boolean isVisible()
+		{
+			return false;
+		}
+	},

 	CERTUS_QUARTZ_WORLD_GEN( "CertusQuartzWorldGen", Constants.CATEGORY_WORLD ),
 	METEORITE_WORLD_GEN( "MeteoriteWorldGen", Constants.CATEGORY_WORLD ),
@@ -126,7 +126,6 @@ public enum AEFeature
 	P2P_TUNNEL_REDSTONE( "P2PTunnelRedstone", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_EU( "P2PTunnelEU", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_FE( "P2PTunnelFE", Constants.CATEGORY_P2P_TUNNELS ),
-	P2P_TUNNEL_GTEU( "P2PTunnelGTEU", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_FLUIDS( "P2PTunnelFluids", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_LIGHT( "P2PTunnelLight", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_OPEN_COMPUTERS( "P2PTunnelOpenComputers", Constants.CATEGORY_P2P_TUNNELS ),
@@ -164,6 +163,7 @@ public enum AEFeature
 	MOLECULAR_ASSEMBLER( "MolecularAssembler", Constants.CATEGORY_CRAFTING_FEATURES ),
 	PATTERNS( "Patterns", Constants.CATEGORY_CRAFTING_FEATURES ),
 	CRAFTING_CPU( "CraftingCPU", Constants.CATEGORY_CRAFTING_FEATURES ),
+	CRAFTING_MANAGER_FALLBACK( "CraftingManagerFallback", Constants.CATEGORY_CRAFTING_FEATURES, "Use CraftingManager to find an alternative recipe, after a pattern rejected an ingredient. Should be enabled to avoid issues, but can have a minor performance impact." ),

 	BASIC_CARDS( "BasicCards", Constants.CATEGORY_UPGRADES ),
 	ADVANCED_CARDS( "AdvancedCards", Constants.CATEGORY_UPGRADES ),
@@ -19,14 +19,13 @@
 package appeng.core.features.registries;


-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

-import appeng.core.AELog;
-import appeng.util.item.OreHelper;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -68,25 +67,6 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 		this.addNewAttunement( new ItemStack( Blocks.TORCH ), TunnelType.LIGHT );
 		this.addNewAttunement( new ItemStack( Blocks.GLOWSTONE ), TunnelType.LIGHT );

-		List<String> gtceOreDict = new ArrayList<>();
-		gtceOreDict.add( "wireGtHex" );
-		gtceOreDict.add( "wireGtOctal" );
-		gtceOreDict.add( "wireGtQuadruple" );
-		gtceOreDict.add( "wireGtDouble" );
-		gtceOreDict.add( "wireGtSingle" );
-		gtceOreDict.add( "cableGtHex" );
-		gtceOreDict.add( "cableGtOctal" );
-		gtceOreDict.add( "cableGtQuadruple" );
-		gtceOreDict.add( "cableGtDouble" );
-		gtceOreDict.add( "cableGtSingle" );
-
-		for( String oreDict : gtceOreDict )
-		{
-			Arrays.stream( OreDictionary.getOreNames() ).filter( oreName -> oreName.startsWith( oreDict ) ).forEach( oreName -> {
-				OreHelper.INSTANCE.getCachedOres( oreName ).forEach( stack -> this.addNewAttunement( stack, TunnelType.GTEU_POWER ) );
-			} );
-		}
-
 		/**
 		 * Forge energy tunnel items
 		 */
@@ -147,12 +127,12 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 		this.addNewAttunement( this.getModItem( "enderio", "itemitemconduit", OreDictionary.WILDCARD_VALUE ), TunnelType.ITEM );
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct
-		// (opaque)
+																										// (opaque)
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
-		// itemduct
+																										// itemduct
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
-		// itemduct
-		// (opaque)
+																										// itemduct
+																										// (opaque)

 		/**
 		 * attune based on lots of random item related stuff
@@ -168,12 +148,12 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 		this.addNewAttunement( this.getModItem( "enderio", "itemliquidconduit", OreDictionary.WILDCARD_VALUE ), TunnelType.FLUID );
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct
-		// (opaque)
+																										// (opaque)
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
-		// hardened
+																										// hardened
 		this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
-		// hardened
-		// (opaque)
+																										// hardened
+																										// (opaque)

 		for( final AEColor c : AEColor.values() )
 		{
@@ -19,7 +19,6 @@
 package appeng.core.localization;


-import appeng.api.config.SchedulingMode;
 import net.minecraft.util.text.translation.I18n;


@@ -138,28 +137,6 @@ public enum ButtonToolTips
 	BlockPlacementYes,
 	BlockPlacementNo,

-	MultiplyByTwo,
-	MultiplyByTwoDesc,
-	MultiplyByThree,
-	MultiplyByThreeDesc,
-	IncreaseByOne,
-	IncreaseByOneDesc,
-	DivideByTwo,
-	DivideByTwoDesc,
-	DivideByThree,
-	DivideByThreeDesc,
-	DecreaseByOne,
-	DecreaseByOneDesc,
-	MaxCount,
-	MaxCountDesc,
-	FreeMolecularSlotShortcut,
-	FreeMolecularSlotShortcutDesc,
-	ToggleShowFullInterfaces,
-	ToggleShowFullInterfacesOnDesc,
-	ToggleShowFullInterfacesOffDesc,
-	HighlightInterface,
-	HighlightInterfaceDesc,
-
 	// Used in the tooltips of the items in the terminal, when moused over
 	ItemsStored,
 	ItemsRequestable,
@@ -70,7 +70,6 @@ public enum GuiText
 	EnergyDrain,

 	StorageBus,
-	OreDictStorageBus,
 	StorageBusFluids,
 	Priority,
 	Security,
@@ -99,7 +98,6 @@ public enum GuiText
 	OCTunnel,
 	LightTunnel,
 	FETunnel,
-	GTEUTunnel,
 	PressureTunnel,

 	// spatial
@@ -31,10 +31,8 @@ public enum WailaText
 	DeviceMissingChannel,

 	P2PUnlinked,
-	P2P_INPUT_ONE_OUTPUT,
-	P2P_INPUT_MANY_OUTPUTS,
-	P2P_OUTPUT_ONE_INPUT,
-	P2P_OUTPUT_MANY_INPUTS,
+	P2PInputOneOutput,
+	P2PInputManyOutputs,
 	P2POutput,

 	Locked,
@@ -24,9 +24,34 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;

-import appeng.core.sync.packets.*;
 import io.netty.buffer.ByteBuf;

+import appeng.core.sync.packets.PacketAssemblerAnimation;
+import appeng.core.sync.packets.PacketClick;
+import appeng.core.sync.packets.PacketCompassRequest;
+import appeng.core.sync.packets.PacketCompassResponse;
+import appeng.core.sync.packets.PacketCompressedNBT;
+import appeng.core.sync.packets.PacketConfigButton;
+import appeng.core.sync.packets.PacketCraftRequest;
+import appeng.core.sync.packets.PacketFluidSlot;
+import appeng.core.sync.packets.PacketInventoryAction;
+import appeng.core.sync.packets.PacketJEIRecipe;
+import appeng.core.sync.packets.PacketLightning;
+import appeng.core.sync.packets.PacketMEFluidInventoryUpdate;
+import appeng.core.sync.packets.PacketMEInventoryUpdate;
+import appeng.core.sync.packets.PacketMatterCannon;
+import appeng.core.sync.packets.PacketMockExplosion;
+import appeng.core.sync.packets.PacketPaintedEntity;
+import appeng.core.sync.packets.PacketPartPlacement;
+import appeng.core.sync.packets.PacketPatternSlot;
+import appeng.core.sync.packets.PacketProgressBar;
+import appeng.core.sync.packets.PacketSwapSlots;
+import appeng.core.sync.packets.PacketSwitchGuis;
+import appeng.core.sync.packets.PacketTargetFluidStack;
+import appeng.core.sync.packets.PacketTargetItemStack;
+import appeng.core.sync.packets.PacketTransitionEffect;
+import appeng.core.sync.packets.PacketValueConfig;
+

 public class AppEngPacketHandlerBase
 {
@@ -82,10 +107,7 @@ public class AppEngPacketHandlerBase

 		PACKET_PAINTED_ENTITY( PacketPaintedEntity.class ),

-		PACKET_FLUID_TANK( PacketFluidSlot.class ),
-
-		PACKET_INFORM_PLAYER( PacketInformPlayer.class );
-
+		PACKET_FLUID_TANK( PacketFluidSlot.class );

 		private final Class<? extends AppEngPacket> packetClass;
 		private final Constructor<? extends AppEngPacket> packetConstructor;
@@ -21,9 +21,6 @@ package appeng.core.sync;

 import java.lang.reflect.Constructor;

-import appeng.container.implementations.*;
-import appeng.parts.misc.PartOreDicStorageBus;
-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -56,6 +53,39 @@ import appeng.client.gui.GuiNull;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerNull;
 import appeng.container.ContainerOpenContext;
+import appeng.container.implementations.ContainerCellWorkbench;
+import appeng.container.implementations.ContainerChest;
+import appeng.container.implementations.ContainerCondenser;
+import appeng.container.implementations.ContainerCraftAmount;
+import appeng.container.implementations.ContainerCraftConfirm;
+import appeng.container.implementations.ContainerCraftingCPU;
+import appeng.container.implementations.ContainerCraftingStatus;
+import appeng.container.implementations.ContainerCraftingTerm;
+import appeng.container.implementations.ContainerDrive;
+import appeng.container.implementations.ContainerFormationPlane;
+import appeng.container.implementations.ContainerGrinder;
+import appeng.container.implementations.ContainerIOPort;
+import appeng.container.implementations.ContainerInscriber;
+import appeng.container.implementations.ContainerInterface;
+import appeng.container.implementations.ContainerInterfaceTerminal;
+import appeng.container.implementations.ContainerLevelEmitter;
+import appeng.container.implementations.ContainerMAC;
+import appeng.container.implementations.ContainerMEMonitorable;
+import appeng.container.implementations.ContainerMEPortableCell;
+import appeng.container.implementations.ContainerNetworkStatus;
+import appeng.container.implementations.ContainerNetworkTool;
+import appeng.container.implementations.ContainerPatternTerm;
+import appeng.container.implementations.ContainerPriority;
+import appeng.container.implementations.ContainerQNB;
+import appeng.container.implementations.ContainerQuartzKnife;
+import appeng.container.implementations.ContainerSecurityStation;
+import appeng.container.implementations.ContainerSkyChest;
+import appeng.container.implementations.ContainerSpatialIOPort;
+import appeng.container.implementations.ContainerStorageBus;
+import appeng.container.implementations.ContainerUpgradeable;
+import appeng.container.implementations.ContainerVibrationChamber;
+import appeng.container.implementations.ContainerWireless;
+import appeng.container.implementations.ContainerWirelessTerm;
 import appeng.fluids.container.ContainerFluidFormationPlane;
 import appeng.fluids.container.ContainerFluidIO;
 import appeng.fluids.container.ContainerFluidInterface;
@@ -141,8 +171,6 @@ public enum GuiBridge implements IGuiHandler

 	GUI_STORAGEBUS( ContainerStorageBus.class, PartStorageBus.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),

-	GUI_OREDICTSTORAGEBUS( ContainerOreDictStorageBus.class, PartOreDicStorageBus.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
-
 	GUI_STORAGEBUS_FLUID( ContainerFluidStorageBus.class, PartFluidStorageBus.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),

 	GUI_FORMATION_PLANE( ContainerFormationPlane.class, PartFormationPlane.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
@@ -157,8 +185,6 @@ public enum GuiBridge implements IGuiHandler

 	GUI_PATTERN_TERMINAL( ContainerPatternTerm.class, PartPatternTerminal.class, GuiHostType.WORLD, SecurityPermissions.CRAFT ),

-	GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL( ContainerExpandedProcessingPatternTerm.class, PartExpandedProcessingPatternTerminal.class, GuiHostType.WORLD, SecurityPermissions.CRAFT ),
-
 	GUI_FLUID_TERMINAL( ContainerFluidTerminal.class, ITerminalHost.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),

 	// extends (Container/Gui) + Bus
@@ -1,89 +0,0 @@
-package appeng.core.sync.packets;
-
-import appeng.api.storage.data.IAEItemStack;
-import appeng.core.AppEng;
-import appeng.core.sync.AppEngPacket;
-import appeng.core.sync.network.INetworkInfo;
-import appeng.util.item.AEItemStack;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.text.TextComponentString;
-
-import java.io.IOException;
-
-public class PacketInformPlayer extends AppEngPacket
-{
-	private IAEItemStack actualItem = null;
-	private IAEItemStack reportedItem = null;
-	private final InfoType type;
-
-	public PacketInformPlayer( ByteBuf stream ) throws IOException
-	{
-		this.type = InfoType.values()[stream.readInt()];
-		if( type == InfoType.PARTIAL_ITEM_EXTRACTION )
-		{
-			this.reportedItem = AEItemStack.fromPacket( stream );
-			this.actualItem = AEItemStack.fromPacket( stream );
-		}
-		else if( type == InfoType.NO_ITEMS_EXTRACTED )
-		{
-			this.reportedItem = AEItemStack.fromPacket( stream );
-		}
-	}
-
-	public PacketInformPlayer( final IAEItemStack iaeItemStack ) throws IOException
-	{
-		this( iaeItemStack, null );
-	}
-
-	public PacketInformPlayer( IAEItemStack extra, IAEItemStack result ) throws IOException
-	{
-		this.reportedItem = extra;
-		this.actualItem = result;
-		if( actualItem == null )
-		{
-			this.type = InfoType.NO_ITEMS_EXTRACTED;
-		}
-		else
-		{
-			this.type = InfoType.PARTIAL_ITEM_EXTRACTION;
-		}
-
-		final ByteBuf data = Unpooled.buffer();
-
-		data.writeInt( this.getPacketID() );
-
-		data.writeInt( type.ordinal() );
-
-		reportedItem.writeToPacket( data );
-		if( actualItem != null )
-		{
-			actualItem.writeToPacket( data );
-		}
-
-		this.configureWrite( data );
-	}
-
-	@Override
-	public void clientPacketData( final INetworkInfo network, final AppEngPacket packet, final EntityPlayer player )
-	{
-		TextComponentString msg = null;
-
-		if( this.type == InfoType.PARTIAL_ITEM_EXTRACTION )
-		{
-			AppEng.proxy.getPlayers().get( 0 ).sendStatusMessage( new TextComponentString( "System reported " + reportedItem.getStackSize() + " " + reportedItem.getItem().getItemStackDisplayName( reportedItem.getDefinition() ) + " available but could only extract" + actualItem.getStackSize() ), false );
-		}
-		else if( this.type == InfoType.NO_ITEMS_EXTRACTED )
-		{
-			AppEng.proxy.getPlayers().get( 0 ).sendStatusMessage( new TextComponentString( "System reported " + reportedItem.getStackSize() + " " + reportedItem.getItem().getItemStackDisplayName( reportedItem.getDefinition() ) + " available but could not extract anything" ), false );
-		}
-
-	}
-
-	public enum InfoType
-	{
-		PARTIAL_ITEM_EXTRACTION,
-		NO_ITEMS_EXTRACTED
-	}
-}
@@ -20,16 +20,7 @@ package appeng.core.sync.packets;


 import java.io.IOException;
-import java.util.Collections;

-import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.slot.IJEITargetSlot;
-import appeng.container.slot.SlotFake;
-import appeng.core.AELog;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.fluids.client.gui.widgets.GuiFluidSlot;
-import appeng.fluids.container.ContainerFluidConfigurable;
-import appeng.fluids.util.AEFluidStack;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -49,7 +40,6 @@ import appeng.core.sync.network.INetworkInfo;
 import appeng.helpers.InventoryAction;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
-import net.minecraftforge.fluids.FluidStack;


 public class PacketInventoryAction extends AppEngPacket
@@ -67,7 +57,6 @@ public class PacketInventoryAction extends AppEngPacket
 		this.slot = stream.readInt();
 		this.id = stream.readLong();
 		final boolean hasItem = stream.readBoolean();
-
 		if( hasItem )
 		{
 			this.slotItem = AEItemStack.fromPacket( stream );
@@ -81,6 +70,7 @@ public class PacketInventoryAction extends AppEngPacket
 	// api
 	public PacketInventoryAction( final InventoryAction action, final int slot, final IAEItemStack slotItem ) throws IOException
 	{
+
 		if( Platform.isClient() )
 		{
 			throw new IllegalStateException( "invalid packet, client cannot post inv actions with stacks." );
@@ -111,36 +101,6 @@ public class PacketInventoryAction extends AppEngPacket
 		this.configureWrite( data );
 	}

-	public PacketInventoryAction(final InventoryAction action, final IJEITargetSlot slot, final IAEItemStack slotItem ) throws IOException
-	{
-
-		this.action = action;
-		if (slot instanceof SlotFake)
-		this.slot = ((SlotFake) slot).slotNumber;
-		else this.slot = ((GuiFluidSlot) slot).getId();
-		this.id = 0;
-		this.slotItem = slotItem;
-
-		final ByteBuf data = Unpooled.buffer();
-
-		data.writeInt( this.getPacketID() );
-		data.writeInt( action.ordinal() );
-		data.writeInt( this.slot );
-		data.writeLong( this.id );
-
-		if( slotItem == null )
-		{
-			data.writeBoolean( false );
-		}
-		else
-		{
-			data.writeBoolean( true );
-			slotItem.writeToPacket( data );
-		}
-
-		this.configureWrite( data );
-	}
-
 	// api
 	public PacketInventoryAction( final InventoryAction action, final int slot, final long id )
 	{
@@ -190,47 +150,6 @@ public class PacketInventoryAction extends AppEngPacket
 					}
 				}
 			}
-			else if( this.action == InventoryAction.PLACE_JEI_GHOST_ITEM )
-			{
-				if( sender.openContainer instanceof ContainerFluidConfigurable )
-				{
-					if( this.slotItem != null )
-					{
-						IAEFluidStack aefs = AEFluidStack.fromNBT( this.slotItem.getDefinition().getTagCompound() );
-						if( aefs != null )
-						{
-							aefs.setStackSize( 1000 );
-							( (ContainerFluidConfigurable) sender.openContainer ).getFluidConfigInventory().setFluidInSlot( this.slot, aefs );
-							NetworkHandler.instance().sendToServer( new PacketFluidSlot( Collections.singletonMap( this.slot, aefs ) ) );
-						}
-					}
-				}
-				else if( this.slot < sender.openContainer.inventorySlots.size() && sender.openContainer.inventorySlots.get( this.slot ) instanceof SlotFake )
-				{
-					if( this.slotItem != null )
-					{
-						sender.openContainer.inventorySlots.get( this.slot ).putStack( this.slotItem.createItemStack() );
-						if( sender.openContainer.inventorySlots.get( this.slot ).getStack().isEmpty() )
-						{
-							IAEFluidStack aefs = AEFluidStack.fromNBT( this.slotItem.getDefinition().getTagCompound() );
-							if( aefs != null )
-							{
-								FluidStack fluid = aefs.getFluidStack();
-								sender.openContainer.inventorySlots.get( this.slot ).putStack( AEFluidStack.fromFluidStack( fluid ).asItemStackRepresentation() );
-							}
-						}
-					}
-					else sender.openContainer.inventorySlots.get( this.slot ).putStack( ItemStack.EMPTY );
-					try
-					{
-						NetworkHandler.instance().sendTo( new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.fromItemStack( ItemStack.EMPTY ) ), sender );
-					}
-					catch( final IOException e )
-					{
-						AELog.debug( e );
-					}
-				}
-			}
 			else
 			{
 				baseContainer.doAction( sender, this.action, this.slot, this.id );
@@ -23,13 +23,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;

-import appeng.api.config.FuzzyMode;
-import appeng.container.implementations.ContainerExpandedProcessingPatternTerm;
-import appeng.container.implementations.ContainerPatternTerm;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -40,7 +34,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.AEApi;
@@ -70,10 +63,7 @@ import appeng.util.prioritylist.IPartitionList;
 public class PacketJEIRecipe extends AppEngPacket
 {

-	private List<ItemStack[]> recipe;
-	private List<ItemStack> output;
-	static ItemStack[] emptyArray = {ItemStack.EMPTY};
-
+	private ItemStack[][] recipe;

 	// automatic.
 	public PacketJEIRecipe( final ByteBuf stream ) throws IOException
@@ -83,39 +73,20 @@ public class PacketJEIRecipe extends AppEngPacket
 		final NBTTagCompound comp = CompressedStreamTools.readCompressed( bytes );
 		if( comp != null )
 		{
-			this.recipe = new ArrayList<>();
-
-			for( int x = 0; x < comp.getKeySet().size(); x++ )
+			this.recipe = new ItemStack[9][];
+			for( int x = 0; x < this.recipe.length; x++ )
 			{
-				if( comp.hasKey( "#" + x ) )
+				final NBTTagList list = comp.getTagList( "#" + x, 10 );
+				if( list.tagCount() > 0 )
 				{
-					final NBTTagList list = comp.getTagList( "#" + x, 10 );
-					if( list.tagCount() > 0 )
+					this.recipe[x] = new ItemStack[list.tagCount()];
+					for( int y = 0; y < list.tagCount(); y++ )
 					{
-						this.recipe.add( new ItemStack[list.tagCount()] );
-						for( int y = 0; y < list.tagCount(); y++ )
-						{
-							this.recipe.get( x )[y] = new ItemStack( list.getCompoundTagAt( y ) );
-						}
+						this.recipe[x][y] = new ItemStack( list.getCompoundTagAt( y ) );
 					}
-					else
-					{
-						this.recipe.add( emptyArray );
-					}
-				}
-			}
-
-			if( comp.hasKey( "outputs" ) )
-			{
-				final NBTTagList outputList = comp.getTagList( "outputs", 10 );
-				this.output = new ArrayList<>();
-				for( int z = 0; z < outputList.tagCount(); z++ )
-				{
-					this.output.add( new ItemStack( outputList.getCompoundTagAt( z ) ) );
 				}
 			}
 		}
-
 	}

 	// api
@@ -175,25 +146,12 @@ public class PacketJEIRecipe extends AppEngPacket
 			{
 				ItemStack currentItem = craftMatrix.getStackInSlot( x );

-				if( x >= this.recipe.size() )
-				{
-					currentItem = ItemStack.EMPTY;
-				}
-
 				// prepare slots
 				if( !currentItem.isEmpty() )
 				{
 					// already the correct item?
 					ItemStack newItem = this.canUseInSlot( x, currentItem );

-					if( !cct.useRealItems() && this.recipe.get( x ) != null )
-					{
-						if( this.recipe.get( x ).length > 0 )
-						{
-							currentItem.setCount( recipe.get( x )[0].getCount() );
-						}
-					}
-
 					// put away old item
 					if( newItem != currentItem && security.hasPermission( player, SecurityPermissions.INJECT ) )
 					{
@@ -210,12 +168,12 @@ public class PacketJEIRecipe extends AppEngPacket
 					}
 				}

-				if( currentItem.isEmpty() && recipe.size() > x && recipe.get( x ) != null )
+				if( currentItem.isEmpty() && this.recipe[x] != null )
 				{
 					// for each variant
-					for( int y = 0; y < this.recipe.get( x ).length && currentItem.isEmpty(); y++ )
+					for( int y = 0; y < this.recipe[x].length && currentItem.isEmpty(); y++ )
 					{
-						final IAEItemStack request = AEItemStack.fromItemStack( this.recipe.get( x )[y] );
+						final IAEItemStack request = AEItemStack.fromItemStack( this.recipe[x][y] );
 						if( request != null )
 						{
 							// try ae
@@ -227,24 +185,6 @@ public class PacketJEIRecipe extends AppEngPacket
 								if( cct.useRealItems() )
 								{
 									out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() );
-									if( out == null )
-									{
-										if( request.getItem().isDamageable() || Platform.isGTDamageableItem( request.getItem() ) )
-										{
-											Collection<IAEItemStack> outList = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findFuzzy( request, FuzzyMode.IGNORE_ALL );
-											for( IAEItemStack is : outList )
-											{
-												if( is.getDefinition().getMetadata() == request.getDefinition().getMetadata() )
-												{
-													out = Platform.poweredExtraction( energy, storage, is.copy().setStackSize( 1 ), cct.getActionSource() );
-												}
-												if( out != null )
-												{
-													break;
-												}
-											}
-										}
-									}
 								}
 								else
 								{
@@ -262,10 +202,6 @@ public class PacketJEIRecipe extends AppEngPacket

 								if( out != null )
 								{
-									if( !cct.useRealItems() )
-									{
-										out.setStackSize( recipe.get( x )[y].getCount() );
-									}
 									currentItem = out.createItemStack();
 								}
 							}
@@ -277,59 +213,35 @@ public class PacketJEIRecipe extends AppEngPacket

 								if( cct.useRealItems() )
 								{
-									currentItem = ad.removeSimilarItems( 1, this.recipe.get( x )[y], FuzzyMode.IGNORE_ALL, null );
+									currentItem = ad.removeItems( 1, this.recipe[x][y], null );
 								}
 								else
 								{
-									currentItem = ad.simulateSimilarRemove( recipe.get( x )[y].getCount(), this.recipe.get( x )[y], FuzzyMode.IGNORE_ALL, null );
+									currentItem = ad.simulateRemove( 1, this.recipe[x][y], null );
 								}
 							}
 						}
 					}
-					if( !cct.useRealItems() )
-					{
-						if( currentItem.isEmpty() && recipe.size() > x && this.recipe.get( x ) != null )
-						{
-							currentItem = this.recipe.get( x )[0].copy();
-						}
-					}
 				}
 				ItemHandlerUtil.setStackInSlot( craftMatrix, x, currentItem );
 			}
-
 			con.onCraftMatrixChanged( new WrapperInvItemHandler( craftMatrix ) );
-
-			if( this.output != null && ( ( con instanceof ContainerPatternTerm && !( (ContainerPatternTerm) con ).isCraftingMode() ) || con instanceof ContainerExpandedProcessingPatternTerm ) )
-			{
-				IItemHandler outputSlots = cct.getInventoryByName( "output" );
-				for( int i = 0; i < outputSlots.getSlots(); ++i )
-				{
-					ItemHandlerUtil.setStackInSlot( outputSlots, i, ItemStack.EMPTY );
-				}
-				for( int i = 0; i < this.output.size() && i < outputSlots.getSlots(); ++i )
-				{
-					if( this.output.get( i ) == null || this.output.get( i ) == ItemStack.EMPTY )
-					{
-						continue;
-					}
-					ItemHandlerUtil.setStackInSlot( outputSlots, i, this.output.get( i ) );
-				}
-			}
 		}
 	}

 	/**
+	 * 
 	 * @param slot
-	 * @param is   itemstack
+	 * @param is itemstack
 	 * @return is if it can be used, else EMPTY
 	 */
 	private ItemStack canUseInSlot( int slot, ItemStack is )
 	{
-		if( this.recipe.get( slot ) != null )
+		if( this.recipe[slot] != null )
 		{
-			for( ItemStack option : this.recipe.get( slot ) )
+			for( ItemStack option : this.recipe[slot] )
 			{
-				if( ItemStack.areItemStacksEqual( is, option ) )
+				if( is.isItemEqual( option ) )
 				{
 					return is;
 				}
@@ -19,7 +19,6 @@
 package appeng.core.sync.packets;


-import appeng.fluids.container.ContainerFluidInterface;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -91,9 +90,5 @@ public class PacketTargetFluidStack extends AppEngPacket
 		{
 			( (ContainerFluidTerminal) player.openContainer ).setTargetStack( this.stack );
 		}
-		else if( player.openContainer instanceof ContainerFluidInterface )
-		{
-			( (ContainerFluidInterface) player.openContainer ).setTargetStack( this.stack );
-		}
 	}
 }
@@ -24,8 +24,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;

-import appeng.client.gui.implementations.GuiOreDictStorageBus;
-import appeng.container.implementations.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -42,6 +40,17 @@ import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;
 import appeng.client.gui.implementations.GuiCraftingCPU;
 import appeng.container.AEBaseContainer;
+import appeng.container.implementations.ContainerCellWorkbench;
+import appeng.container.implementations.ContainerCraftConfirm;
+import appeng.container.implementations.ContainerCraftingCPU;
+import appeng.container.implementations.ContainerCraftingStatus;
+import appeng.container.implementations.ContainerLevelEmitter;
+import appeng.container.implementations.ContainerNetworkTool;
+import appeng.container.implementations.ContainerPatternTerm;
+import appeng.container.implementations.ContainerPriority;
+import appeng.container.implementations.ContainerQuartzKnife;
+import appeng.container.implementations.ContainerSecurityStation;
+import appeng.container.implementations.ContainerStorageBus;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.fluids.container.ContainerFluidLevelEmitter;
@@ -157,109 +166,24 @@ public class PacketValueConfig extends AppEngPacket
 			final ContainerFluidLevelEmitter lvc = (ContainerFluidLevelEmitter) c;
 			lvc.setLevel( Long.parseLong( this.Value ), player );
 		}
-		else if( this.Name.startsWith( "PatternTerminal." ) )
+		else if( this.Name.startsWith( "PatternTerminal." ) && c instanceof ContainerPatternTerm )
 		{
-			if( c instanceof ContainerPatternTerm )
+			final ContainerPatternTerm cpt = (ContainerPatternTerm) c;
+			if( this.Name.equals( "PatternTerminal.CraftMode" ) )
 			{
-				final ContainerPatternTerm cpt = (ContainerPatternTerm) c;
-				if( this.Name.equals( "PatternTerminal.CraftMode" ) )
-				{
-					cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) );
-				}
-				else if( this.Name.equals( "PatternTerminal.Encode" ) )
-				{
-					if( this.Value.equals( "2" ) )
-					{
-						cpt.encodeAndMoveToInventory();
-					}
-					else
-					{
-						cpt.encode();
-					}
-				}
-				else if( this.Name.equals( "PatternTerminal.Clear" ) )
-				{
-					cpt.clear();
-				}
-				else if( this.Name.equals( "PatternTerminal.MultiplyByTwo" ) )
-				{
-					cpt.multiply( 2 );
-				}
-				else if( this.Name.equals( "PatternTerminal.MultiplyByThree" ) )
-				{
-					cpt.multiply( 3 );
-				}
-				else if( this.Name.equals( "PatternTerminal.DivideByTwo" ) )
-				{
-					cpt.divide( 2 );
-				}
-				else if( this.Name.equals( "PatternTerminal.DivideByThree" ) )
-				{
-					cpt.divide( 3 );
-				}
-				else if( this.Name.equals( "PatternTerminal.IncreaseByOne" ) )
-				{
-					cpt.increase( 1 );
-				}
-				else if( this.Name.equals( "PatternTerminal.DecreaseByOne" ) )
-				{
-					cpt.decrease( 1 );
-				}
-				else if( this.Name.equals( "PatternTerminal.MaximizeCount" ) )
-				{
-					cpt.maximizeCount();
-				}
-				else if( this.Name.equals( "PatternTerminal.Substitute" ) )
-				{
-					cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) );
-				}
+				cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) );
 			}
-			else if( c instanceof ContainerExpandedProcessingPatternTerm )
+			else if( this.Name.equals( "PatternTerminal.Encode" ) )
 			{
-				final ContainerExpandedProcessingPatternTerm cept = (ContainerExpandedProcessingPatternTerm) c;
-				if( this.Name.equals( "PatternTerminal.Encode" ) )
-				{
-					if( this.Value.equals( "2" ) )
-					{
-						cept.encodeAndMoveToInventory();
-					}
-					else
-					{
-						cept.encode();
-					}
-				}
-				else if( this.Name.equals( "PatternTerminal.Clear" ) )
-				{
-					cept.clear();
-				}
-				else if( this.Name.equals( "PatternTerminal.MultiplyByTwo" ) )
-				{
-					cept.multiply( 2 );
-				}
-				else if( this.Name.equals( "PatternTerminal.MultiplyByThree" ) )
-				{
-					cept.multiply( 3 );
-				}
-				else if( this.Name.equals( "PatternTerminal.DivideByTwo" ) )
-				{
-					cept.divide( 2 );
-				}
-				else if( this.Name.equals( "PatternTerminal.DivideByThree" ) )
-				{
-					cept.divide( 3 );
-				}
-				else if( this.Name.equals( "PatternTerminal.IncreaseByOne" ) )
-				{
-					cept.increase( 1 );
-				}
-				else if( this.Name.equals( "PatternTerminal.DecreaseByOne" ) )
-				{
-					cept.decrease( 1 );
-				}
-				else if( this.Name.equals( "PatternTerminal.MaximizeCount" ) )
-				{
-					cept.maximizeCount();
-				}
+				cpt.encode();
+			}
+			else if( this.Name.equals( "PatternTerminal.Clear" ) )
+			{
+				cpt.clear();
+			}
+			else if( this.Name.equals( "PatternTerminal.Substitute" ) )
+			{
+				cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) );
 			}
 		}
 		else if( this.Name.startsWith( "StorageBus." ) )
@@ -276,11 +200,6 @@ public class PacketValueConfig extends AppEngPacket
 					{
 						( (ContainerFluidStorageBus) c ).partition();
 					}
-					else if( c instanceof ContainerOreDictStorageBus )
-					{
-						( (ContainerOreDictStorageBus) c ).partition();
-						( (ContainerOreDictStorageBus) c ).sendRegex();
-					}
 				}
 				else if( this.Value.equals( "Clear" ) )
 				{
@@ -295,20 +214,6 @@ public class PacketValueConfig extends AppEngPacket
 				}
 			}
 		}
-		else if( this.Name.startsWith( "OreDictStorageBus" ) )
-		{
-			if( c instanceof ContainerOreDictStorageBus )
-			{
-				if( this.Name.equals( "OreDictStorageBus.save" ) )
-				{
-					( (ContainerOreDictStorageBus) c ).saveOreMatch( this.Value );
-				}
-				if( this.Name.equals( "OreDictStorageBus.getRegex" ) )
-				{
-					( (ContainerOreDictStorageBus) c ).sendRegex();
-				}
-			}
-		}
 		else if( this.Name.startsWith( "CellWorkbench." ) && c instanceof ContainerCellWorkbench )
 		{
 			final ContainerCellWorkbench ccw = (ContainerCellWorkbench) c;
@@ -385,14 +290,6 @@ public class PacketValueConfig extends AppEngPacket
 				( (GuiCraftingCPU) gs ).clearItems();
 			}
 		}
-		else if( this.Name.equals( "OreDictStorageBus.sendRegex" ) )
-		{
-			final GuiScreen gs = Minecraft.getMinecraft().currentScreen;
-			if( gs instanceof GuiOreDictStorageBus )
-			{
-				( (GuiOreDictStorageBus) gs ).fillRegex( this.Value );
-			}
-		}
 		else if( c instanceof IConfigurableObject )
 		{
 			final IConfigManager cm = ( (IConfigurableObject) c ).getConfigManager();
@@ -19,6 +19,15 @@
 package appeng.crafting;


+import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
+
+import com.google.common.base.Stopwatch;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.networking.IGrid;
@@ -27,6 +36,7 @@ import appeng.api.networking.IGridNode;
 import appeng.api.networking.crafting.ICraftingCallback;
 import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.networking.crafting.ICraftingJob;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.networking.security.IActionHost;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IStorageGrid;
@@ -36,64 +46,56 @@ import appeng.api.storage.data.IItemList;
 import appeng.api.util.DimensionalCoord;
 import appeng.core.AELog;
 import appeng.hooks.TickHandler;
-import appeng.me.cache.GridStorageCache;
-import com.google.common.base.Stopwatch;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;


 public class CraftingJob implements Runnable, ICraftingJob
 {
-	private static final String LOG_CRAFTING_JOB = "CraftingJob (%s) issued by %s requesting [%s] using %s bytes took %s us";
+	private static final String LOG_CRAFTING_JOB = "CraftingJob (%s) issued by %s requesting [%s] using %s bytes took %s ms";
 	private static final String LOG_MACHINE_SOURCE_DETAILS = "Machine[object=%s, %s]";

 	private final MECraftingInventory original;
 	private final World world;
 	private final IItemList<IAEItemStack> crafting = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 	private final IItemList<IAEItemStack> missing = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-	private final IItemList<IAEItemStack> neededForLoop = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-	private final Object2ObjectOpenHashMap<CraftingTreeNode, IAEItemStack> reserved = new Object2ObjectOpenHashMap<>();
-
 	private final HashMap<String, TwoIntegers> opsAndMultiplier = new HashMap<>();
 	private final Object monitor = new Object();
-	private final Stopwatch tickSpreadingWatch = Stopwatch.createUnstarted();
-	private final Stopwatch craftingTreeWatch = Stopwatch.createUnstarted();
-	private final IAEItemStack output;
-	private final IActionSource actionSrc;
-	private final ICraftingCallback callback;
+	private final Stopwatch watch = Stopwatch.createUnstarted();
 	private CraftingTreeNode tree;
+	private final IAEItemStack output;
 	private boolean simulate = false;
 	private MECraftingInventory availableCheck;
 	private long bytes = 0;
+	private final IActionSource actionSrc;
+	private final ICraftingCallback callback;
 	private boolean running = false;
 	private boolean done = false;
-	private int time;
-	private int incTime;
+	private int time = 5;
+	private int incTime = Integer.MAX_VALUE;
+
+	private World wrapWorld( final World w )
+	{
+		return w;
+	}

 	public CraftingJob( final World w, final IGrid grid, final IActionSource actionSrc, final IAEItemStack what, final ICraftingCallback callback )
 	{
-		this.world = w;
+		this.world = this.wrapWorld( w );
 		this.output = what.copy();
 		this.actionSrc = actionSrc;

 		this.callback = callback;
+		final ICraftingGrid cc = grid.getCache( ICraftingGrid.class );
+		final IStorageGrid sg = grid.getCache( IStorageGrid.class );
+		this.original = new MECraftingInventory( sg
+				.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );

-		ICraftingGrid cc = grid.getCache( ICraftingGrid.class );
-		final GridStorageCache sg = grid.getCache( IStorageGrid.class );
-		this.original = sg.getExtractableList( actionSrc );
-
-		this.availableCheck = new MECraftingInventory( this.original, false, false, false );
 		this.setTree( this.getCraftingTree( cc, what ) );
 		this.availableCheck = null;
 	}

 	private CraftingTreeNode getCraftingTree( final ICraftingGrid cc, final IAEItemStack what )
 	{
-		return new CraftingTreeNode( cc, this, what, what.getStackSize(), null, -1 );
+		return new CraftingTreeNode( cc, this, what, null, -1, 0 );
 	}

 	void refund( final IAEItemStack o )
@@ -106,12 +108,12 @@ public class CraftingJob implements Runnable, ICraftingJob
 		return this.availableCheck.extractItems( available, Actionable.MODULATE, this.actionSrc );
 	}

-	IAEItemStack checkAvailable( final IAEItemStack available )
+	public void writeToNBT( final NBTTagCompound out )
 	{
-		return this.availableCheck.extractItems( available, Actionable.SIMULATE, this.actionSrc );
+
 	}

-	void addTask( IAEItemStack what, final long crafts )
+	void addTask( IAEItemStack what, final long crafts, final ICraftingPatternDetails details, final int depth )
 	{
 		if( crafts > 0 )
 		{
@@ -127,22 +129,6 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.missing.add( what );
 	}

-	public void reserve( CraftingTreeNode node, IAEItemStack stack )
-	{
-		this.checkUse( stack );
-		reserved.put( node, stack );
-	}
-
-	public IItemList<IAEItemStack> getNeededForLoop()
-	{
-		return neededForLoop;
-	}
-
-	public Object2ObjectOpenHashMap<CraftingTreeNode, IAEItemStack> getReserved()
-	{
-		return reserved;
-	}
-
 	@Override
 	public void run()
 	{
@@ -153,15 +139,13 @@ public class CraftingJob implements Runnable, ICraftingJob
 				TickHandler.INSTANCE.registerCraftingSimulation( this.world, this );
 				this.handlePausing();

+				final Stopwatch timer = Stopwatch.createStarted();
+
 				final MECraftingInventory craftingInventory = new MECraftingInventory( this.original, true, false, true );
+				craftingInventory.ignore( this.output );

 				this.availableCheck = new MECraftingInventory( this.original, false, false, false );
-				this.reserved.values().forEach( availableCheck::reserve );
-				this.reserved.values().forEach( craftingInventory::reserve );
-
-				craftingTreeWatch.start();
 				this.getTree().request( craftingInventory, this.output.getStackSize(), this.actionSrc );
-				craftingTreeWatch.stop();
 				this.getTree().dive( this );

 				for( final String s : this.opsAndMultiplier.keySet() )
@@ -170,14 +154,9 @@ public class CraftingJob implements Runnable, ICraftingJob
 					AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) );
 				}

-				if( actionSrc.player().isPresent() )
-				{
-					this.logCraftingJob( "simulated, success", craftingTreeWatch );
-				}
-				else
-				{
-					this.logCraftingJob( "real, success", craftingTreeWatch );
-				}
+				this.logCraftingJob( "real", timer );
+				// if ( mode == Actionable.MODULATE )
+				// craftingInventory.moveItemsToStorage( storage );
 			}
 			catch( final CraftBranchFailure e )
 			{
@@ -185,32 +164,23 @@ public class CraftingJob implements Runnable, ICraftingJob

 				try
 				{
-					if( actionSrc.player().isPresent() )
+					final Stopwatch timer = Stopwatch.createStarted();
+					final MECraftingInventory craftingInventory = new MECraftingInventory( this.original, true, false, true );
+					craftingInventory.ignore( this.output );
+
+					this.availableCheck = new MECraftingInventory( this.original, false, false, false );
+
+					this.getTree().setSimulate();
+					this.getTree().request( craftingInventory, this.output.getStackSize(), this.actionSrc );
+					this.getTree().dive( this );
+
+					for( final String s : this.opsAndMultiplier.keySet() )
 					{
-						final MECraftingInventory craftingInventory = new MECraftingInventory( this.original, true, false, true );
-						this.getTree().setSimulate();
-
-						this.availableCheck = new MECraftingInventory( this.original, false, false, false );
-						this.reserved.values().forEach( availableCheck::reserve );
-						this.reserved.values().forEach( craftingInventory::reserve );
-
-						craftingTreeWatch.reset().start();
-						this.getTree().request( craftingInventory, this.output.getStackSize(), this.actionSrc );
-						craftingTreeWatch.stop();
-						this.getTree().dive( this );
-
-						for( final String s : this.opsAndMultiplier.keySet() )
-						{
-							final TwoIntegers ti = this.opsAndMultiplier.get( s );
-							AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) );
-						}
-
-						this.logCraftingJob( "simulated, failed", craftingTreeWatch );
-					}
-					else
-					{
-						this.logCraftingJob( "real, failed", craftingTreeWatch );
+						final TwoIntegers ti = this.opsAndMultiplier.get( s );
+						AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) );
 					}
+
+					this.logCraftingJob( "simulate", timer );
 				}
 				catch( final CraftBranchFailure e1 )
 				{
@@ -251,16 +221,16 @@ public class CraftingJob implements Runnable, ICraftingJob

 	void handlePausing() throws InterruptedException
 	{
-		if( !this.actionSrc.player().isPresent() && this.incTime > 100 )
+		if( this.incTime > 100 )
 		{
 			this.incTime = 0;
-			synchronized ( this.monitor )
+
+			synchronized( this.monitor )
 			{
-				if( this.tickSpreadingWatch.elapsed( TimeUnit.MICROSECONDS ) > this.time )
+				if( this.watch.elapsed( TimeUnit.MICROSECONDS ) > this.time )
 				{
 					this.running = false;
-					this.craftingTreeWatch.stop();
-					this.tickSpreadingWatch.stop();
+					this.watch.stop();
 					this.monitor.notify();
 				}

@@ -268,7 +238,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 				{
 					AELog.craftingDebug( "crafting job will now sleep" );

-					while ( !this.running )
+					while( !this.running )
 					{
 						this.monitor.wait();
 					}
@@ -276,13 +246,12 @@ public class CraftingJob implements Runnable, ICraftingJob
 					AELog.craftingDebug( "crafting job now active" );
 				}
 			}
-		}

-		if( Thread.interrupted() )
-		{
-			throw new InterruptedException();
+			if( Thread.interrupted() )
+			{
+				throw new InterruptedException();
+			}
 		}
-
 		this.incTime++;
 	}

@@ -295,7 +264,7 @@ public class CraftingJob implements Runnable, ICraftingJob

 		this.availableCheck = null;

-		synchronized ( this.monitor )
+		synchronized( this.monitor )
 		{
 			this.running = false;
 			this.done = true;
@@ -341,25 +310,43 @@ public class CraftingJob implements Runnable, ICraftingJob
 	}

 	/**
+	 * returns true if this needs more simulation.
+	 *
+	 * @param milli milliseconds of simulation
+	 *
 	 * @return true if this needs more simulation
 	 */
 	public boolean simulateFor( final int milli )
 	{
 		this.time = milli;

-		synchronized ( this.monitor )
+		synchronized( this.monitor )
 		{
 			if( this.done )
 			{
 				return false;
 			}
-			if( !this.actionSrc.player().isPresent() )
-			{
-				this.tickSpreadingWatch.reset();
-				this.tickSpreadingWatch.start();
-				this.monitor.notify();
-			}
+
+			this.watch.reset();
+			this.watch.start();
 			this.running = true;
+
+			AELog.craftingDebug( "main thread is now going to sleep" );
+
+			this.monitor.notify();
+
+			while( this.running )
+			{
+				try
+				{
+					this.monitor.wait();
+				}
+				catch( final InterruptedException ignored )
+				{
+				}
+			}
+
+			AELog.craftingDebug( "main thread is now active" );
 		}

 		return true;
@@ -385,7 +372,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 		if( AELog.isCraftingLogEnabled() )
 		{
 			final String itemToOutput = this.output.toString();
-			final long elapsedTime = timer.elapsed( TimeUnit.MICROSECONDS );
+			final long elapsedTime = timer.elapsed( TimeUnit.MILLISECONDS );
 			final String actionSource;

 			if( this.actionSrc.player().isPresent() )
@@ -19,6 +19,14 @@
 package appeng.crafting;


+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import net.minecraft.world.World;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
@@ -28,22 +36,9 @@ import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInformPlayer;
 import appeng.me.cluster.implementations.CraftingCPUCluster;
-import appeng.util.Platform;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.Optional;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;


-@Optional.Interface( iface = "gregtech.api.items.IToolItem", modid = "gregtech" )
 public class CraftingTreeNode
 {

@@ -58,20 +53,22 @@ public class CraftingTreeNode
 	private final IAEItemStack what;
 	// what are the crafting patterns for this?
 	private final ArrayList<CraftingTreeProcess> nodes = new ArrayList<>();
-	private final boolean canEmit;
-	private CraftingTreeNode loopHead;
 	private int bytes = 0;
+	private boolean canEmit = false;
 	private long missing = 0;
 	private long howManyEmitted = 0;
 	private boolean exhausted = false;

-	public CraftingTreeNode( final ICraftingGrid cc, final CraftingJob job, final IAEItemStack wat, long amount, final CraftingTreeProcess par, final int slot )
+	private boolean sim;
+
+	public CraftingTreeNode( final ICraftingGrid cc, final CraftingJob job, final IAEItemStack wat, final CraftingTreeProcess par, final int slot, final int depth )
 	{
 		this.what = wat;
 		this.parent = par;
 		this.slot = slot;
 		this.world = job.getWorld();
 		this.job = job;
+		this.sim = false;

 		this.canEmit = cc.canEmitFor( this.what );

@@ -83,136 +80,79 @@ public class CraftingTreeNode
 		for( final ICraftingPatternDetails details : cc.getCraftingFor( this.what, this.parent == null ? null : this.parent.details, slot, this.world ) )// in
 		// order.
 		{
-			int times = 1;
-			for( IAEItemStack o : details.getCondensedOutputs() )
+			if( this.parent == null || this.parent.notRecursive( details ) )
 			{
-				if( what.equals( o ) )
-				{
-					times = (int) ( amount / o.getStackSize() + ( amount % o.getStackSize() != 0 ? 1 : 0 ) );
-				}
-			}
-
-			if( this.parent == null )
-			{
-				this.nodes.add( new CraftingTreeProcess( cc, job, details, times, this ) );
-				continue;
-			}
-			if( details == parent.details )
-			{
-				continue;
-			}
-			CraftingTreeNode recursive = recursiveNode( this );
-			if( recursive == null )
-			{
-				this.nodes.add( new CraftingTreeProcess( cc, job, details, times, this ) );
-			}
-			else
-			{
-				reserveForNode();
+				this.nodes.add( new CraftingTreeProcess( cc, job, details, this, depth + 1 ) );
 			}
 		}
 	}

-	void reserveForNode()
+	boolean notRecursive( final ICraftingPatternDetails details )
 	{
-		if( this.equals( loopHead ) )
+		IAEItemStack[] o = details.getCondensedOutputs();
+
+		for( final IAEItemStack i : o )
 		{
-			return;
+			if( i.equals( this.what ) )
+			{
+				return false;
+			}
 		}
-		IAEItemStack available = job.checkAvailable( this.what );
-		if( available != null && available.getStackSize() >= this.what.getStackSize() )
+
+		o = details.getCondensedInputs();
+
+		for( final IAEItemStack i : o )
 		{
-			this.job.reserve( this, this.what.copy() );
+			if( i.equals( this.what ) )
+			{
+				return false;
+			}
 		}
-		else
+
+		if( this.parent == null )
 		{
-			parent.reserveForNode();
+			return true;
 		}
+
+		return this.parent.notRecursive( details );
 	}

 	IAEItemStack request( final MECraftingInventory inv, long l, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
 		this.job.handlePausing();
-		if( this.canEmit )
-		{
-			final IAEItemStack wat = this.what.copy();
-			wat.setStackSize( l );
-
-			this.howManyEmitted = wat.getStackSize();
-			this.bytes += wat.getStackSize();
-
-			return wat;
-		}
-
-		final IItemList<IAEItemStack> inventoryList = inv.getItemList();
-
-		IAEItemStack reserved = job.getReserved().get( this );

 		final List<IAEItemStack> thingsUsed = new ArrayList<>();

 		this.what.setStackSize( l );
-
 		if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() )
 		{
-			Collection<IAEItemStack> itemList = new HashSet<>();
+			final Collection<IAEItemStack> itemList;
+			final IItemList<IAEItemStack> inventoryList = inv.getItemList();

-			if( this.what.getItem().isDamageable() || Platform.isGTDamageableItem( this.what.getItem() ) )
+			if( this.parent.details.canSubstitute() )
 			{
-				itemList.addAll( inventoryList.findFuzzy( this.what, FuzzyMode.IGNORE_ALL ) );
-
-				if( this.parent.details.canSubstitute() )
-				{
-					for( IAEItemStack is : inventoryList )
-					{
-						if( is.fuzzyComparison( this.what, FuzzyMode.IGNORE_ALL ) )
-						{
-							itemList.add( is );
-						}
-					}
-				}
+				itemList = inventoryList.findFuzzy( this.what, FuzzyMode.IGNORE_ALL );
 			}
 			else
 			{
+				itemList = Lists.newArrayList();
+
 				final IAEItemStack item = inventoryList.findPrecise( this.what );
+
 				if( item != null )
 				{
 					itemList.add( item );
 				}
-				if( this.parent.details.canSubstitute() )
-				{
-					for( IAEItemStack s : parent.details.getSubstituteInputs( this.slot ) )
-					{
-						if( s != null )
-						{
-							for( IAEItemStack ss : inventoryList.findFuzzy( s, FuzzyMode.IGNORE_ALL ) )
-							{
-								if( ss != null )
-								{
-									itemList.add( ss );
-								}
-							}
-						}
-					}
-				}
 			}

 			for( IAEItemStack fuzz : itemList )
 			{
-				if( this.parent.details.isValidItemForSlot( this.getSlot(), fuzz.getDefinition(), this.world ) )
+				if( this.parent.details.isValidItemForSlot( this.getSlot(), fuzz.copy().setStackSize( 1 ).createItemStack(), this.world ) )
 				{
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( l );

-					final IAEItemStack available;
-
-					if( reserved != null )
-					{
-						available = reserved;
-					}
-					else
-					{
-						available = inv.extractItems( fuzz, Actionable.MODULATE, src );
-					}
+					final IAEItemStack available = inv.extractItems( fuzz, Actionable.MODULATE, src );

 					if( available != null )
 					{
@@ -225,11 +165,6 @@ public class CraftingTreeNode
 								thingsUsed.add( is.copy() );
 								this.used.add( is );
 							}
-							else if( reserved != null )
-							{
-								thingsUsed.add( reserved.copy() );
-								this.used.add( reserved );
-							}
 						}

 						this.bytes += available.getStackSize();
@@ -245,20 +180,7 @@ public class CraftingTreeNode
 		}
 		else
 		{
-			final IAEItemStack available;
-
-			if( parent == null && this.what.equals( job.getOutput() ) )
-			{
-				available = null;
-			}
-			else if( reserved != null )
-			{
-				available = reserved;
-			}
-			else
-			{
-				available = inv.extractItems( this.what, Actionable.MODULATE, src );
-			}
+			final IAEItemStack available = inv.extractItems( this.what, Actionable.MODULATE, src );

 			if( available != null )
 			{
@@ -271,11 +193,6 @@ public class CraftingTreeNode
 						thingsUsed.add( is.copy() );
 						this.used.add( is );
 					}
-					else if( reserved != null )
-					{
-						thingsUsed.add( reserved.copy() );
-						this.used.add( reserved );
-					}
 				}

 				this.bytes += available.getStackSize();
@@ -288,19 +205,31 @@ public class CraftingTreeNode
 			}
 		}

+		if( this.canEmit )
+		{
+			final IAEItemStack wat = this.what.copy();
+			wat.setStackSize( l );
+
+			this.howManyEmitted = wat.getStackSize();
+			this.bytes += wat.getStackSize();
+
+			return wat;
+		}
+
 		this.exhausted = true;

 		if( this.nodes.size() == 1 )
 		{
 			final CraftingTreeProcess pro = this.nodes.get( 0 );

-			while ( pro.possible && l > 0 )
+			while( pro.possible && l > 0 )
 			{
 				final IAEItemStack madeWhat = pro.getAmountCrafted( this.what );

 				pro.request( inv, pro.getTimes( l, madeWhat.getStackSize() ), src );

 				madeWhat.setStackSize( l );
+
 				final IAEItemStack available = inv.extractItems( madeWhat, Actionable.MODULATE, src );

 				if( available != null )
@@ -325,12 +254,10 @@ public class CraftingTreeNode
 			{
 				try
 				{
-					while ( pro.possible && l > 0 )
+					while( pro.possible && l > 0 )
 					{
 						final MECraftingInventory subInv = new MECraftingInventory( inv, true, true, true );
-						final IAEItemStack madeWhat = pro.getAmountCrafted( this.what );
-
-						pro.request( subInv, pro.getTimes( l, madeWhat.getStackSize() ), src );
+						pro.request( subInv, 1, src );

 						this.what.setStackSize( l );
 						final IAEItemStack available = subInv.extractItems( this.what, Actionable.MODULATE, src );
@@ -363,10 +290,10 @@ public class CraftingTreeNode
 			}
 		}

-		if( job.isSimulation() )
+		if( this.sim )
 		{
-			this.bytes += l;
 			this.missing += l;
+			this.bytes += l;
 			final IAEItemStack rv = this.what.copy();
 			rv.setStackSize( l );
 			return rv;
@@ -382,26 +309,6 @@ public class CraftingTreeNode
 		throw new CraftBranchFailure( this.what, l );
 	}

-	CraftingTreeNode recursiveNode( CraftingTreeNode node )
-	{
-		if( this.parent == null )
-		{
-			return null;
-		}
-		if( node != this )
-		{
-			if( node.what.equals( this.what ) )
-			{
-				if( node.what.getStackSize() == this.what.getStackSize() )
-				{
-					loopHead = this;
-					return node;
-				}
-			}
-		}
-		return this.parent.notRecursive( node );
-	}
-
 	void dive( final CraftingJob job )
 	{
 		if( this.missing > 0 )
@@ -410,7 +317,7 @@ public class CraftingTreeNode
 		}
 		// missing = 0;

-		job.addBytes( this.bytes );
+		job.addBytes( 8 + this.bytes );

 		for( final CraftingTreeProcess pro : this.nodes )
 		{
@@ -427,6 +334,7 @@ public class CraftingTreeNode

 	void setSimulate()
 	{
+		this.sim = true;
 		this.missing = 0;
 		this.bytes = 0;
 		this.used.resetStatus();
@@ -446,24 +354,6 @@ public class CraftingTreeNode

 			if( ex == null || ex.getStackSize() != i.getStackSize() )
 			{
-				if( src.player().isPresent() )
-				{
-					try
-					{
-						if( ex == null )
-						{
-							NetworkHandler.instance().sendTo( new PacketInformPlayer( i ), (EntityPlayerMP) src.player().get() );
-						}
-						else
-						{
-							NetworkHandler.instance().sendTo( new PacketInformPlayer( ex, i ), (EntityPlayerMP) src.player().get() );
-						}
-					}
-					catch( IOException e )
-					{
-						e.printStackTrace();
-					}
-				}
 				throw new CraftBranchFailure( i, i.getStackSize() );
 			}

@@ -19,215 +19,253 @@
 package appeng.crafting;


+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+
+import appeng.api.AEApi;
 import appeng.api.config.Actionable;
-import appeng.api.config.FuzzyMode;
 import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.networking.security.IActionSource;
+import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.container.ContainerNull;
 import appeng.me.cluster.implementations.CraftingCPUCluster;
 import appeng.util.Platform;
-import appeng.util.item.AEItemStack;
-import com.google.common.collect.ImmutableCollection;
-import it.unimi.dsi.fastutil.objects.Object2LongArrayMap;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;


 public class CraftingTreeProcess
 {
-	final ICraftingPatternDetails details;
-	private final CraftingTreeNode parent;
-	private final CraftingJob job;
-	private final Object2LongArrayMap<CraftingTreeNode> nodes = new Object2LongArrayMap<>();
-	boolean possible = true;
-	private long crafts = 0;
-	private long bytes = 0;
-	private boolean hasContainerItem = false;

-	public CraftingTreeProcess( final ICraftingGrid cc, final CraftingJob job, final ICraftingPatternDetails details, int times, final CraftingTreeNode craftingTreeNode )
+	private final CraftingTreeNode parent;
+	final ICraftingPatternDetails details;
+	private final CraftingJob job;
+	private final Map<CraftingTreeNode, Long> nodes = new HashMap<>();
+	private final int depth;
+	boolean possible = true;
+	private World world;
+	private long crafts = 0;
+	private boolean containerItems;
+	private boolean limitQty;
+	private boolean fullSimulation;
+	private long bytes = 0;
+
+	public CraftingTreeProcess( final ICraftingGrid cc, final CraftingJob job, final ICraftingPatternDetails details, final CraftingTreeNode craftingTreeNode, final int depth )
 	{
 		this.parent = craftingTreeNode;
 		this.details = details;
 		this.job = job;
-		World world = job.getWorld();
+		this.depth = depth;
+		final World world = job.getWorld();

-		final IAEItemStack[] list = details.getInputs();
-
-		// this is minor different then below, this slot uses the pattern, but kinda fudges it.
-		for( IAEItemStack part : details.getCondensedInputs() )
+		if( details.isCraftable() )
 		{
-			if( part == null )
+			final IAEItemStack[] list = details.getInputs();
+
+			final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
+			final IAEItemStack[] is = details.getInputs();
+			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
-				continue;
+				ic.setInventorySlotContents( x, is[x] == null ? ItemStack.EMPTY : is[x].createItemStack() );
 			}
-			for( int x = 0; x < list.length; x++ )
+
+			FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) world ), details.getOutput( ic, world ), ic );
+
+			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
-				final IAEItemStack comparePart = list[x];
-				if( part.equals( comparePart ) )
+				final ItemStack g = ic.getStackInSlot( x );
+				if( !g.isEmpty() && g.getCount() > 1 )
 				{
-					boolean isPartContainer = false;
-					if( part.getItem().hasContainerItem( part.getDefinition() ) )
+					this.fullSimulation = true;
+				}
+			}
+
+			for( final IAEItemStack part : details.getCondensedInputs() )
+			{
+				final ItemStack g = part.createItemStack();
+
+				boolean isAnInput = false;
+				for( final IAEItemStack a : details.getCondensedOutputs() )
+				{
+					if( !g.isEmpty() && a != null && a.equals( g ) )
 					{
-						part = list[x];
-						isPartContainer = true;
-						this.hasContainerItem = true;
+						isAnInput = true;
 					}
+				}

-					long wantedSize = isPartContainer ? part.getStackSize() : part.getStackSize() * times;
+				if( isAnInput )
+				{
+					this.limitQty = true;
+				}

-					if( details.canSubstitute() && cc.getCraftingFor( part, details, x, world ).isEmpty() )
+				if( g.getItem().hasContainerItem( g ) )
+				{
+					this.limitQty = this.containerItems = true;
+				}
+			}
+
+			final boolean complicated = false;
+
+			if( this.containerItems || complicated )
+			{
+				for( int x = 0; x < list.length; x++ )
+				{
+					final IAEItemStack part = list[x];
+					if( part != null )
 					{
-						for( IAEItemStack subs : details.getSubstituteInputs( x ) )
+						this.nodes.put( new CraftingTreeNode( cc, job, part.copy(), this, x, depth + 1 ), part.getStackSize() );
+					}
+				}
+			}
+			else
+			{
+				// this is minor different then below, this slot uses the pattern, but kinda fudges it.
+				for( final IAEItemStack part : details.getCondensedInputs() )
+				{
+					for( int x = 0; x < list.length; x++ )
+					{
+						final IAEItemStack comparePart = list[x];
+						if( part != null && part.equals( comparePart ) )
 						{
-							if( subs.fuzzyComparison( part, FuzzyMode.IGNORE_ALL ) )
-							{
-								this.nodes.put( new CraftingTreeNode( cc, job, subs.copy(), wantedSize, this, x ), part.getStackSize() / times );
-								wantedSize = 0;
-								break;
-							}
+							// use the first slot...
+							this.nodes.put( new CraftingTreeNode( cc, job, part.copy(), this, x, depth + 1 ), part.getStackSize() );
+							break;
 						}
-						//try to order the crafting of a substitute
-						ICraftingPatternDetails prioritizedPattern = null;
-						IAEItemStack prioritizedIAE = null;
-						for( IAEItemStack subs : details.getSubstituteInputs( x ) )
-						{
-							if( subs.equals( part ) )
-							{
-								continue;
-							}
-							ImmutableCollection<ICraftingPatternDetails> detailCollection = cc.getCraftingFor( subs, details, x, world );
-
-							for( ICraftingPatternDetails sp : detailCollection )
-							{
-								if( prioritizedPattern == null )
-								{
-									prioritizedPattern = sp;
-									prioritizedIAE = subs;
-								}
-								else
-								{
-									if( sp.getPriority() > prioritizedPattern.getPriority() )
-									{
-										prioritizedPattern = sp;
-									}
-								}
-							}
-							if( prioritizedIAE != null )
-							{
-								this.nodes.put( new CraftingTreeNode( cc, job, prioritizedIAE.copy(), wantedSize, this, x ), part.getStackSize() / times );
-								wantedSize = 0;
-								break;
-							}
-						}
-					}
-					if( wantedSize > 0 )
-					{
-						part = part.copy().setStackSize( wantedSize );
-						// use the first slot...
-						this.nodes.put( new CraftingTreeNode( cc, job, part.copy(), wantedSize, this, x ), part.getStackSize() / times );
-						wantedSize = 0;
-					}
-					if( !isPartContainer && wantedSize == 0 )
-					{
-						break;
 					}
 				}
 			}
 		}
+		else
+		{
+			for( final IAEItemStack part : details.getCondensedInputs() )
+			{
+				final ItemStack g = part.createItemStack();
+
+				boolean isAnInput = false;
+				for( final IAEItemStack a : details.getCondensedOutputs() )
+				{
+					if( !g.isEmpty() && a != null && a.equals( g ) )
+					{
+						isAnInput = true;
+					}
+				}
+
+				if( isAnInput )
+				{
+					this.limitQty = true;
+				}
+			}
+
+			for( final IAEItemStack part : details.getCondensedInputs() )
+			{
+				this.nodes.put( new CraftingTreeNode( cc, job, part.copy(), this, -1, depth + 1 ), part.getStackSize() );
+			}
+		}
 	}

-	CraftingTreeNode notRecursive( CraftingTreeNode node )
+	boolean notRecursive( final ICraftingPatternDetails details )
 	{
-		if( parent == null )
-		{
-			return null;
-		}
-		return this.parent.recursiveNode( node );
+		return this.parent == null || this.parent.notRecursive( details );
 	}

 	long getTimes( final long remaining, final long stackSize )
 	{
-		if( hasContainerItem )
+		if( this.limitQty || this.fullSimulation )
 		{
 			return 1;
 		}
 		return ( remaining / stackSize ) + ( remaining % stackSize != 0 ? 1 : 0 );
 	}

-	void request( final MECraftingInventory inv, final long amountOfTimes, final IActionSource src ) throws CraftBranchFailure, InterruptedException
+	void request( final MECraftingInventory inv, final long i, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
 		this.job.handlePausing();
-		List<IAEItemStack> containerItems = null;

-		// request and remove inputs...
-		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
+		if( this.fullSimulation )
 		{
-			final IAEItemStack stack = entry.getKey().request( inv, details.isCraftable() && hasContainerItem ? 1 : entry.getValue() * amountOfTimes, src );
+			final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );

-			if( stack.equals( job.getOutput() ) )
+			for( final Entry<CraftingTreeNode, Long> entry : this.nodes.entrySet() )
 			{
-				job.getNeededForLoop().add( stack.copy() );
+				final IAEItemStack item = entry.getKey().getStack( entry.getValue() );
+				final IAEItemStack stack = entry.getKey().request( inv, item.getStackSize(), src );
+
+				ic.setInventorySlotContents( entry.getKey().getSlot(), stack.createItemStack() );
 			}

-			if( details.isCraftable() && stack.getItem().hasContainerItem( stack.getDefinition() ) )
+			FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.world ), this.details.getOutput( ic, this.world ), ic );
+
+			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
-				final ItemStack is = Platform.getContainerItem( stack.createItemStack() );
-				final IAEItemStack o = AEItemStack.fromItemStack( is );
+				ItemStack is = ic.getStackInSlot( x );
+				is = Platform.getContainerItem( is );
+
+				final IAEItemStack o = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is );
 				if( o != null )
 				{
-					if( containerItems == null )
-					{
-						containerItems = new ArrayList<>();
-					}
 					this.bytes++;
-					o.setCachedItemStack( is );
-					containerItems.add( o );
+					inv.injectItems( o, Actionable.MODULATE, src );
 				}
-				if( containerItems != null )
+			}
+		}
+		else
+		{
+			// request and remove inputs...
+			for( final Entry<CraftingTreeNode, Long> entry : this.nodes.entrySet() )
+			{
+				final IAEItemStack item = entry.getKey().getStack( entry.getValue() );
+				final IAEItemStack stack = entry.getKey().request( inv, item.getStackSize() * i, src );
+
+				if( this.containerItems )
 				{
-					for( IAEItemStack i : containerItems )
+					final ItemStack is = Platform.getContainerItem( stack.createItemStack() );
+					final IAEItemStack o = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is );
+					if( o != null )
 					{
-						inv.injectItems( i, Actionable.MODULATE, src );
+						this.bytes++;
+						inv.injectItems( o, Actionable.MODULATE, src );
 					}
 				}
 			}
 		}

-
 		// assume its possible.

 		// add crafting results..
 		for( final IAEItemStack out : this.details.getCondensedOutputs() )
 		{
 			final IAEItemStack o = out.copy();
-			o.setStackSize( o.getStackSize() * amountOfTimes );
+			o.setStackSize( o.getStackSize() * i );
 			inv.injectItems( o, Actionable.MODULATE, src );
 		}
-		this.crafts += amountOfTimes;
+
+		this.crafts += i;
 	}

 	void dive( final CraftingJob job )
 	{
-		job.addTask( this.getAmountCrafted( this.parent.getStack( 1 ) ), this.crafts );
-		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
+		job.addTask( this.getAmountCrafted( this.parent.getStack( 1 ) ), this.crafts, this.details, this.depth );
+		for( final CraftingTreeNode pro : this.nodes.keySet() )
 		{
-			entry.getKey().dive( job );
+			pro.dive( job );
 		}

-		job.addBytes( this.crafts * 8 + this.bytes );
+		job.addBytes( 8 + this.crafts + this.bytes );
 	}

 	IAEItemStack getAmountCrafted( IAEItemStack what2 )
 	{
 		for( final IAEItemStack is : this.details.getCondensedOutputs() )
 		{
-			if( is.isSameType( what2 ) )
+			if( is.equals( what2 ) )
 			{
 				what2 = what2.copy();
 				what2.setStackSize( is.getStackSize() );
@@ -254,9 +292,9 @@ public class CraftingTreeProcess
 		this.crafts = 0;
 		this.bytes = 0;

-		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
+		for( final CraftingTreeNode pro : this.nodes.keySet() )
 		{
-			entry.getKey().setSimulate();
+			pro.setSimulate();
 		}
 	}

@@ -264,9 +302,9 @@ public class CraftingTreeProcess
 	{
 		craftingCPUCluster.addCrafting( this.details, this.crafts );

-		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
+		for( final CraftingTreeNode pro : this.nodes.keySet() )
 		{
-			entry.getKey().setJob( storage, craftingCPUCluster, src );
+			pro.setJob( storage, craftingCPUCluster, src );
 		}
 	}

@@ -279,14 +317,9 @@ public class CraftingTreeProcess
 			plan.addRequestable( i );
 		}

-		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
+		for( final CraftingTreeNode pro : this.nodes.keySet() )
 		{
-			entry.getKey().getPlan( plan );
+			pro.getPlan( plan );
 		}
 	}
-
-	public void reserveForNode()
-	{
-		parent.reserveForNode();
-	}
 }
@@ -28,13 +28,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInformPlayer;
 import appeng.util.inv.ItemListIgnoreCrafting;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.util.text.TextComponentString;
-
-import java.io.IOException;


 public class MECraftingInventory implements IMEInventory<IAEItemStack>
@@ -101,7 +95,8 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 			this.injectedCache = null;
 		}

-		this.localCache = this.target.getAvailableItems( new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) );
+		this.localCache = this.target
+				.getAvailableItems( new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) );

 		this.par = parent;
 	}
@@ -312,25 +307,8 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>

 				if( result == null || result.getStackSize() != extra.getStackSize() )
 				{
-					if( src.player().isPresent() )
-					{
-						try
-						{
-							if( result == null )
-							{
-								NetworkHandler.instance().sendTo( new PacketInformPlayer( extra ), (EntityPlayerMP) src.player().get() );
-							}
-							else
-							{
-								NetworkHandler.instance().sendTo( new PacketInformPlayer( extra, result ), (EntityPlayerMP) src.player().get() );
-							}
-						}
-						catch( IOException e )
-						{
-							e.printStackTrace();
-						}
-					}
 					failed = true;
+					break;
 				}
 			}
 		}
@@ -361,6 +339,11 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 		return true;
 	}

+	private void addMissing( final IAEItemStack extra )
+	{
+		this.missingCache.add( extra );
+	}
+
 	void ignore( final IAEItemStack what )
 	{
 		final IAEItemStack list = this.localCache.findPrecise( what );
@@ -369,18 +352,4 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 			list.setStackSize( 0 );
 		}
 	}
-
-	void reserve( final IAEItemStack what )
-	{
-		final IAEItemStack list = this.localCache.findPrecise( what );
-		if( list != null )
-		{
-			list.decStackSize( what.getStackSize() );
-		}
-	}
-
-	private void addMissing( final IAEItemStack extra )
-	{
-		this.missingCache.add( extra );
-	}
 }
@@ -21,9 +21,6 @@ package appeng.fluids.client.gui;

 import java.io.IOException;

-import appeng.api.util.IConfigManager;
-import appeng.client.gui.widgets.GuiCustomSlot;
-import appeng.util.IConfigManagerHost;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;

@@ -41,12 +38,11 @@ import appeng.fluids.helper.IFluidInterfaceHost;
 import appeng.fluids.util.IAEFluidTank;


-public class GuiFluidInterface extends GuiUpgradeable implements IConfigManagerHost
+public class GuiFluidInterface extends GuiUpgradeable
 {
 	public final static int ID_BUTTON_TANK = 222;

 	private final IFluidInterfaceHost host;
-	private final ContainerFluidInterface container;
 	private GuiTabButton priority;

 	public GuiFluidInterface( final InventoryPlayer ip, final IFluidInterfaceHost te )
@@ -54,8 +50,6 @@ public class GuiFluidInterface extends GuiUpgradeable implements IConfigManagerH
 		super( new ContainerFluidInterface( ip, te ) );
 		this.ySize = 231;
 		this.host = te;
-		( this.container = (ContainerFluidInterface) this.inventorySlots ).setGui( this );
-
 	}

 	@Override
@@ -68,7 +62,9 @@ public class GuiFluidInterface extends GuiUpgradeable implements IConfigManagerH

 		for( int i = 0; i < DualityFluidInterface.NUMBER_OF_TANKS; ++i )
 		{
-			this.guiSlots.add( new GuiFluidTank( fluidTank, i, DualityFluidInterface.NUMBER_OF_TANKS + i, 36 + 18 * i, 57, 16, 64 ) );
+			final GuiFluidTank guiTank = new GuiFluidTank( fluidTank, i, DualityFluidInterface.NUMBER_OF_TANKS + i, this.getGuiLeft() + 35 + 18 * i, this
+					.getGuiTop() + 53, 16, 68 );
+			this.buttonList.add( guiTank );
 			this.guiSlots.add( new GuiFluidSlot( configFluids, i, i, 35 + 18 * i, 35 ) );
 		}

@@ -108,33 +104,9 @@ public class GuiFluidInterface extends GuiUpgradeable implements IConfigManagerH
 		}
 	}

-	@Override
-	protected void mouseClicked( int xCoord, int yCoord, int btn ) throws IOException
-	{
-		for( GuiCustomSlot slot : this.guiSlots )
-		{
-			if( slot instanceof GuiFluidTank )
-			{
-				if( this.isPointInRegion( slot.xPos(), slot.yPos(), slot.getWidth(), slot.getHeight(), xCoord, yCoord ) && slot.canClick( this.mc.player ) )
-				{
-					this.container.setTargetStack( ( (GuiFluidTank) slot ).getFluidStack() );
-					slot.slotClicked( this.mc.player.inventory.getItemStack(), btn );
-					return;
-				}
-			}
-		}
-		super.mouseClicked( xCoord, yCoord, btn );
-	}
-
 	@Override
 	protected boolean drawUpgrades()
 	{
 		return false;
 	}
-
-	@Override
-	public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
-	{
-
-	}
 }
@@ -90,13 +90,6 @@ public class GuiFluidLevelEmitter extends GuiUpgradeable
 		this.level.drawTextBox();
 	}

-	@Override
-	public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
-	{
-		if( isPointInRegion( 24, 43,89,this.fontRenderer.FONT_HEIGHT,mouseX,mouseY ) ) drawTooltip( mouseX - guiLeft - 7, mouseY - guiTop + 25, "Amount in millibuckets" );
-		super.drawFG( offsetX, offsetY, mouseX, mouseY );
-	}
-
 	@Override
 	protected boolean drawUpgrades()
 	{
@@ -4,7 +4,6 @@ package appeng.fluids.client.gui.widgets;

 import java.util.Collections;

-import appeng.container.slot.IJEITargetSlot;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -24,7 +23,7 @@ import appeng.fluids.util.AEFluidStack;
 import appeng.fluids.util.IAEFluidTank;


-public class GuiFluidSlot extends GuiCustomSlot implements IJEITargetSlot
+public class GuiFluidSlot extends GuiCustomSlot
 {
 	private final IAEFluidTank fluids;
 	private final int slot;
@@ -19,50 +19,42 @@
 package appeng.fluids.client.gui.widgets;


-import appeng.client.gui.widgets.GuiCustomSlot;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.helpers.InventoryAction;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

 import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.util.AEColor;
 import appeng.client.gui.widgets.ITooltip;
 import appeng.fluids.util.IAEFluidTank;


@SideOnly( Side.CLIENT )
-public class GuiFluidTank extends GuiCustomSlot implements ITooltip
+public class GuiFluidTank extends GuiButton implements ITooltip
 {
 	private final IAEFluidTank tank;
 	private final int slot;
-	private final int width;
-	private final int height;

 	public GuiFluidTank( IAEFluidTank tank, int slot, int id, int x, int y, int w, int h )
 	{
-		super( id, x, y );
+		super( id, x, y, w, h, "" );
 		this.tank = tank;
 		this.slot = slot;
-		this.width = w;
-		this.height = h;
 	}

 	@Override
-	public void drawContent( Minecraft mc, int mouseX, int mouseY, float partialTicks )
+	public void drawButton( final Minecraft mc, final int mouseX, final int mouseY, final float partialTicks )
 	{
-		final IAEFluidStack fs = this.getFluidStack();
-		if( fs != null )
+		if( this.visible )
 		{
 			GlStateManager.disableBlend();
 			GlStateManager.disableLighting();

-			//drawRect( this.x, this.y, this.x + this.width, this.y + this.height, AEColor.GRAY.blackVariant | 0xFF000000 );
+			drawRect( this.x, this.y, this.x + this.width, this.y + this.height, AEColor.GRAY.blackVariant | 0xFF000000 );

 			final IAEFluidStack fluid = this.tank.getFluidInSlot( this.slot );
 			if( fluid != null && fluid.getStackSize() > 0 )
@@ -80,13 +72,14 @@ public class GuiFluidTank extends GuiCustomSlot implements ITooltip
 				int iconHeightRemainder = scaledHeight % 16;
 				if( iconHeightRemainder > 0 )
 				{
-					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder, sprite, 16, iconHeightRemainder );
+					this.drawTexturedModalRect( this.x, this.y + this.height - iconHeightRemainder, sprite, 16, iconHeightRemainder );
 				}
 				for( int i = 0; i < scaledHeight / 16; i++ )
 				{
-					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder - ( i + 1 ) * 16, sprite, 16, 16 );
+					this.drawTexturedModalRect( this.x, this.y + this.height - iconHeightRemainder - ( i + 1 ) * 16, sprite, 16, 16 );
 				}
 			}
+
 		}
 	}

@@ -107,19 +100,19 @@ public class GuiFluidTank extends GuiCustomSlot implements ITooltip
 	@Override
 	public int xPos()
 	{
-		return this.x - 1;
+		return this.x - 2;
 	}

 	@Override
 	public int yPos()
 	{
-		return this.y - 4;
+		return this.y - 2;
 	}

 	@Override
 	public int getWidth()
 	{
-		return this.width;
+		return this.width + 4;
 	}

 	@Override
@@ -134,24 +127,4 @@ public class GuiFluidTank extends GuiCustomSlot implements ITooltip
 		return true;
 	}

-	public IAEFluidStack getFluidStack()
-	{
-		return this.tank.getFluidInSlot( this.slot );
-	}
-
-	@Override
-	public void slotClicked( ItemStack clickStack, final int mouseButton )
-	{
-
-		if( getFluidStack() != null )
-		{
-			NetworkHandler.instance().sendToServer( new PacketInventoryAction( InventoryAction.FILL_ITEM, slot, 0 ) );
-		}
-		else
-		{
-			NetworkHandler.instance().sendToServer( new PacketInventoryAction( InventoryAction.EMPTY_ITEM, slot, 0 ) );
-		}
-
-	}
-
 }
@@ -19,17 +19,9 @@
 package appeng.fluids.container;


-import javax.annotation.Nonnull;
-
 import java.util.Collections;
 import java.util.Map;

-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketTargetFluidStack;
-import appeng.fluids.util.AEFluidStack;
-import appeng.helpers.InventoryAction;
-import appeng.util.IConfigManagerHost;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IContainerListener;

@@ -41,19 +33,12 @@ import appeng.fluids.helper.FluidSyncHelper;
 import appeng.fluids.helper.IFluidInterfaceHost;
 import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidUtil;
-import net.minecraftforge.fluids.capability.IFluidHandlerItem;


-public class ContainerFluidInterface extends ContainerFluidConfigurable implements IConfigManagerHost
+public class ContainerFluidInterface extends ContainerFluidConfigurable
 {
 	private final DualityFluidInterface myDuality;
 	private final FluidSyncHelper tankSync;
-	private IConfigManagerHost gui;
-	// Holds the fluid the client wishes to extract, or null for insert
-	private IAEFluidStack clientRequestedTargetFluid = null;

 	public ContainerFluidInterface( final InventoryPlayer ip, final IFluidInterfaceHost te )
 	{
@@ -75,15 +60,6 @@ public class ContainerFluidInterface extends ContainerFluidConfigurable implemen
 		return this.myDuality.getConfig();
 	}

-	@Override
-	public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
-	{
-		if( this.getGui() != null )
-		{
-			this.getGui().updateSetting( manager, settingName, newValue );
-		}
-	}
-
 	@Override
 	public void detectAndSendChanges()
 	{
@@ -121,126 +97,6 @@ public class ContainerFluidInterface extends ContainerFluidConfigurable implemen
 		this.tankSync.readPacket( fluids );
 	}

-	private IConfigManagerHost getGui()
-	{
-		return this.gui;
-	}
-
-	public void setGui( @Nonnull final IConfigManagerHost gui )
-	{
-		this.gui = gui;
-	}
-
-	public void doAction( EntityPlayerMP player, InventoryAction action, int slot, long id )
-	{
-		if( action != InventoryAction.FILL_ITEM && action != InventoryAction.EMPTY_ITEM )
-		{
-			super.doAction( player, action, slot, id );
-			return;
-		}
-
-		final ItemStack held = player.inventory.getItemStack();
-		ItemStack heldCopy = held.copy();
-		heldCopy.setCount( 1 );
-		IFluidHandlerItem fh = FluidUtil.getFluidHandler( heldCopy );
-		if( fh == null )
-		{
-			// only fluid handlers items
-			return;
-		}
-
-		if( action == InventoryAction.FILL_ITEM && this.clientRequestedTargetFluid != null )
-		{
-			final IAEFluidStack stack = this.clientRequestedTargetFluid.copy();
-
-			// Check how much we can store in the item
-			stack.setStackSize( Integer.MAX_VALUE );
-			int amountAllowed = fh.fill( stack.getFluidStack(), false );
-			int heldAmount = held.getCount();
-			for( int i = 0; i < heldAmount; i++ )
-			{
-				ItemStack copiedFluidContainer = held.copy();
-				copiedFluidContainer.setCount( 1 );
-				fh = FluidUtil.getFluidHandler( copiedFluidContainer );
-
-				FluidStack extractableFluid = this.myDuality.getTanks().drain( stack.setStackSize( amountAllowed ).getFluidStack(), false );
-				if( extractableFluid == null || extractableFluid.amount == 0 )
-				{
-					break;
-				}
-
-				int fillableAmount = fh.fill( extractableFluid, false );
-				if( fillableAmount > 0 )
-				{
-					FluidStack extractedFluid = this.myDuality.getTanks().drain( extractableFluid, true );
-					fh.fill( extractedFluid, true );
-				}
-
-				if( held.getCount() == 1 )
-				{
-					player.inventory.setItemStack( fh.getContainer() );
-				}
-				else
-				{
-					player.inventory.getItemStack().shrink( 1 );
-					if( !player.inventory.addItemStackToInventory( fh.getContainer() ) )
-					{
-						player.dropItem( fh.getContainer(), false );
-					}
-				}
-			}
-		}
-		else if( action == InventoryAction.EMPTY_ITEM )
-		{
-			int heldAmount = held.getCount();
-			for( int i = 0; i < heldAmount; i++ )
-			{
-				ItemStack copiedFluidContainer = held.copy();
-				copiedFluidContainer.setCount( 1 );
-				fh = FluidUtil.getFluidHandler( copiedFluidContainer );
-
-				FluidStack drainable = fh.drain( this.myDuality.getTanks().getTankProperties()[slot].getCapacity(), false );
-				if( drainable != null )
-				{
-					fh.drain( drainable, true );
-					this.myDuality.getTanks().fill( drainable, true );
-				}
-
-				if( held.getCount() == 1 )
-				{
-					player.inventory.setItemStack( fh.getContainer() );
-				}
-				else
-				{
-					player.inventory.getItemStack().shrink( 1 );
-					if( !player.inventory.addItemStackToInventory( fh.getContainer() ) )
-					{
-						player.dropItem( fh.getContainer(), false );
-					}
-				}
-			}
-		}
-		this.updateHeld( player );
-	}
-
-	public void setTargetStack( final IAEFluidStack stack )
-	{
-		if( Platform.isClient() )
-		{
-			if( stack == null && this.clientRequestedTargetFluid == null )
-			{
-				return;
-			}
-			if( stack != null && this.clientRequestedTargetFluid != null && stack.getFluidStack().isFluidEqual( this.clientRequestedTargetFluid.getFluidStack() ) )
-			{
-				return;
-			}
-			NetworkHandler.instance().sendToServer( new PacketTargetFluidStack( (AEFluidStack) stack ) );
-		}
-
-		this.clientRequestedTargetFluid = stack == null ? null : stack.copy();
-	}
-
 	@Override
 	protected boolean supportCapacity()
 	{
@@ -24,9 +24,6 @@ import java.nio.BufferOverflowException;

 import javax.annotation.Nonnull;

-import appeng.container.slot.AppEngSlot;
-import appeng.container.slot.SlotPlayerHotBar;
-import appeng.container.slot.SlotPlayerInv;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -73,7 +70,6 @@ import appeng.me.helpers.ChannelPowerSrc;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import net.minecraftforge.items.IItemHandler;


 /**
@@ -346,89 +342,6 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 		}
 	}

-	@Override
-	public ItemStack transferStackInSlot( final EntityPlayer p, final int idx )
-	{
-		if( Platform.isClient() )
-		{
-			return ItemStack.EMPTY;
-		}
-		EntityPlayerMP player = (EntityPlayerMP) p;
-		if( this.inventorySlots.get( idx ) instanceof SlotPlayerInv || this.inventorySlots.get( idx ) instanceof SlotPlayerHotBar )
-		{
-			final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots!
-			ItemStack itemStack = clickSlot.getStack();
-
-			ItemStack copy = itemStack.copy();
-			copy.setCount( 1 );
-			IFluidHandlerItem fh = FluidUtil.getFluidHandler( copy );
-			if( fh == null )
-			{
-				// only fluid handlers items
-				return ItemStack.EMPTY;
-			}
-
-			int heldAmount = itemStack.getCount();
-			for( int i = 0; i < heldAmount; i++ )
-			{
-				copy = itemStack.copy();
-				copy.setCount( 1 );
-				fh = FluidUtil.getFluidHandler( copy );
-
-				final FluidStack extract = fh.drain( Integer.MAX_VALUE, false );
-				if( extract == null || extract.amount < 1 )
-				{
-					return ItemStack.EMPTY;
-				}
-
-				// Check if we can push into the system
-				final IAEFluidStack notStorable = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ), this.getActionSource(), Actionable.SIMULATE );
-
-				if( notStorable != null && notStorable.getStackSize() > 0 )
-				{
-					final int toStore = (int) ( extract.amount - notStorable.getStackSize() );
-					final FluidStack storable = fh.drain( toStore, false );
-
-					if( storable == null || storable.amount == 0 )
-					{
-						return ItemStack.EMPTY;
-					}
-					else
-					{
-						extract.amount = storable.amount;
-					}
-				}
-
-				// Actually drain
-				final FluidStack drained = fh.drain( extract, true );
-				extract.amount = drained.amount;
-
-				final IAEFluidStack notInserted = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ), this.getActionSource() );
-
-				if( notInserted != null && notInserted.getStackSize() > 0 )
-				{
-					IAEFluidStack spill = this.monitor.injectItems( notInserted, Actionable.MODULATE, this.getActionSource() );
-					if( spill != null && spill.getStackSize() > 0 )
-					{
-						fh.fill( spill.getFluidStack(), true );
-					}
-				}
-
-				if( notInserted == null || notInserted.getStackSize() == 0 )
-				{
-					if( !player.inventory.addItemStackToInventory( fh.getContainer() ) )
-					{
-						player.dropItem( fh.getContainer(), false );
-					}
-					clickSlot.decrStackSize( 1 );
-				}
-			}
-			this.detectAndSendChanges();
-			return ItemStack.EMPTY;
-		}
-		return super.transferStackInSlot( p, idx );
-	}
-
 	@Override
 	public void doAction( EntityPlayerMP player, InventoryAction action, int slot, long id )
 	{
@@ -439,9 +352,13 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 		}

 		final ItemStack held = player.inventory.getItemStack();
-		ItemStack heldCopy = held.copy();
-		heldCopy.setCount( 1 );
-		IFluidHandlerItem fh = FluidUtil.getFluidHandler( heldCopy );
+		if( held.getCount() != 1 )
+		{
+			// only support stacksize 1 for now
+			return;
+		}
+
+		final IFluidHandlerItem fh = FluidUtil.getFluidHandler( held );
 		if( fh == null )
 		{
 			// only fluid handlers items
@@ -455,122 +372,84 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 			// Check how much we can store in the item
 			stack.setStackSize( Integer.MAX_VALUE );
 			int amountAllowed = fh.fill( stack.getFluidStack(), false );
-			int heldAmount = held.getCount();
-			for( int i = 0; i < heldAmount; i++ )
+			stack.setStackSize( amountAllowed );
+
+			// Check if we can pull out of the system
+			final IAEFluidStack canPull = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack, this.getActionSource(), Actionable.SIMULATE );
+			if( canPull == null || canPull.getStackSize() < 1 )
 			{
-				ItemStack copiedFluidContainer = held.copy();
-				copiedFluidContainer.setCount( 1 );
-				fh = FluidUtil.getFluidHandler( copiedFluidContainer );
-
-				// Check if we can pull out of the system
-				final IAEFluidStack canPull = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack.setStackSize( amountAllowed ), this.getActionSource(), Actionable.SIMULATE );
-				if( canPull == null || canPull.getStackSize() < 1 )
-				{
-					return;
-				}
-
-				// How much could fit into the container
-				final int canFill = fh.fill( canPull.getFluidStack(), false );
-				if( canFill == 0 )
-				{
-					return;
-				}
-
-				// Now actually pull out of the system
-				final IAEFluidStack pulled = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack.setStackSize( canFill ), this.getActionSource() );
-				if( pulled == null || pulled.getStackSize() < 1 )
-				{
-					// Something went wrong
-					AELog.error( "Unable to pull fluid out of the ME system even though the simulation said yes " );
-					return;
-				}
-
-				// Actually fill
-				final int used = fh.fill( pulled.getFluidStack(), true );
-
-				if( used != canFill )
-				{
-					AELog.error( "Fluid item [%s] reported a different possible amount than it actually accepted.", held.getDisplayName() );
-				}
-
-				if( held.getCount() == 1 )
-				{
-					player.inventory.setItemStack( fh.getContainer() );
-				}
-				else
-				{
-					player.inventory.getItemStack().shrink( 1 );
-					if( !player.inventory.addItemStackToInventory( fh.getContainer() ) )
-					{
-						player.dropItem( fh.getContainer(), false );
-					}
-				}
+				return;
 			}
-			this.updateHeld( player );

+			// How much could fit into the container
+			final int canFill = fh.fill( canPull.getFluidStack(), false );
+			if( canFill == 0 )
+			{
+				return;
+			}
+
+			// Now actually pull out of the system
+			stack.setStackSize( canFill );
+			final IAEFluidStack pulled = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack, this.getActionSource() );
+			if( pulled == null || pulled.getStackSize() < 1 )
+			{
+				// Something went wrong
+				AELog.error( "Unable to pull fluid out of the ME system even though the simulation said yes " );
+				return;
+			}
+
+			// Actually fill
+			final int used = fh.fill( pulled.getFluidStack(), true );
+
+			if( used != canFill )
+			{
+				AELog.error( "Fluid item [%s] reported a different possible amount than it actually accepted.", held.getDisplayName() );
+			}
+
+			player.inventory.setItemStack( fh.getContainer() );
+			this.updateHeld( player );
 		}
 		else if( action == InventoryAction.EMPTY_ITEM )
 		{
-			int heldAmount = held.getCount();
-			for( int i = 0; i < heldAmount; i++ )
+			// See how much we can drain from the item
+			final FluidStack extract = fh.drain( Integer.MAX_VALUE, false );
+			if( extract == null || extract.amount < 1 )
 			{
-				ItemStack copiedFluidContainer = held.copy();
-				copiedFluidContainer.setCount( 1 );
-				fh = FluidUtil.getFluidHandler( copiedFluidContainer );
+				return;
+			}

-				// See how much we can drain from the item
-				final FluidStack extract = fh.drain( Integer.MAX_VALUE, false );
-				if( extract == null || extract.amount < 1 )
+			// Check if we can push into the system
+			final IAEFluidStack notStorable = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ),
+					this.getActionSource(), Actionable.SIMULATE );
+
+			if( notStorable != null && notStorable.getStackSize() > 0 )
+			{
+				final int toStore = (int) ( extract.amount - notStorable.getStackSize() );
+				final FluidStack storable = fh.drain( toStore, false );
+
+				if( storable == null || storable.amount == 0 )
 				{
 					return;
 				}
-
-				// Check if we can push into the system
-				final IAEFluidStack notStorable = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ), this.getActionSource(), Actionable.SIMULATE );
-
-				if( notStorable != null && notStorable.getStackSize() > 0 )
-				{
-					final int toStore = (int) ( extract.amount - notStorable.getStackSize() );
-					final FluidStack storable = fh.drain( toStore, false );
-
-					if( storable == null || storable.amount == 0 )
-					{
-						return;
-					}
-					else
-					{
-						extract.amount = storable.amount;
-					}
-				}
-
-				// Actually drain
-				final FluidStack drained = fh.drain( extract, true );
-				extract.amount = drained.amount;
-
-				final IAEFluidStack notInserted = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ), this.getActionSource() );
-
-				if( notInserted != null && notInserted.getStackSize() > 0 )
-				{
-					IAEFluidStack spill = this.monitor.injectItems( notInserted, Actionable.MODULATE, this.getActionSource() );
-					if( spill != null && spill.getStackSize() > 0 )
-					{
-						fh.fill( spill.getFluidStack(), true );
-					}
-				}
-
-				if( held.getCount() == 1 )
-				{
-					player.inventory.setItemStack( fh.getContainer() );
-				}
 				else
 				{
-					player.inventory.getItemStack().shrink( 1 );
-					if( !player.inventory.addItemStackToInventory( fh.getContainer() ) )
-					{
-						player.dropItem( fh.getContainer(), false );
-					}
+					extract.amount = storable.amount;
 				}
 			}
+
+			// Actually drain
+			final FluidStack drained = fh.drain( extract, true );
+			extract.amount = drained.amount;
+
+			final IAEFluidStack notInserted = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ),
+					this.getActionSource() );
+
+			if( notInserted != null && notInserted.getStackSize() > 0 )
+			{
+				AELog.error( "Fluid item [%s] reported a different possible amount to drain than it actually provided.", held.getDisplayName() );
+			}
+
+			player.inventory.setItemStack( fh.getContainer() );
 			this.updateHeld( player );
 		}
 	}
@@ -28,7 +28,6 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.AEApi;
@@ -73,7 +72,7 @@ import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;


-public class DualityFluidInterface implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost, IConfigurableFluidInventory
+public class DualityFluidInterface implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost
 {
 	public static final int NUMBER_OF_TANKS = 6;
 	public static final int TANK_CAPACITY = Fluid.BUCKET_VOLUME * 4;
@@ -91,10 +90,12 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 	private int isWorking = -1;
 	private int priority;

-	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
-	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
-	private boolean resetConfigCache = true;
-	private IMEMonitor<IAEFluidStack> configCachedHandler;
+	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance()
+			.storage()
+			.getStorageChannel( IItemStorageChannel.class ) );
+	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
+			.storage()
+			.getStorageChannel( IFluidStorageChannel.class ) );

 	public DualityFluidInterface( final AENetworkProxy networkProxy, final IFluidInterfaceHost ih )
 	{
@@ -117,7 +118,15 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable

 	public IUpgradeableHost getHost()
 	{
-		return this.iHost;
+		if( this.iHost instanceof IUpgradeableHost )
+		{
+			return this.iHost;
+		}
+		if( this.iHost instanceof IUpgradeableHost )
+		{
+			return this.iHost;
+		}
+		return null;
 	}

 	@Override
@@ -136,12 +145,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
+				return (IMEMonitor<T>) new InterfaceInventory( this );
 			}

 			return (IMEMonitor<T>) this.fluids;
@@ -378,7 +382,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 				{
 					changed = true;
 				}
-				else if( this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ).getStorageList().findPrecise( work ) != null )
+				else
 				{
 					final IAEFluidStack acquired = Platform.poweredExtraction( src, dest, work, this.interfaceRequestSource );
 					if( acquired != null )
@@ -445,13 +449,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable

 		if( inventory == this.config )
 		{
-			boolean cfg = hasConfig();
 			this.readConfig();
-			if( cfg != hasConfig )
-			{
-				resetConfigCache = true;
-				this.notifyNeighbors();
-			}
 		}
 		else if( inventory == this.tanks )
 		{
@@ -556,6 +554,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		InterfaceInventory( final DualityFluidInterface tileInterface )
 		{
 			super( tileInterface.tanks );
+			this.setActionSource( new MachineSource( tileInterface.iHost ) );
 		}

 		@Override
@@ -604,14 +603,6 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		return null;
 	}

-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	@Override
 	public int getInstalledUpgrades( Upgrades u )
 	{
@@ -1,11 +0,0 @@
-package appeng.fluids.helper;
-
-import net.minecraftforge.fluids.capability.IFluidHandler;
-
-public interface IConfigurableFluidInventory
-{
-    default IFluidHandler getFluidInventoryByName( String name )
-    {
-        return null;
-    }
-}
@@ -19,15 +19,13 @@
 package appeng.fluids.parts;


-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;

-import appeng.api.config.AccessRestriction;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.me.GridAccessException;
-import appeng.util.inv.ItemSlot;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -44,6 +42,7 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.fluids.util.AEFluidStack;
+import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;

@@ -62,21 +61,12 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 	private final IFluidHandler fluidHandler;
 	private final IGridProxyable proxyable;
 	private final FluidHandlerAdapter.InventoryCache cache;
-	private StorageFilter mode;
-	private AccessRestriction access;

 	FluidHandlerAdapter( IFluidHandler fluidHandler, IGridProxyable proxy )
 	{
 		this.fluidHandler = fluidHandler;
 		this.proxyable = proxy;
-		if( this.proxyable instanceof PartFluidStorageBus )
-		{
-			PartFluidStorageBus partFluidStorageBus = (PartFluidStorageBus) this.proxyable;
-			this.mode = ( (StorageFilter) partFluidStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
-			this.access = ( (AccessRestriction) partFluidStorageBus.getConfigManager().getSetting( Settings.ACCESS ) );
-		}
-		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler, this.mode );
-		this.cache.update();
+		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler );
 	}

 	@Override
@@ -95,14 +85,11 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo

 		if( type == Actionable.MODULATE )
 		{
-			IAEFluidStack added = input.copy().setStackSize( input.getStackSize() - remaining );
-			this.cache.currentlyCached.add( added );
-			this.postDifference( Collections.singletonList( added ) );
 			try
 			{
 				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
 			}
-			catch( GridAccessException ex )
+			catch( GridAccessException ignore )
 			{
 				// meh
 			}
@@ -127,32 +114,25 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 			return null;
 		}

-		IAEFluidStack gatheredAEFluidstack = AEFluidStack.fromFluidStack( gathered );
 		if( mode == Actionable.MODULATE )
 		{
-			IAEFluidStack cachedStack = this.cache.currentlyCached.findPrecise( request );
-			if( cachedStack != null )
-			{
-				cachedStack.decStackSize( gatheredAEFluidstack.getStackSize() );
-				this.postDifference( Collections.singletonList( gatheredAEFluidstack.copy().setStackSize( -gatheredAEFluidstack.getStackSize() ) ) );
-			}
 			try
 			{
 				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
 			}
-			catch( GridAccessException ex )
+			catch( GridAccessException ignore )
 			{
 				// meh
 			}
 		}
-		return gatheredAEFluidstack;
+		return AEFluidStack.fromFluidStack( gathered );
 	}

 	@Override
 	public TickRateModulation onTick()
 	{
 		List<IAEFluidStack> changes = this.cache.update();
-		if( !changes.isEmpty() && access.hasPermission( AccessRestriction.READ ) )
+		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
 			return TickRateModulation.URGENT;
@@ -213,13 +193,11 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo

 	private static class InventoryCache
 	{
+		private IAEFluidStack[] cachedAeStacks = new IAEFluidStack[0];
 		private final IFluidHandler fluidHandler;
-		private final StorageFilter mode;
-		IItemList<IAEFluidStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();

-		public InventoryCache( IFluidHandler fluidHandler, StorageFilter mode )
+		public InventoryCache( IFluidHandler fluidHandler )
 		{
-			this.mode = mode;
 			this.fluidHandler = fluidHandler;
 		}

@@ -227,46 +205,96 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 		{
 			final List<IAEFluidStack> changes = new ArrayList<>();
 			final IFluidTankProperties[] tankProperties = this.fluidHandler.getTankProperties();
+			final int slots = tankProperties.length;

-			IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
-
-			for( IFluidTankProperties tankProperty : tankProperties )
+			// Make room for new slots
+			if( slots > this.cachedAeStacks.length )
 			{
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && this.fluidHandler.drain( 1, false ) == null )
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
+			}
+
+			for( int slot = 0; slot < slots; slot++ )
+			{
+				// Save the old stuff
+				final IAEFluidStack oldAEFS = this.cachedAeStacks[slot];
+				final FluidStack newFS = tankProperties[slot].getContents();
+
+				this.handlePossibleSlotChanges( slot, oldAEFS, newFS, changes );
+			}
+
+			// Handle cases where the number of slots actually is lower now than before
+			if( slots < this.cachedAeStacks.length )
+			{
+				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
 				{
-					continue;
+					final IAEFluidStack aeStack = this.cachedAeStacks[slot];
+
+					if( aeStack != null )
+					{
+						final IAEFluidStack a = aeStack.copy();
+						a.setStackSize( -a.getStackSize() );
+						changes.add( a );
+					}
 				}
-				currentlyOnStorage.add( AEFluidStack.fromFluidStack( tankProperty.getContents() ) );
+
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
-
-			for ( final IAEFluidStack is : currentlyCached )
-			{
-				is.setStackSize( -is.getStackSize() );
-			}
-
-			for ( final IAEFluidStack is : currentlyOnStorage )
-			{
-				currentlyCached.add( is );
-			}
-
-			for ( final IAEFluidStack is : currentlyCached )
-			{
-				if( is.getStackSize() != 0 )
-				{
-					changes.add( is );
-				}
-			}
-
-			currentlyCached = currentlyOnStorage;
-
 			return changes;
 		}

 		public IItemList<IAEFluidStack> getAvailableItems( IItemList<IAEFluidStack> out )
 		{
-			currentlyCached.iterator().forEachRemaining( out::add );
+			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
 			return out;
 		}

+		private void handlePossibleSlotChanges( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			if( oldAeFS != null && oldAeFS.getFluidStack().isFluidEqual( newFS ) )
+			{
+				this.handleStackSizeChanged( slot, oldAeFS, newFS, changes );
+			}
+			else
+			{
+				this.handleFluidChanged( slot, oldAeFS, newFS, changes );
+			}
+		}
+
+		private void handleStackSizeChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			// Still the same fluid, but amount might have changed
+			final long diff = newFS.amount - oldAeFS.getStackSize();
+
+			if( diff != 0 )
+			{
+				final IAEFluidStack stack = oldAeFS.copy();
+				stack.setStackSize( newFS.amount );
+
+				this.cachedAeStacks[slot] = stack;
+
+				final IAEFluidStack a = stack.copy();
+				a.setStackSize( diff );
+				changes.add( a );
+			}
+		}
+
+		private void handleFluidChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			// Completely different fluid
+			this.cachedAeStacks[slot] = AEFluidStack.fromFluidStack( newFS );
+
+			// If we had a stack previously in this slot, notify the network about its disappearance
+			if( oldAeFS != null )
+			{
+				oldAeFS.setStackSize( -oldAeFS.getStackSize() );
+				changes.add( oldAeFS );
+			}
+
+			// Notify the network about the new stack. Note that this is null if newFS was null
+			if( this.cachedAeStacks[slot] != null )
+			{
+				changes.add( this.cachedAeStacks[slot] );
+			}
+		}
 	}
 }
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.state.IBlockState;
@@ -52,10 +51,9 @@ import appeng.parts.automation.PartAbstractFormationPlane;
 import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
 import appeng.util.prioritylist.PrecisePriorityList;
-import net.minecraftforge.fluids.capability.IFluidHandler;


-public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluidStack> implements IAEFluidInventory, IConfigurableFluidInventory
+public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluidStack> implements IAEFluidInventory
 {
 	private static final PlaneModels MODELS = new PlaneModels( "part/fluid_formation_plane_", "part/fluid_formation_plane_on_" );

@@ -178,9 +176,8 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
 		this.stateChanged();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged changedChannels )
+	public void updateChannels( final MENetworkChannelsChanged changedChannels )
 	{
 		this.stateChanged();
 	}
@@ -205,7 +202,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
 	@Override
 	public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
 	{
-		if( channel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
+		if( this.getProxy().isActive() && channel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
 		{
 			final List<IMEInventoryHandler> handler = new ArrayList<>( 1 );
 			handler.add( this.myHandler );
@@ -225,14 +222,6 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
 		return this.config;
 	}

-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{
@@ -21,7 +21,6 @@ package appeng.fluids.parts;

 import java.util.EnumSet;

-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -31,7 +30,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.AEApi;
@@ -63,7 +61,7 @@ import appeng.parts.PartModel;
 import appeng.util.Platform;


-public class PartFluidInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost, IConfigurableFluidInventory
+public class PartFluidInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost
 {
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/fluid_interface_base" );

@@ -90,16 +88,14 @@ public class PartFluidInterface extends PartBasicState implements IGridTickable,
 		return this.duality;
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void stateChange( final MENetworkChannelsChanged c )
 	{
 		this.duality.notifyNeighbors();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange c )
+	public void stateChange( final MENetworkPowerStatusChange c )
 	{
 		this.duality.notifyNeighbors();
 	}
@@ -237,11 +233,6 @@ public class PartFluidInterface extends PartBasicState implements IGridTickable,
 		return this.duality.getInventoryByName( name );
 	}

-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		return this.duality.getFluidInventoryByName(name);
-	}
-
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{
@@ -4,9 +4,6 @@ package appeng.fluids.parts;

 import java.util.Random;

-import appeng.api.storage.data.IItemList;
-import appeng.fluids.helper.IConfigurableFluidInventory;
-import appeng.me.cache.NetworkMonitor;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -36,6 +33,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IItemList;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
@@ -50,10 +48,9 @@ import appeng.parts.PartModel;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import net.minecraftforge.fluids.capability.IFluidHandler;


-public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack>, IConfigurableFluidInventory
+public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack>
 {
 	@PartModels
 	public static final ResourceLocation MODEL_BASE_OFF = new ResourceLocation( AppEng.MOD_ID, "part/level_emitter_base_off" );
@@ -128,25 +125,15 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		this.configureWatchers();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange powerEvent )
+	public void channelChanged( final MENetworkChannelsChanged c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void powerChanged( final MENetworkPowerStatusChange c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}

@@ -258,9 +245,10 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc

 		if( myStack == null )
 		{
-			if( monitor instanceof NetworkMonitor )
+			this.lastReportedValue = 0;
+			for( final IAEFluidStack st : monitor.getStorageList() )
 			{
-				this.lastReportedValue = ( (NetworkMonitor<IAEFluidStack>) monitor ).getGridCurrentCount();
+				this.lastReportedValue += st.getStackSize();
 			}
 		}
 		else
@@ -366,14 +354,6 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		return this.config;
 	}

-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	@Override
 	public void readFromNBT( final NBTTagCompound data )
 	{
@@ -19,7 +19,6 @@
 package appeng.fluids.parts;


-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -45,7 +44,6 @@ import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.util.Platform;
-import net.minecraftforge.fluids.capability.IFluidHandler;


 /**
@@ -53,7 +51,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
 * @version rv6 - 30/04/2018
 * @since rv6 30/04/2018
 */
-public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable, IConfigurableFluidInventory
+public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable
 {

 	private final AEFluidInventory config = new AEFluidInventory( null, 9 );
@@ -178,14 +176,6 @@ public abstract class PartSharedFluidBus extends PartUpgradeable implements IGri
 		return this.config;
 	}

-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	protected IFluidStorageChannel getChannel()
 	{
 		return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class );
@@ -23,13 +23,11 @@ import java.util.EnumSet;

 import javax.annotation.Nullable;

-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.AEApi;
@@ -52,7 +50,7 @@ import appeng.helpers.IPriorityHost;
 import appeng.tile.grid.AENetworkTile;


-public class TileFluidInterface extends AENetworkTile implements IGridTickable, IFluidInterfaceHost, IPriorityHost, IConfigurableFluidInventory
+public class TileFluidInterface extends AENetworkTile implements IGridTickable, IFluidInterfaceHost, IPriorityHost
 {
 	private final DualityFluidInterface duality = new DualityFluidInterface( this.getProxy(), this );

@@ -178,11 +176,6 @@ public class TileFluidInterface extends AENetworkTile implements IGridTickable,
 		return this.duality.getInventoryByName( name );
 	}

-	@Override
-	public IFluidHandler getFluidInventoryByName(final String name) {
-		return this.duality.getFluidInventoryByName(name);
-	}
-
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{
@@ -19,6 +19,37 @@
 package appeng.helpers;


+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+
+import com.google.common.collect.ImmutableSet;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.wrapper.RangedWrapper;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.Settings;
@@ -42,7 +73,11 @@ import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPart;
-import appeng.api.storage.*;
+import appeng.api.storage.IMEInventory;
+import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.IStorageChannel;
+import appeng.api.storage.IStorageMonitorable;
+import appeng.api.storage.IStorageMonitorableAccessor;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
@@ -68,47 +103,22 @@ import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
-import appeng.util.inv.*;
+import appeng.util.inv.AdaptorItemHandler;
+import appeng.util.inv.IAEAppEngInventory;
+import appeng.util.inv.IInventoryDestination;
+import appeng.util.inv.InvOperation;
 import appeng.util.item.AEItemStack;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.primitives.Ints;
-import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
-import gregtech.api.block.machines.BlockMachine;
-import gregtech.api.metatileentity.MetaTileEntity;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.wrapper.RangedWrapper;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;


 public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
 {
+
 	public static final int NUMBER_OF_STORAGE_SLOTS = 9;
 	public static final int NUMBER_OF_CONFIG_SLOTS = 9;
-	public static final int NUMBER_OF_PATTERN_SLOTS = 36;
+	public static final int NUMBER_OF_PATTERN_SLOTS = 9;

 	private static final Collection<Block> BAD_BLOCKS = new HashSet<>( 100 );
-	private final IAEItemStack[] requireWork = {null, null, null, null, null, null, null, null, null};
+	private final IAEItemStack[] requireWork = { null, null, null, null, null, null, null, null, null };
 	private final MultiCraftingTracker craftingTracker;
 	private final AENetworkProxy gridProxy;
 	private final IInterfaceHost iHost;
@@ -118,27 +128,27 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, NUMBER_OF_CONFIG_SLOTS );
 	private final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS );
 	private final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS );
-	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
-	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
+	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance()
+			.storage()
+			.getStorageChannel( IItemStorageChannel.class ) );
+	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
+			.storage()
+			.getStorageChannel( IFluidStorageChannel.class ) );
 	private final UpgradeInventory upgrades;
-	private final Accessor accessor = new Accessor();
 	private boolean hasConfig = false;
 	private int priority;
 	private List<ICraftingPatternDetails> craftingList = null;
 	private List<ItemStack> waitingToSend = null;
 	private IMEInventory<IAEItemStack> destination;
 	private int isWorking = -1;
-	private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
-	private EnumMap<EnumFacing, List<ItemStack>> waitingToSendFacing = new EnumMap<>( EnumFacing.class );
-	private boolean resetConfigCache = true;
-	private IMEMonitor<IAEItemStack> configCachedHandler;
+	private final Accessor accessor = new Accessor();

 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
 	{
 		this.gridProxy = networkProxy;
 		this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );

-		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4 );
+		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 1 );
 		this.cm.registerSetting( Settings.BLOCK, YesNo.NO );
 		this.cm.registerSetting( Settings.INTERFACE_TERMINAL, YesNo.YES );

@@ -153,11 +163,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		this.interfaceRequestSource = new InterfaceRequestSource( this.iHost );
 	}

-	private static boolean invIsCustomBlocking( BlockingInventoryAdaptor inv )
-	{
-		return ( inv.containsBlockingItems() );
-	}
-
 	@Override
 	public void saveChanges()
 	{
@@ -171,15 +176,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			return;
 		}
-		if( inv == this.config && ( !removed.isEmpty() || !added.isEmpty() ) )
+
+		if( inv == this.config )
 		{
-			boolean cfg = hasConfig();
 			this.readConfig();
-			if( cfg != hasConfig )
-			{
-				resetConfigCache = true;
-				this.notifyNeighbors();
-			}
 		}
 		else if( inv == this.patterns && ( !removed.isEmpty() || !added.isEmpty() ) )
 		{
@@ -235,27 +235,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}
 		data.setTag( "waitingToSend", waitingToSend );
-
-		NBTTagCompound sidedWaitList = new NBTTagCompound();
-
-		if( this.waitingToSendFacing != null )
-		{
-			for( EnumFacing s : this.iHost.getTargets() )
-			{
-				NBTTagList waitingListSided = new NBTTagList();
-				if( this.waitingToSendFacing.containsKey( s ) )
-				{
-					for( final ItemStack is : this.waitingToSendFacing.get( s ) )
-					{
-						final NBTTagCompound item = new NBTTagCompound();
-						is.writeToNBT( item );
-						waitingListSided.appendTag( item );
-					}
-					sidedWaitList.setTag( s.name(), waitingListSided );
-				}
-			}
-		}
-		data.setTag( "sidedWaitList", sidedWaitList );
 	}

 	public void readFromNBT( final NBTTagCompound data )
@@ -275,46 +254,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}

-		this.waitingToSendFacing = null;
-		final NBTTagCompound waitingListSided = data.getCompoundTag( "sidedWaitList" );
-
-		for( EnumFacing s : EnumFacing.values() )
-		{
-			if( waitingListSided.hasKey( s.name() ) )
-			{
-				NBTTagList w = waitingListSided.getTagList( s.name(), 10 );
-				for( int x = 0; x < w.tagCount(); x++ )
-				{
-					final NBTTagCompound c = w.getCompoundTagAt( x );
-					if( c != null )
-					{
-						final ItemStack is = new ItemStack( c );
-						this.addToSendListFacing( is, EnumFacing.getFront( s.getIndex() ) );
-					}
-				}
-			}
-		}
-
 		this.craftingTracker.readFromNBT( data );
-
-		// fix upgrade slot size mismatch
-		NBTTagCompound up = data.getCompoundTag( "upgrades" );
-		if( up.hasKey( "Size" ) && up.getInteger( "Size" ) != this.upgrades.getSlots() )
-		{
-			up.setInteger( "Size", this.upgrades.getSlots() );
-			this.upgrades.writeToNBT( up, "upgrades" );
-		}
-
 		this.upgrades.readFromNBT( data, "upgrades" );
 		this.config.readFromNBT( data, "config" );
-
-		NBTTagCompound pa = data.getCompoundTag( "patterns" );
-		if( pa.hasKey( "Size" ) && pa.getInteger( "Size" ) != this.patterns.getSlots() )
-		{
-			pa.setInteger( "Size", this.patterns.getSlots() );
-			this.upgrades.writeToNBT( pa, "patterns" );
-		}
-
 		this.patterns.readFromNBT( data, "patterns" );
 		this.storage.readFromNBT( data, "storage" );
 		this.priority = data.getInteger( "priority" );
@@ -347,31 +289,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}

-	private void addToSendListFacing( final ItemStack is, EnumFacing f )
-	{
-		if( is.isEmpty() )
-		{
-			return;
-		}
-		if( this.waitingToSendFacing == null )
-		{
-			this.waitingToSendFacing = new EnumMap<>( EnumFacing.class );
-		}
-
-		this.waitingToSendFacing.computeIfAbsent( f, k -> new ArrayList<>() );
-
-		this.waitingToSendFacing.get( f ).add( is );
-
-		try
-		{
-			this.gridProxy.getTick().wakeDevice( this.gridProxy.getNode() );
-		}
-		catch( final GridAccessException e )
-		{
-			// :P
-		}
-	}
-
 	private void readConfig()
 	{
 		this.hasConfig = false;
@@ -412,25 +329,25 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				// :P
 			}
 		}
+
 		this.notifyNeighbors();
 	}

 	private void updateCraftingList()
 	{
-		final Boolean[] accountedFor = new Boolean[this.patterns.getSlots()];
-		Arrays.fill( accountedFor, false );
+		final Boolean[] accountedFor = { false, false, false, false, false, false, false, false, false }; // 9...
+
+		assert ( accountedFor.length == this.patterns.getSlots() );

 		if( !this.gridProxy.isReady() )
 		{
 			return;
 		}

-		boolean removed = false;
-
 		if( this.craftingList != null )
 		{
 			final Iterator<ICraftingPatternDetails> i = this.craftingList.iterator();
-			while ( i.hasNext() )
+			while( i.hasNext() )
 			{
 				final ICraftingPatternDetails details = i.next();
 				boolean found = false;
@@ -446,53 +363,47 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn

 				if( !found )
 				{
-					removed = true;
 					i.remove();
 				}
 			}
 		}

-		boolean newPattern = false;
-
 		for( int x = 0; x < accountedFor.length; x++ )
 		{
 			if( !accountedFor[x] )
 			{
-				newPattern = true;
 				this.addToCraftingList( this.patterns.getStackInSlot( x ) );
 			}
 		}
+
 		try
 		{
 			this.gridProxy.getGrid().postEvent( new MENetworkCraftingPatternChange( this, this.gridProxy.getNode() ) );
 		}
-		catch( GridAccessException e )
+		catch( final GridAccessException e )
 		{
-			e.printStackTrace();
+			// :P
 		}
 	}

 	private boolean hasWorkToDo()
 	{
-
-		if( hasItemsToSend() )
+		if( this.hasItemsToSend() )
 		{
 			return true;
 		}
-
-		if( hasItemsToSendFacing() )
+		else
 		{
-			return true;
-		}
-
-		for( final IAEItemStack requiredWork : this.requireWork )
-		{
-			if( requiredWork != null )
+			for( final IAEItemStack requiredWork : this.requireWork )
 			{
-				return true;
+				if( requiredWork != null )
+				{
+					return true;
+				}
 			}
+
+			return false;
 		}
-		return false;
 	}

 	private void updatePlan( final int slot )
@@ -519,18 +430,14 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				this.requireWork[slot] = req.copy();
 				return;
 			}
-			else if( req.isSameType( stored ) ) // same type and quantity  )!
+			else if( req.isSameType( stored ) ) // same type ( qty different? )!
 			{
-				if( req.getStackSize() == stored.getCount() )
-				{
-					this.requireWork[slot] = null;
-				}
-				else                                // same type ( qty different? )!
+				if( req.getStackSize() != stored.getCount() )
 				{
 					this.requireWork[slot] = req.copy();
 					this.requireWork[slot].setStackSize( req.getStackSize() - stored.getCount() );
+					return;
 				}
-				return;
 			}
 			else
 			// Stored != null; dispose!
@@ -597,52 +504,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		return this.waitingToSend != null && !this.waitingToSend.isEmpty();
 	}

-	private boolean hasItemsToSendFacing()
-	{
-		if( waitingToSendFacing != null )
-		{
-			for( EnumFacing enumFacing : waitingToSendFacing.keySet() )
-			{
-				if( !waitingToSendFacing.get( enumFacing ).isEmpty() )
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public void dropExcessPatterns()
-	{
-		IItemHandler patterns = getPatterns();
-
-		List<ItemStack> dropList = new ArrayList<>();
-		for( int invSlot = 0; invSlot < patterns.getSlots(); invSlot++ )
-		{
-			if( invSlot > 8 + this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) * 9 )
-			{
-				ItemStack is = patterns.getStackInSlot( invSlot );
-				if( is.isEmpty() )
-				{
-					continue;
-				}
-				dropList.add( patterns.extractItem( invSlot, Integer.MAX_VALUE, false ) );
-			}
-		}
-		if( dropList.size() > 0 )
-		{
-			World world = this.getLocation().getWorld();
-			BlockPos blockPos = this.getLocation().getPos();
-			Platform.spawnDrops( world, blockPos, dropList );
-		}
-
-		this.gridProxy.setIdlePowerUsage( Math.pow( 4, ( this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) ) ) );
-	}
-
 	@Override
 	public boolean canInsert( final ItemStack stack )
 	{
-		final IAEItemStack out = this.destination.injectItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ), Actionable.SIMULATE, null );
+		final IAEItemStack out = this.destination.injectItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ),
+				Actionable.SIMULATE, null );
 		if( out == null )
 		{
 			return true;
@@ -709,21 +575,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			return TickRateModulation.SLEEP;
 		}

-		//Previous version might have items saved in this list
-		//recover them
 		if( this.hasItemsToSend() )
 		{
 			this.pushItemsOut( this.iHost.getTargets() );
 		}

-		if( hasItemsToSendFacing() )
-		{
-			for( EnumFacing enumFacing : waitingToSendFacing.keySet() )
-			{
-				this.pushItemsOut( enumFacing );
-			}
-		}
-
 		final boolean couldDoWork = this.updateStorage();
 		return this.hasWorkToDo() ? ( couldDoWork ? TickRateModulation.URGENT : TickRateModulation.SLOWER ) : TickRateModulation.SLEEP;
 	}
@@ -739,7 +595,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		final World w = tile.getWorld();

 		final Iterator<ItemStack> i = this.waitingToSend.iterator();
-		while ( i.hasNext() )
+		while( i.hasNext() )
 		{
 			ItemStack whatToSend = i.next();

@@ -784,48 +640,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}

-	private void pushItemsOut( final EnumFacing s )
-	{
-		if( !this.waitingToSendFacing.containsKey( s ) || ( this.waitingToSendFacing.containsKey( s ) && this.waitingToSendFacing.get( s ).isEmpty() ) )
-		{
-			return;
-		}
-
-		final TileEntity tile = this.iHost.getTileEntity();
-		final World w = tile.getWorld();
-
-		final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
-		if( te == null )
-		{
-			return;
-		}
-
-		final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
-
-		final Iterator<ItemStack> i = this.waitingToSendFacing.get( s ).iterator();
-		while ( i.hasNext() )
-		{
-			ItemStack whatToSend = i.next();
-			if( ad != null )
-			{
-				final ItemStack result = ad.addItems( whatToSend );
-				if( !result.isEmpty() )
-				{
-					whatToSend.setCount( result.getCount() );
-				}
-				else
-				{
-					i.remove();
-				}
-			}
-		}
-
-		if( this.waitingToSendFacing.get( s ).isEmpty() )
-		{
-			this.waitingToSendFacing.remove( s );
-		}
-	}
-
 	private boolean updateStorage()
 	{
 		boolean didSomething = false;
@@ -852,7 +666,35 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			this.destination = this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 			final IEnergySource src = this.gridProxy.getEnergy();

-			if( itemStack.getStackSize() < 0 )
+			if( this.craftingTracker.isBusy( x ) )
+			{
+				changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
+			}
+			else if( itemStack.getStackSize() > 0 )
+			{
+				// make sure strange things didn't happen...
+				if( !adaptor.simulateAdd( itemStack.createItemStack() ).isEmpty() )
+				{
+					changed = true;
+					throw new GridAccessException();
+				}
+
+				final IAEItemStack acquired = Platform.poweredExtraction( src, this.destination, itemStack, this.interfaceRequestSource );
+				if( acquired != null )
+				{
+					changed = true;
+					final ItemStack issue = adaptor.addItems( acquired.createItemStack() );
+					if( !issue.isEmpty() )
+					{
+						throw new IllegalStateException( "bad attempt at managing inventory. ( addItems )" );
+					}
+				}
+				else
+				{
+					changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
+				}
+			}
+			else if( itemStack.getStackSize() < 0 )
 			{
 				IAEItemStack toStore = itemStack.copy();
 				toStore.setStackSize( -toStore.getStackSize() );
@@ -890,51 +732,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					}
 				}
 			}
-
-			if( this.craftingTracker.isBusy( x ) )
-			{
-				changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
-			}
-			else if( itemStack.getStackSize() > 0 )
-			{
-				// make sure strange things didn't happen...
-
-				ItemStack inputStack = itemStack.getCachedItemStack( itemStack.getStackSize() );
-
-				ItemStack remaining = adaptor.simulateAdd( inputStack );
-
-				if( !remaining.isEmpty() )
-				{
-					itemStack.setCachedItemStack( remaining );
-					changed = true;
-					throw new GridAccessException();
-				}
-
-				IAEItemStack storedStack = this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findPrecise( itemStack );
-				if( storedStack != null )
-				{
-					final IAEItemStack acquired = Platform.poweredExtraction( src, this.destination, itemStack, this.interfaceRequestSource );
-					if( acquired != null )
-					{
-						changed = true;
-						inputStack.setCount( Ints.saturatedCast( acquired.getStackSize() ) );
-						final ItemStack issue = adaptor.addItems( inputStack );
-						if( !issue.isEmpty() )
-						{
-							throw new IllegalStateException( "bad attempt at managing inventory. ( addItems )" );
-						}
-					}
-					else if( storedStack.isCraftable() )
-					{
-						itemStack.setCachedItemStack( inputStack );
-						changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
-					}
-					if( acquired == null )
-					{
-						itemStack.setCachedItemStack( inputStack );
-					}
-				}
-			}
 			// else wtf?
 		}
 		catch( final GridAccessException e )
@@ -962,7 +759,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(), this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
+				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
+						this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
 			}
 		}
 		catch( final GridAccessException e )
@@ -996,12 +794,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
+				return (IMEMonitor<T>) new InterfaceInventory( this );
 			}

 			return (IMEMonitor<T>) this.items;
@@ -1100,15 +893,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		};
 	}

-	private boolean invIsBlocked( InventoryAdaptor inv )
-	{
-		return ( inv.containsItems() );
-	}
-
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table )
 	{
-		if( this.hasItemsToSend() || this.hasItemsToSendFacing() || !this.gridProxy.isActive() || !this.craftingList.contains( patternDetails ) )
+		if( this.hasItemsToSend() || !this.gridProxy.isActive() || !this.craftingList.contains( patternDetails ) )
 		{
 			return false;
 		}
@@ -1116,12 +904,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		final TileEntity tile = this.iHost.getTileEntity();
 		final World w = tile.getWorld();

-		if( this.visitedFaces.isEmpty() )
-		{
-			this.visitedFaces = this.iHost.getTargets();
-		}
-
-		for( final EnumFacing s : visitedFaces )
+		final EnumSet<EnumFacing> possibleDirections = this.iHost.getTargets();
+		for( final EnumFacing s : possibleDirections )
 		{
 			final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
 			if( te instanceof IInterfaceHost )
@@ -1130,7 +914,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				{
 					if( ( (IInterfaceHost) te ).getInterfaceDuality().sameGrid( this.gridProxy.getGrid() ) )
 					{
-						visitedFaces.remove( s );
 						continue;
 					}
 				}
@@ -1145,7 +928,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final ICraftingMachine cm = (ICraftingMachine) te;
 				if( cm.acceptsPlans() )
 				{
-					visitedFaces.remove( s );
 					if( cm.pushPattern( patternDetails, table, s.getOpposite() ) )
 					{
 						return true;
@@ -1154,73 +936,47 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				}
 			}

-			InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
+			final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 			if( ad != null )
 			{
 				if( this.isBlocking() )
 				{
-					IPhantomTile phantomTE;
-					if( Loader.isModLoaded( "actuallyadditions" ) && te instanceof IPhantomTile )
+					if( !ad.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty() )
 					{
-						phantomTE = ( (IPhantomTile) te );
-						if( phantomTE.hasBoundPosition() )
-						{
-							TileEntity phantom = w.getTileEntity( phantomTE.getBoundPosition() );
-							if( NonBlockingItems.INSTANCE.getMap().containsKey( w.getBlockState( phantomTE.getBoundPosition() ).getBlock().getRegistryName().getResourceDomain() ) )
-							{
-								if( isCustomInvBlocking( phantom, s ) )
-								{
-									visitedFaces.remove( s );
-									continue;
-								}
-							}
-						}
-					}
-					else if( NonBlockingItems.INSTANCE.getMap().containsKey( w.getBlockState( tile.getPos().offset( s ) ).getBlock().getRegistryName().getResourceDomain() ) )
-					{
-						if( isCustomInvBlocking( te, s ) )
-						{
-							visitedFaces.remove( s );
-							continue;
-						}
-					}
-					else if( invIsBlocked( ad ) )
-					{
-						visitedFaces.remove( s );
 						continue;
 					}
 				}

 				if( this.acceptsItems( ad, table ) )
 				{
-					visitedFaces.remove( s );
 					for( int x = 0; x < table.getSizeInventory(); x++ )
 					{
 						final ItemStack is = table.getStackInSlot( x );
 						if( !is.isEmpty() )
 						{
-							addToSendListFacing( is, s );
+							final ItemStack added = ad.addItems( is );
+							this.addToSendList( added );
 						}
 					}
-					pushItemsOut( s );
+					this.pushItemsOut( possibleDirections );
 					return true;
 				}
 			}
-			visitedFaces.remove( s );
 		}
+
 		return false;
 	}

 	@Override
 	public boolean isBusy()
 	{
-		boolean busy = false;
-
-		if( this.hasItemsToSend() || hasItemsToSendFacing() )
+		if( this.hasItemsToSend() )
 		{
 			return true;
 		}

+		boolean busy = false;
+
 		if( this.isBlocking() )
 		{
 			final EnumSet<EnumFacing> possibleDirections = this.iHost.getTargets();
@@ -1232,54 +988,22 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			for( final EnumFacing s : possibleDirections )
 			{
 				final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
-				IPhantomTile phantomTE;

 				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 				if( ad != null )
 				{
-					if( Loader.isModLoaded( "actuallyadditions" ) && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
+					if( ad.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty() )
 					{
-						phantomTE = ( (IPhantomTile) te );
-						if( phantomTE.hasBoundPosition() )
-						{
-							TileEntity phantom = w.getTileEntity( phantomTE.getBoundPosition() );
-							if( NonBlockingItems.INSTANCE.getMap().containsKey( w.getBlockState( phantomTE.getBoundPosition() ).getBlock().getRegistryName().getResourceDomain() ) )
-							{
-								if( !isCustomInvBlocking( phantom, s ) )
-								{
-									allAreBusy = false;
-									break;
-								}
-							}
-						}
-					}
-					else if( NonBlockingItems.INSTANCE.getMap().containsKey( w.getBlockState( tile.getPos().offset( s ) ).getBlock().getRegistryName().getResourceDomain() ) )
-					{
-						if( !isCustomInvBlocking( te, s ) )
-						{
-							allAreBusy = false;
-							break;
-						}
-					}
-					else
-					{
-						if( !invIsBlocked( ad ) )
-						{
-							allAreBusy = false;
-							break;
-						}
+						allAreBusy = false;
+						break;
 					}
 				}
 			}
+
 			busy = allAreBusy;
 		}
-		return busy;
-	}

-	boolean isCustomInvBlocking( TileEntity te, EnumFacing s )
-	{
-		BlockingInventoryAdaptor blockingInventoryAdaptor = BlockingInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-		return invIsCustomBlocking( blockingInventoryAdaptor );
+		return busy;
 	}

 	private boolean sameGrid( final IGrid grid ) throws GridAccessException
@@ -1302,7 +1026,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				continue;
 			}

-			if( !ad.simulateAdd( is ).isEmpty() )
+			if( !ad.simulateAdd( is.copy() ).isEmpty() )
 			{
 				return false;
 			}
@@ -1337,20 +1061,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}

-		if( this.waitingToSendFacing != null )
-		{
-			for( List<ItemStack> itemList : waitingToSendFacing.values() )
-			{
-				for( final ItemStack is : itemList )
-				{
-					if( !is.isEmpty() )
-					{
-						drops.add( is );
-					}
-				}
-			}
-		}
-
 		for( final ItemStack is : this.upgrades )
 		{
 			if( !is.isEmpty() )
@@ -1474,13 +1184,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final IBlockState directedBlockState = hostWorld.getBlockState( targ );
 				final Block directedBlock = directedBlockState.getBlock();
 				ItemStack what = new ItemStack( directedBlock, 1, directedBlock.getMetaFromState( directedBlockState ) );
-
-				if( Loader.isModLoaded( "gregtech" ) && directedBlock instanceof BlockMachine )
-				{
-					MetaTileEntity metaTileEntity = getMetaTileEntity( hostWorld, targ );
-					return metaTileEntity.getMetaFullName();
-				}
-
 				try
 				{
 					Vec3d from = new Vec3d( hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5, hostTile.getPos().getZ() + 0.5 );
@@ -1593,7 +1296,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn

 	}

-
 	private class InterfaceRequestContext implements Comparable<Integer>
 	{

@@ -1604,13 +1306,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}

-
 	private class InterfaceInventory extends MEMonitorIInventory
 	{

 		public InterfaceInventory( final DualityInterface tileInterface )
 		{
 			super( new AdaptorItemHandler( tileInterface.storage ) );
+			this.setActionSource( new MachineSource( DualityInterface.this.iHost ) );
 		}

 		@Override
@@ -1642,7 +1344,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}

-
 	private class Accessor implements IStorageMonitorableAccessor
 	{

@@ -1,98 +0,0 @@
-package appeng.helpers;
-
-import appeng.client.render.BlockPosHighlighter;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
-import org.lwjgl.opengl.GL11;
-
-// taken from McJty's McJtyLib
-
-public class HighlighterHandler
-{
-
-    public static void tick( RenderWorldLastEvent event ) {
-        renderHilightedBlock(event);
-    }
-
-    private static void renderHilightedBlock( RenderWorldLastEvent event ) {
-        BlockPos c = BlockPosHighlighter.getHilightedBlock();
-        if (c == null) {
-            return;
-        }
-        Minecraft mc = Minecraft.getMinecraft();
-        int dimension = mc.world.provider.getDimension();
-        long time = System.currentTimeMillis();
-
-        if (time > BlockPosHighlighter.getExpireHilight() || dimension != BlockPosHighlighter.getDimension()) {
-            BlockPosHighlighter.hilightBlock(null, -1, BlockPosHighlighter.getDimension() );
-            return;
-        }
-
-        if (((time / 500) & 1) == 0) {
-            return;
-        }
-
-        EntityPlayerSP p = mc.player;
-        double doubleX = p.lastTickPosX + (p.posX - p.lastTickPosX) * event.getPartialTicks();
-        double doubleY = p.lastTickPosY + (p.posY - p.lastTickPosY) * event.getPartialTicks();
-        double doubleZ = p.lastTickPosZ + (p.posZ - p.lastTickPosZ) * event.getPartialTicks();
-
-        GlStateManager.pushMatrix();
-        GlStateManager.color(1.0f, 0, 0);
-        GlStateManager.glLineWidth(3);
-        GlStateManager.translate(-doubleX, -doubleY, -doubleZ);
-
-        GlStateManager.disableDepth();
-        GlStateManager.disableTexture2D();
-
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder buffer = tessellator.getBuffer();
-        float mx = c.getX();
-        float my = c.getY();
-        float mz = c.getZ();
-        buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
-        renderHighLightedBlocksOutline(buffer, mx, my, mz, 1.0f, 0.0f, 0.0f, 1.0f);
-
-        tessellator.draw();
-
-        GlStateManager.enableTexture2D();
-        GlStateManager.enableDepth();
-        GlStateManager.popMatrix();
-    }
-
-    public static void renderHighLightedBlocksOutline(BufferBuilder buffer, float mx, float my, float mz, float r, float g, float b, float a) {
-        buffer.pos(mx, my, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my + 1, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my + 1, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my + 1, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my + 1, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my + 1, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my + 1, mz).color(r, g, b, a).endVertex();
-
-        buffer.pos(mx, my + 1, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my + 1, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my + 1, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my + 1, mz).color(r, g, b, a).endVertex();
-
-        buffer.pos(mx + 1, my, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my, mz).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my + 1, mz).color(r, g, b, a).endVertex();
-
-        buffer.pos(mx, my, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx + 1, my, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my, mz + 1).color(r, g, b, a).endVertex();
-        buffer.pos(mx, my + 1, mz + 1).color(r, g, b, a).endVertex();
-    }
-}
@@ -43,6 +43,5 @@ public enum InventoryAction
 	ROLL_UP,
 	ROLL_DOWN,
 	AUTO_CRAFT,
-	PLACE_SINGLE,
-	PLACE_JEI_GHOST_ITEM
+	PLACE_SINGLE
 }
@@ -24,7 +24,6 @@ import java.util.concurrent.Future;

 import com.google.common.collect.ImmutableSet;

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

@@ -84,70 +83,57 @@ public class MultiCraftingTracker

 	public boolean handleCrafting( final int x, final long itemToCraft, final IAEItemStack ais, final InventoryAdaptor d, final World w, final IGrid g, final ICraftingGrid cg, final IActionSource mySrc )
 	{
-		if( ais != null )
+		if( ais != null && d.simulateAdd( ais.createItemStack() ).isEmpty() )
 		{
-			ItemStack inputStack = ais.getCachedItemStack( ais.getStackSize() );
+			final Future<ICraftingJob> craftingJob = this.getJob( x );

-			ItemStack remaining = d.simulateAdd( inputStack );
-
-			if( remaining.isEmpty() )
+			if( this.getLink( x ) != null )
+			{
+				return false;
+			}
+			else if( craftingJob != null )
 			{
-				ais.setCachedItemStack( inputStack );

-				final Future<ICraftingJob> craftingJob = this.getJob( x );
-
-				if( this.getLink( x ) != null )
+				try
 				{
-					return false;
-				}
-				else if( craftingJob != null )
-				{
-
-					try
+					ICraftingJob job = null;
+					if( craftingJob.isDone() )
 					{
-						ICraftingJob job = null;
-						if( craftingJob.isDone() )
+						job = craftingJob.get();
+					}
+
+					if( job != null )
+					{
+						final ICraftingLink link = cg.submitJob( job, this.owner, null, false, mySrc );
+
+						this.setJob( x, null );
+
+						if( link != null )
 						{
-							job = craftingJob.get();
-						}
+							this.setLink( x, link );

-						if( job != null )
-						{
-							final ICraftingLink link = cg.submitJob( job, this.owner, null, false, mySrc );
-
-							this.setJob( x, null );
-
-							if( link != null )
-							{
-								this.setLink( x, link );
-
-								return true;
-							}
+							return true;
 						}
 					}
-					catch( final InterruptedException e )
-					{
-						// :P
-					}
-					catch( final ExecutionException e )
-					{
-						// :P
-					}
 				}
-				else
+				catch( final InterruptedException e )
 				{
-					if( this.getLink( x ) == null )
-					{
-						final IAEItemStack aisC = ais.copy();
-						aisC.setStackSize( itemToCraft );
-
-						this.setJob( x, cg.beginCraftingJob( w, g, mySrc, aisC, null ) );
-					}
+					// :P
+				}
+				catch( final ExecutionException e )
+				{
+					// :P
 				}
 			}
 			else
 			{
-				ais.setCachedItemStack( remaining );
+				if( this.getLink( x ) == null )
+				{
+					final IAEItemStack aisC = ais.copy();
+					aisC.setStackSize( itemToCraft );
+
+					this.setJob( x, cg.beginCraftingJob( w, g, mySrc, aisC, null ) );
+				}
 			}
 		}
 		return false;
@@ -1,133 +0,0 @@
-package appeng.helpers;
-
-import appeng.core.AEConfig;
-import appeng.core.AELog;
-import appeng.util.Platform;
-import gregtech.api.items.metaitem.MetaItem;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import it.unimi.dsi.fastutil.objects.*;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.*;
-
-
-public class NonBlockingItems
-{
-	public static Map<String, Object2ObjectOpenHashMap<Item, IntSet>> NON_BLOCKING_MAP = new HashMap<>();
-	public static NonBlockingItems INSTANCE = new NonBlockingItems();
-
-	private NonBlockingItems()
-	{
-		String[] strings = AEConfig.instance().getNonBlockingItems();
-		String[] modids = new String[0];
-		if( strings.length > 0 )
-		{
-			for( String s : strings )
-			{
-				if( s.startsWith( "[" ) && s.endsWith( "]" ) )
-				{
-					modids = s.substring( 1, s.length() - 1 ).split( "\\|" );
-				}
-				else
-				{
-					for( String modid : modids )
-					{
-						if( !Loader.isModLoaded( modid ) )
-						{
-							continue;
-						}
-						NON_BLOCKING_MAP.putIfAbsent( modid, new Object2ObjectOpenHashMap<>() );
-
-						String[] ModItemMeta = s.split( ":" );
-
-						if( ModItemMeta.length < 2 || ModItemMeta.length > 3 )
-						{
-							AELog.error( "Invalid non blocking item entry: " + s );
-							continue;
-						}
-
-						if( ModItemMeta[0].equals( "gregtech" ) && Platform.isModLoaded( "gregtech" ) )
-						{
-							boolean found = false;
-							for( MetaItem<?> metaItem : MetaItem.getMetaItems() )
-							{
-								MetaItem<?>.MetaValueItem metaItem2 = metaItem.getItem( ModItemMeta[1] );
-								if( metaItem.getItem( ModItemMeta[1] ) != null )
-								{
-									found = true;
-									ItemStack itemStack = metaItem2.getStackForm();
-									NON_BLOCKING_MAP.get( modid ).putIfAbsent( itemStack.getItem(), new IntOpenHashSet() );
-									NON_BLOCKING_MAP.get( modid ).computeIfPresent( itemStack.getItem(), ( item, intSet ) ->
-									{
-										intSet.add( itemStack.getItemDamage() );
-										return intSet;
-									} );
-								}
-								else
-								{
-									ItemStack itemStack = GameRegistry.makeItemStack( ModItemMeta[0] + ":" + ModItemMeta[1], ModItemMeta.length == 3 ? Integer.parseInt( ModItemMeta[2] ) : 0, 1, null );
-									if( !itemStack.isEmpty() )
-									{
-										NON_BLOCKING_MAP.get( modid ).putIfAbsent( itemStack.getItem(), new IntOpenHashSet() );
-										NON_BLOCKING_MAP.get( modid ).computeIfPresent( itemStack.getItem(), ( item, intSet ) ->
-										{
-											intSet.add( itemStack.getItemDamage() );
-											return intSet;
-										} );
-									}
-								}
-							}
-							if( !found )
-							{
-								AELog.error( "Item not found on nonBlocking config: " + s );
-							}
-						}
-						else if( ModItemMeta[0].equals( "ore" ) )
-						{
-							OreDictionary.getOres( ModItemMeta[1] ).forEach( itemStack ->
-							                                                 {
-								                                                 NON_BLOCKING_MAP.get( modid ).putIfAbsent( itemStack.getItem(), new IntOpenHashSet() );
-								                                                 NON_BLOCKING_MAP.get( modid ).computeIfPresent( itemStack.getItem(), ( item, intSet ) ->
-								                                                 {
-									                                                 intSet.add( itemStack.getItemDamage() );
-									                                                 return intSet;
-								                                                 } );
-							                                                 } );
-						}
-						else
-						{
-							ItemStack itemStack = GameRegistry.makeItemStack( ModItemMeta[0] + ":" + ModItemMeta[1], ModItemMeta.length == 3 ? Integer.parseInt( ModItemMeta[2] ) : 0, 1, null );
-							if( !itemStack.isEmpty() )
-							{
-								NON_BLOCKING_MAP.get( modid ).putIfAbsent( itemStack.getItem(), new IntOpenHashSet() );
-								NON_BLOCKING_MAP.get( modid ).computeIfPresent( itemStack.getItem(), ( item, intSet ) ->
-								{
-									intSet.add( itemStack.getItemDamage() );
-									return intSet;
-								} );
-							}
-							else
-							{
-								AELog.error( "Item not found on nonBlocking config: " + s );
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public Map<String, Object2ObjectOpenHashMap<Item, IntSet>> getMap()
-	{
-		return NON_BLOCKING_MAP;
-	}
-
-	public void init()
-	{
-	}
-}
@@ -19,17 +19,21 @@
 package appeng.helpers;


-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringJoiner;

 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;

 import appeng.api.AEApi;
@@ -37,33 +41,25 @@ import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.container.ContainerNull;
+import appeng.core.AEConfig;
+import appeng.core.AELog;
+import appeng.core.features.AEFeature;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
-import net.minecraftforge.common.crafting.IShapedRecipe;
-import net.minecraftforge.fml.common.Optional;


 public class PatternHelper implements ICraftingPatternDetails, Comparable<PatternHelper>
 {

-	private static final int CRAFTING_GRID_DIMENSION = 3;
-	private static final int CRAFTING_INPUT_LIMIT = CRAFTING_GRID_DIMENSION * CRAFTING_GRID_DIMENSION;
-	public static final int PROCESSING_INPUT_HEIGHT = 4;
-	public static final int PROCESSING_INPUT_WIDTH = 4;
-	public static final int PROCESSING_INPUT_LIMIT = PROCESSING_INPUT_HEIGHT * PROCESSING_INPUT_WIDTH;
-	private static final int CRAFTING_OUTPUT_LIMIT = 1;
-	public static final int PROCESSING_OUTPUT_LIMIT = 6;
-
 	private final ItemStack patternItem;
-	private final InventoryCrafting crafting;
-	private final InventoryCrafting testFrame;
+	private final InventoryCrafting crafting = new InventoryCrafting( new ContainerNull(), 3, 3 );
+	private final InventoryCrafting testFrame = new InventoryCrafting( new ContainerNull(), 3, 3 );
 	private final ItemStack correctOutput;
 	private final IRecipe standardRecipe;
 	private final IAEItemStack[] condensedInputs;
 	private final IAEItemStack[] condensedOutputs;
 	private final IAEItemStack[] inputs;
 	private final IAEItemStack[] outputs;
-	private final Map<Integer, List<IAEItemStack>> substituteInputs;
 	private final boolean isCrafting;
 	private final boolean canSubstitute;
 	private final Set<TestLookup> failCache = new HashSet<>();
@@ -84,9 +80,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		final NBTTagList outTag = encodedValue.getTagList( "out", 10 );
 		this.isCrafting = encodedValue.getBoolean( "crafting" );

-		crafting = new InventoryCrafting( new ContainerNull(), isCrafting ? 3 : 4, isCrafting ? 3 : 4 );
-		testFrame = new InventoryCrafting( new ContainerNull(), isCrafting ? 3 : 4, isCrafting ? 3 : 4 );
-
 		this.canSubstitute = this.isCrafting && encodedValue.getBoolean( "substitute" );
 		this.patternItem = is;
 		this.pattern = AEItemStack.fromItemStack( is );
@@ -150,11 +143,9 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 				}
 			}
 		}
-		final int outputLength = out.size();

-		this.inputs = in.toArray( new IAEItemStack[isCrafting ? CRAFTING_INPUT_LIMIT : PROCESSING_INPUT_LIMIT] );
-		this.outputs = out.toArray( new IAEItemStack[outputLength] );
-		this.substituteInputs = new HashMap<>( CRAFTING_INPUT_LIMIT );
+		this.outputs = out.toArray( new IAEItemStack[out.size()] );
+		this.inputs = in.toArray( new IAEItemStack[in.size()] );

 		final Map<IAEItemStack, IAEItemStack> tmpOutputs = new HashMap<>();

@@ -248,7 +239,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter

 		final TestStatus result = this.getStatus( slotIndex, i );

-		switch ( result )
+		switch( result )
 		{
 			case ACCEPT:
 				return true;
@@ -266,16 +257,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter

 		this.testFrame.setInventorySlotContents( slotIndex, i );

-		// If we cannot substitute, the items must match exactly
-		if( ( !( i.getItem().isDamageable() || Platform.isGTDamageableItem( i.getItem() ) ) && !canSubstitute ) && slotIndex < inputs.length )
-		{
-			if( !inputs[slotIndex].isSameType( i ) )
-			{
-				this.markItemAs( slotIndex, i, TestStatus.DECLINE );
-				return false;
-			}
-		}
-
 		if( this.standardRecipe.matches( this.testFrame, w ) )
 		{
 			final ItemStack testOutput = this.standardRecipe.getCraftingResult( this.testFrame );
@@ -287,6 +268,25 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 				return true;
 			}
 		}
+		else if( AEConfig.instance().isFeatureEnabled( AEFeature.CRAFTING_MANAGER_FALLBACK ) )
+		{
+			final ItemStack testOutput = CraftingManager.findMatchingResult( this.testFrame, w );
+
+			if( Platform.itemComparisons().isSameItem( this.correctOutput, testOutput ) )
+			{
+				this.testFrame.setInventorySlotContents( slotIndex, this.crafting.getStackInSlot( slotIndex ) );
+				this.markItemAs( slotIndex, i, TestStatus.ACCEPT );
+
+				if( AELog.isCraftingDebugLogEnabled() )
+				{
+					this.warnAboutCraftingManager( true );
+				}
+
+				return true;
+			}
+
+			this.warnAboutCraftingManager( false );
+		}

 		this.markItemAs( slotIndex, i, TestStatus.DECLINE );
 		return false;
@@ -328,114 +328,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		return this.canSubstitute;
 	}

-	@Override
-	public List<IAEItemStack> getSubstituteInputs( int slot )
-	{
-		if( this.inputs[slot] == null )
-		{
-			return Collections.emptyList();
-		}
-
-		return this.substituteInputs.computeIfAbsent( slot, value -> {
-			ItemStack[] matchingStacks = getRecipeIngredient( slot ).getMatchingStacks();
-			List<IAEItemStack> itemList = new ArrayList<>( matchingStacks.length + 1 );
-			for( ItemStack matchingStack : matchingStacks )
-			{
-				itemList.add( AEItemStack.fromItemStack( matchingStack ) );
-			}
-
-			// Ensure that the specific item put in by the user is at the beginning,
-			// so that it takes precedence over substitutions
-			itemList.add( 0, this.inputs[slot] );
-			return itemList;
-		} );
-	}
-
-	/**
-	 * Gets the {@link Ingredient} from the actual used recipe for a given slot-index into {@link #getInputs()}.
-	 * <p/>
-	 * Conversion is needed for two reasons: our sparse ingredients are always organized in a 3x3 grid, while Vanilla's
-	 * ingredient list will be condensed to the actual recipe's grid size. In addition, in our 3x3 grid, the user can
-	 * shift the actual recipe input to the right and down.
-	 */
-	private Ingredient getRecipeIngredient( int slot )
-	{
-
-		if( standardRecipe instanceof IShapedRecipe )
-		{
-			IShapedRecipe shapedRecipe = (IShapedRecipe) standardRecipe;
-
-			return getShapedRecipeIngredient( slot, shapedRecipe.getRecipeWidth() );
-		}
-		else
-		{
-			return getShapelessRecipeIngredient( slot );
-		}
-	}
-
-	private Ingredient getShapedRecipeIngredient( int slot, int recipeWidth )
-	{
-		// Compute the offset of the user's input vs. crafting grid origin
-		// Which is >0 if they have empty rows above or to the left of their input
-		int topOffset = 0;
-		if( inputs[0] == null && inputs[1] == null && inputs[2] == null )
-		{
-			topOffset++; // First row is fully empty
-			if( inputs[3] == null && inputs[4] == null && inputs[5] == null )
-			{
-				topOffset++; // Second row is fully empty
-			}
-		}
-		int leftOffset = 0;
-		if( inputs[0] == null && inputs[3] == null && inputs[6] == null )
-		{
-			leftOffset++; // First column is fully empty
-			if( inputs[1] == null && inputs[4] == null && inputs[7] == null )
-			{
-				leftOffset++; // Second column is fully empty
-			}
-		}
-
-		// Compute the x,y of the slot, as-if the recipe was anchored to 0,0
-		int slotX = slot % CRAFTING_GRID_DIMENSION - leftOffset;
-		int slotY = slot / CRAFTING_GRID_DIMENSION - topOffset;
-
-		// Compute the index into the recipe's ingredient list now
-		int ingredientIndex = slotY * recipeWidth + slotX;
-
-		NonNullList<Ingredient> ingredients = standardRecipe.getIngredients();
-
-		if( ingredientIndex < 0 || ingredientIndex > ingredients.size() )
-		{
-			return Ingredient.EMPTY;
-		}
-
-		return ingredients.get( ingredientIndex );
-	}
-
-	private Ingredient getShapelessRecipeIngredient( int slot )
-	{
-		// We map the list of *filled* sparse inputs to the shapeless (ergo unordered)
-		// ingredients. While these do not actually correspond to each other,
-		// since both lists have the same length, the mapping is at least stable.
-		int ingredientIndex = 0;
-		for( int i = 0; i < slot; i++ )
-		{
-			if( inputs[i] != null )
-			{
-				ingredientIndex++;
-			}
-		}
-
-		NonNullList<Ingredient> ingredients = standardRecipe.getIngredients();
-		if( ingredientIndex < ingredients.size() )
-		{
-			return ingredients.get( ingredientIndex );
-		}
-
-		return Ingredient.EMPTY;
-	}
-
 	@Override
 	public ItemStack getOutput( final InventoryCrafting craftingInv, final World w )
 	{
@@ -514,6 +406,24 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		return this.pattern.hashCode();
 	}

+	private void warnAboutCraftingManager( boolean foundAlternative )
+	{
+		final String foundAlternativeRecipe = foundAlternative ? "Found alternative recipe." : "NOT FOUND, please report.";
+
+		final StringJoiner joinActualInputs = new StringJoiner( ", " );
+		for( int j = 0; j < this.testFrame.getSizeInventory(); j++ )
+		{
+			final ItemStack stack = this.testFrame.getStackInSlot( j );
+			if( !stack.isEmpty() )
+			{
+				joinActualInputs.add( stack.toString() );
+			}
+		}
+
+		AELog.warn( "Using CraftingManager fallback: Recipe <%s> for output <%s> rejected inputs [%s]. %s",
+				this.standardRecipe.getRegistryName(), this.standardRecipe.getRecipeOutput(), joinActualInputs, foundAlternativeRecipe );
+	}
+
 	@Override
 	public boolean equals( final Object obj )
 	{
@@ -537,9 +447,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter

 	private enum TestStatus
 	{
-		ACCEPT,
-		DECLINE,
-		TEST
+		ACCEPT, DECLINE, TEST
 	}

 	private static final class TestLookup
@@ -187,16 +187,21 @@ public class TickHandler
 		if( ev.type == Type.WORLD && ev.phase == Phase.END )
 		{
 			final WorldTickEvent wte = (WorldTickEvent) ev;
-			synchronized ( this.craftingJobs )
+			synchronized( this.craftingJobs )
 			{
 				final Collection<CraftingJob> jobSet = this.craftingJobs.get( wte.world );
 				if( !jobSet.isEmpty() )
 				{
-					final int jobSize = jobSet.size();
-					final int microSecondsPerTick = AEConfig.instance().getCraftingCalculationTimePerTick() * 1000;
-					final int simTime = Math.max( 1, microSecondsPerTick / jobSize );
-
-					jobSet.removeIf( cj -> !cj.simulateFor( simTime ) );
+					final int simTime = Math.max( 1, AEConfig.instance().getCraftingCalculationTimePerTick() / jobSet.size() );
+					final Iterator<CraftingJob> i = jobSet.iterator();
+					while( i.hasNext() )
+					{
+						final CraftingJob cj = i.next();
+						if( !cj.simulateFor( simTime ) )
+						{
+							i.remove();
+						}
+					}
 				}
 			}
 		}
@@ -207,7 +212,7 @@ public class TickHandler
 			this.tickColors( this.srvPlayerColors );
 			// ready tiles.
 			final HandlerRep repo = this.getRepo();
-			while ( !repo.tiles.isEmpty() )
+			while( !repo.tiles.isEmpty() )
 			{
 				final AEBaseTile bt = repo.tiles.poll();
 				if( !bt.isInvalid() )
@@ -239,7 +244,7 @@ public class TickHandler
 	private void tickColors( final HashMap<Integer, PlayerColor> playerSet )
 	{
 		final Iterator<PlayerColor> i = playerSet.values().iterator();
-		while ( i.hasNext() )
+		while( i.hasNext() )
 		{
 			final PlayerColor pc = i.next();
 			if( pc.ticksLeft <= 0 )
@@ -260,7 +265,7 @@ public class TickHandler
 		final Stopwatch sw = Stopwatch.createStarted();

 		IWorldCallable<?> c = null;
-		while ( ( c = queue.poll() ) != null )
+		while( ( c = queue.poll() ) != null )
 		{
 			try
 			{
@@ -276,11 +281,15 @@ public class TickHandler
 				AELog.debug( e );
 			}
 		}
+
+		// long time = sw.elapsed( TimeUnit.MILLISECONDS );
+		// if ( time > 0 )
+		// AELog.info( "processQueue Time: " + time + "ms" );
 	}

 	public void registerCraftingSimulation( final World world, final CraftingJob craftingJob )
 	{
-		synchronized ( this.craftingJobs )
+		synchronized( this.craftingJobs )
 		{
 			this.craftingJobs.put( world, craftingJob );
 		}
@@ -30,37 +30,35 @@ import appeng.integration.modules.waila.WailaModule;
 public enum IntegrationType
 {
 	IC2( IntegrationSide.BOTH, "Industrial Craft 2", "ic2" )
-			{
-				@Override
-				public IIntegrationModule createInstance()
-				{
-					return Integrations.setIc2( new IC2Module() );
-				}
-			},
-
-	GTCE( IntegrationSide.BOTH, "GregTech", "gregtech" ),
+	{
+		@Override
+		public IIntegrationModule createInstance()
+		{
+			return Integrations.setIc2( new IC2Module() );
+		}
+	},

 	RC( IntegrationSide.BOTH, "Railcraft", "railcraft" ),

 	MFR( IntegrationSide.BOTH, "Mine Factory Reloaded", "minefactoryreloaded" ),

 	Waila( IntegrationSide.BOTH, "Waila", "waila" )
-			{
-				@Override
-				public IIntegrationModule createInstance()
-				{
-					return new WailaModule();
-				}
-			},
+	{
+		@Override
+		public IIntegrationModule createInstance()
+		{
+			return new WailaModule();
+		}
+	},

 	InvTweaks( IntegrationSide.CLIENT, "Inventory Tweaks", "inventorytweaks" )
-			{
-				@Override
-				public IIntegrationModule createInstance()
-				{
-					return Integrations.setInvTweaks( new InventoryTweaksModule() );
-				}
-			},
+	{
+		@Override
+		public IIntegrationModule createInstance()
+		{
+			return Integrations.setInvTweaks( new InventoryTweaksModule() );
+		}
+	},

 	JEI( IntegrationSide.CLIENT, "Just Enough Items", "jei" )
 	{
@@ -19,22 +19,20 @@
 package appeng.integration.modules.jei;


-import javax.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

-import appeng.client.gui.AEGuiHandler;
-import appeng.container.implementations.ContainerExpandedProcessingPatternTerm;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;

-import mezz.jei.api.*;
-import mezz.jei.config.Constants;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

+import mezz.jei.api.IJeiRuntime;
+import mezz.jei.api.IModPlugin;
+import mezz.jei.api.IModRegistry;
+import mezz.jei.api.ISubtypeRegistry;
 import mezz.jei.api.recipe.IRecipeCategoryRegistration;
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid;

@@ -57,9 +55,6 @@ import appeng.items.parts.ItemFacade;
@mezz.jei.api.JEIPlugin
 public class JEIPlugin implements IModPlugin
 {
-	public static IJeiRuntime runtime;
-	public static AEGuiHandler aeGuiHandler;
-
 	@Override
 	public void registerItemSubtypes( ISubtypeRegistry subtypeRegistry )
 	{
@@ -91,13 +86,12 @@ public class JEIPlugin implements IModPlugin
 		this.registerDescriptions( definitions, registry );

 		// Allow recipe transfer from JEI to crafting and pattern terminal
-		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ), VanillaRecipeCategoryUid.CRAFTING );
-		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ), Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
-		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerExpandedProcessingPatternTerm.class ), Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
-
-		aeGuiHandler = new AEGuiHandler();
-		registry.addAdvancedGuiHandlers( aeGuiHandler );
-		registry.addGhostIngredientHandler( aeGuiHandler.getGuiContainerClass(), aeGuiHandler );
+		registry.getRecipeTransferRegistry()
+				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ),
+						VanillaRecipeCategoryUid.CRAFTING );
+		registry.getRecipeTransferRegistry()
+				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ),
+						VanillaRecipeCategoryUid.CRAFTING );
 	}

 	private void registerDescriptions( IDefinitions definitions, IModRegistry registry )
@@ -220,6 +214,5 @@ public class JEIPlugin implements IModPlugin
 	{
 		JEIModule jeiModule = (JEIModule) Integrations.jei();
 		jeiModule.setJei( new JeiRuntimeAdapter( jeiRuntime ) );
-		runtime = jeiRuntime;
 	}
 }
@@ -26,12 +26,6 @@ import java.util.Map;

 import javax.annotation.Nullable;

-import appeng.container.implementations.ContainerPatternTerm;
-import appeng.core.sync.packets.PacketValueConfig;
-import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
-import mezz.jei.transfer.RecipeTransferErrorInternal;
-import mezz.jei.transfer.RecipeTransferErrorTooltip;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
@@ -72,47 +66,15 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 	@Override
 	public IRecipeTransferError transferRecipe( T container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer )
 	{
-		final String recipeType = recipeLayout.getRecipeCategory().getUid();
-
-		if (recipeType.equals( VanillaRecipeCategoryUid.INFORMATION) || recipeType.equals(VanillaRecipeCategoryUid.FUEL))
-		{
-			return RecipeTransferErrorInternal.INSTANCE;
-		}

 		if( !doTransfer )
 		{
 			return null;
 		}

-		if( container instanceof ContainerPatternTerm )
-		{
-			try
-			{
-				if( !( (ContainerPatternTerm) container ).isCraftingMode() )
-				{
-					if( recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
-					{
-						NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", "1" ) );
-					}
-				}
-				else if( !recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
-				{
-
-					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", "0" ) );
-				}
-
-			}
-			catch( IOException e )
-			{
-				e.printStackTrace();
-			}
-		}
-
 		Map<Integer, ? extends IGuiIngredient<ItemStack>> ingredients = recipeLayout.getItemStacks().getGuiIngredients();

 		final NBTTagCompound recipe = new NBTTagCompound();
-		final NBTTagList outputs = new NBTTagList();
-

 		int slotIndex = 0;
 		for( Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> ingredientEntry : ingredients.entrySet() )
@@ -120,13 +82,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 			IGuiIngredient<ItemStack> ingredient = ingredientEntry.getValue();
 			if( !ingredient.isInput() )
 			{
-				ItemStack output = ingredient.getDisplayedIngredient();
-				if( output != null )
-				{
-					final NBTTagCompound tag = new NBTTagCompound();
-					output.writeToNBT( tag );
-					outputs.appendTag( tag );
-				}
 				continue;
 			}

@@ -147,12 +102,8 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 						}

 						// prefer pure crystals.
-						for ( ItemStack stack : ingredient.getAllIngredients() )
+						for( ItemStack stack : ingredient.getAllIngredients() )
 						{
-							if( stack == null )
-							{
-								continue;
-							}
 							if( Platform.isRecipePrioritized( stack ) )
 							{
 								list.add( 0, stack );
@@ -163,7 +114,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 							}
 						}

-						for ( final ItemStack is : list )
+						for( final ItemStack is : list )
 						{
 							final NBTTagCompound tag = new NBTTagCompound();
 							is.writeToNBT( tag );
@@ -179,8 +130,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 			slotIndex++;
 		}

-		recipe.setTag( "outputs", outputs );
-
 		try
 		{
 			NetworkHandler.instance().sendToServer( new PacketJEIRecipe( recipe ) );
@@ -35,8 +35,6 @@ public enum TheOneProbeText
 	P2P_UNLINKED,
 	P2P_INPUT_ONE_OUTPUT,
 	P2P_INPUT_MANY_OUTPUTS,
-	P2P_OUTPUT_ONE_INPUT,
-	P2P_OUTPUT_MANY_INPUTS,
 	P2P_OUTPUT,
 	P2P_FREQUENCY,

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
PrototypeTrousers	2e0250de37	Merge pull request #1 from talchas/rv6-1.12 merge talchas fixes	2020-10-20 14:32:48 -03:00
talchas	34c490f92b	Safer implementation of CraftingGridCache updatePatterns coalescing	2019-12-20 19:54:14 -08:00
talchas	401f1ebb3e	Avoid quadratic behavior from rebuilding the entire crafting cache for each interface visited. Instead rebuild it at most once per tick, like cpu clusters. This is particularly important when channels are disabled, since in that case even adding a cable visits every grid node.	2019-12-09 22:43:55 -08:00