2

misc cleaning

build.gradle

@@ -57,7 +57,7 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
-version = aeversion + "-" + aechannel + "-" + aebuild + " " + trousers
+version = aeversion + "-" + aechannel + "-" + aebuild + "-" + extended + "-" + extendedversion
 group = aegroup
 archivesBaseName = aebasename
 

gradle.properties

@@ -3,20 +3,18 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v49b
+extended=extended_life
-
+extendedversion=v50g
 #########################################################
 # Versions                                              #
 #########################################################
 minecraft_version=1.12.2
 mcp_mappings=snapshot_20171003
 forge_version=14.23.5.2847
-
 #########################################################
 # Installable                                           #
 #########################################################
 hwyla_version=1.8.26-B41_1.12.2
-
 #########################################################
 # Provided APIs                                         #
 #########################################################
@@ -28,7 +26,6 @@ cofhcore_version=1.12.2-4.5.2.19
 crafttweaker_version=4.1.8.9
 inventorytweaks_version=1.63
 ctm_version=MC1.12.2-0.3.1.16
-
 #########################################################
 # Deployment                                            #
 #########################################################

gradle/scripts/dependencies.gradle

@@ -31,7 +31,7 @@ repositories {
 
     maven {
         name = "Tesla repo"
-        url "http://maven.mcmoddev.com"
+        url "https://maven.mcmoddev.com"
     }
 
     maven {
@@ -59,7 +59,7 @@ repositories {
         url "http://maven.k-4u.nl/"
     }
 
-   	maven { // CraftTweaker
+    maven { // CraftTweaker
         name 'jared maven'
         url "http://maven.blamejared.com/"
     }
@@ -70,9 +70,9 @@ repositories {
     //}
 
     maven {
-		name = "CurseForge"
+        name = "CurseForge"
-		url = "https://minecraft.curseforge.com/api/maven/"
+        url = "https://minecraft.curseforge.com/api/maven/"
-	}
+    }
 }
 
 configurations {
@@ -80,8 +80,7 @@ configurations {
 }
 
 dependencies {
-    compileOnly "gregtechce:gregtech:1.12.2:1.15.1.735"
+    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"
@@ -95,7 +94,7 @@ 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"
 

src/api/java/appeng/api/config/PowerUnits.java

@@ -28,7 +28,8 @@ 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
+	RF( "gui.appliedenergistics2.units.rf" ), // RF - Redstone Flux
+	GTEU( "gui.appliedenergistics2.units.gteu" ); // RF - Redstone Flux
 
 	/**
 	 * unlocalized name for the power unit.
@@ -46,14 +47,13 @@ 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 )

src/api/java/appeng/api/config/TunnelType.java

@@ -29,6 +29,7 @@ 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

src/api/java/appeng/api/definitions/IParts.java

@@ -58,6 +58,8 @@ public interface IParts
 
 	IItemDefinition storageBus();
 
+	IItemDefinition oreDictStorageBus();
+
 	IItemDefinition importBus();
 
 	IItemDefinition exportBus();
@@ -86,6 +88,8 @@ public interface IParts
 
 	IItemDefinition p2PTunnelFE();
 
+	IItemDefinition p2PTunnelGTEU();
+
 	IItemDefinition p2PTunnelLight();
 
 	// IItemDefinition p2PTunnelOpenComputers();
@@ -102,6 +106,8 @@ public interface IParts
 
 	IItemDefinition patternTerminal();
 
+	IItemDefinition expandedProcessingPatternTerminal();
+
 	IItemDefinition craftingTerminal();
 
 	IItemDefinition terminal();

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

@@ -119,6 +119,10 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 *
 	 * @param is An item stack
 	 */
-	boolean equals(ItemStack is);
+	boolean equals( ItemStack is );
+
+	ItemStack getCachedItemStack( long stackSize );
+
+	void setCachedItemStack( ItemStack is );
 
 }

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

@@ -56,7 +56,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	@Override
 	protected IProperty[] getAEStates()
 	{
-		return new IProperty[] { POWERED };
+		return new IProperty[]{POWERED};
 	}
 
 	@Override
@@ -108,4 +108,14 @@ 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 );
+		}
+	}
 }

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

@@ -20,6 +20,7 @@ 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;
@@ -57,6 +58,8 @@ public final class Capabilities
 
 	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY;
 
+	public static Capability<IEnergyContainer> GTCE_ENERGY;
+
 	/**
 	 * Register AE2 provided capabilities.
 	 */
@@ -103,7 +106,19 @@ public final class Capabilities
 	}
 
 	@CapabilityInject( IItemRepository.class )
-	private static void capIItemRepositoryRegistered( Capability<IItemRepository> cap ) { ITEM_REPOSITORY_CAPABILITY = cap; }
+	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()

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

@@ -104,7 +104,7 @@ public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>, IGhostIngre
         }
         if( doStart && GuiScreen.isShiftKeyDown() && Mouse.isButtonDown( 0 ) )
         {
-            if( gui instanceof GuiUpgradeable || gui instanceof GuiPatternTerm )
+            if( gui instanceof GuiUpgradeable || gui instanceof GuiPatternTerm || gui instanceof GuiExpandedProcessingPatternTerm )
             {
                 IJEIGhostIngredients ghostGui = ( (IJEIGhostIngredients) gui );
                 for( Target<I> target : targets )

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

@@ -21,6 +21,7 @@ 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;
@@ -123,6 +124,12 @@ 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 ) );

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

@@ -25,6 +25,7 @@ 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;
@@ -104,6 +105,11 @@ 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()

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

@@ -25,6 +25,7 @@ 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;
@@ -95,6 +96,12 @@ 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

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

@@ -0,0 +1,277 @@
+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;
+    }
+}
+

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

@@ -0,0 +1,179 @@
+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();
+        }
+    }
+
+}

src/main/java/appeng/client/gui/widgets/GuiImgButton.java

@@ -87,6 +87,7 @@ 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 );
@@ -108,15 +109,11 @@ 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,
+			this.registerApp( 16 * 2 + 6, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIStandard );
-					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,
+			this.registerApp( 16 * 2 + 8, Settings.SEARCH_MODE, SearchBoxMode.MANUAL_SEARCH_KEEP, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_StandardKeep );
-					ButtonToolTips.SearchMode_StandardKeep );
+			this.registerApp( 16 * 2 + 9, Settings.SEARCH_MODE, SearchBoxMode.JEI_AUTOSEARCH_KEEP, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIAutoKeep );
-			this.registerApp( 16 * 2 + 9, Settings.SEARCH_MODE, SearchBoxMode.JEI_AUTOSEARCH_KEEP, ButtonToolTips.SearchMode,
+			this.registerApp( 16 * 2 + 10, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH_KEEP, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIStandardKeep );
-					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 );
@@ -174,19 +171,15 @@ 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,
+			this.registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsNo );
-					ButtonToolTips.ReportInaccessibleItemsNo );
+			this.registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsYes );
-			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,
+			this.registerApp( 16 * 15 + 1, Settings.SCHEDULING_MODE, SchedulingMode.ROUNDROBIN, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeRoundRobin );
-					ButtonToolTips.SchedulingModeRoundRobin );
+			this.registerApp( 16 * 15 + 2, Settings.SCHEDULING_MODE, SchedulingMode.RANDOM, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeRandom );
-			this.registerApp( 16 * 15 + 2, Settings.SCHEDULING_MODE, SchedulingMode.RANDOM, ButtonToolTips.SchedulingMode,
-					ButtonToolTips.SchedulingModeRandom );
 		}
 	}
 
@@ -336,7 +329,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" );
 			}

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

@@ -19,14 +19,9 @@
 package appeng.client.render.model;
 
 
-import java.util.ArrayList;
+import appeng.block.storage.BlockDrive;
-import java.util.List;
+import appeng.block.storage.DriveSlotState;
-import java.util.Map;
+import appeng.block.storage.DriveSlotsState;
-
-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;
@@ -37,9 +32,12 @@ import net.minecraft.util.EnumFacing;
 import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
 import net.minecraftforge.common.property.IExtendedBlockState;
 
-import appeng.block.storage.BlockDrive;
+import javax.annotation.Nullable;
-import appeng.block.storage.DriveSlotState;
+import javax.vecmath.Matrix4f;
-import appeng.block.storage.DriveSlotsState;
+import javax.vecmath.Vector3f;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 
 public class DriveBakedModel implements IBakedModel
@@ -57,13 +55,17 @@ public class DriveBakedModel implements IBakedModel
 	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
 	{
 
-		List<BakedQuad> result = new ArrayList<>();
+		List<BakedQuad> result = new ArrayList<>( this.bakedBase.getQuads( state, side, rand ) );
-
-		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++ )

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

@@ -26,6 +26,7 @@ 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;
@@ -149,6 +150,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
 				if( ccr.getCpu() == c )
 				{
 					found = true;
+					break;
 				}
 			}
 
@@ -345,11 +347,15 @@ 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,
+			final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() );
-					this.getActionSrc() );
 			this.setAutoStart( false );
 			if( g != null && originalGui != null && this.getOpenContext() != null )
 			{

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

@@ -0,0 +1,528 @@
+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 );
+                }
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,140 @@
+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;
+    }
+}

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

@@ -178,7 +178,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		this.getAndUpdateOutput();
 	}
 
-	private ItemStack getAndUpdateOutput()
+	protected ItemStack getAndUpdateOutput()
 	{
 		final World world = this.getPlayerInv().player.world;
 		final InventoryCrafting ic = new InventoryCrafting( this, 3, 3 );
@@ -505,7 +505,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		}
 	}
 
-	private ItemStack[] getInputs()
+	protected ItemStack[] getInputs()
 	{
 		final ItemStack[] input = new ItemStack[9];
 		boolean hasValue = false;
@@ -527,7 +527,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return null;
 	}
 
-	private ItemStack[] getOutputs()
+	protected ItemStack[] getOutputs()
 	{
 		if( this.isCraftingMode() )
 		{
@@ -535,7 +535,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 +563,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return null;
 	}
 
-	private boolean isPattern( final ItemStack output )
+	boolean isPattern( final ItemStack output )
 	{
 		if( output.isEmpty() )
 		{
@@ -578,7 +578,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return isPattern;
 	}
 
-	private NBTBase createItemTag( final ItemStack i )
+	NBTBase createItemTag( final ItemStack i )
 	{
 		final NBTTagCompound c = new NBTTagCompound();
 
@@ -824,7 +824,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		return this.patternTerminal;
 	}
 
-	private boolean isSubstitute()
+	boolean isSubstitute()
 	{
 		return this.substitute;
 	}

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

@@ -20,11 +20,7 @@ package appeng.core;
 
 
 import java.io.File;
-import java.util.Arrays;
+import java.util.*;
-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;
@@ -64,13 +60,67 @@ 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_VANILLA = {
-	private static final String[] ORES_AE = { "CertusQuartz", "Wheat", "Fluix" };
+			"Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold",
-	private static final String[] ORES_COMMON = { "Copper", "Tin", "Silver", "Lead", "Bronze" };
+			"Charcoal", "NetherQuartz"
-	private static final String[] ORES_MISC = { "Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" };
+	};
+	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",
+	};
 
 	// 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 );
@@ -90,10 +140,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[] craftByStacks = {1, 10, 100, 1000};
-	private final int[] priorityByStacks = { 1, 10, 100, 1000 };
+	private final int[] priorityByStacks = {1, 10, 100, 1000};
-	private final int[] levelByStacks = { 1, 10, 100, 1000 };
+	private final int[] levelByStacks = {1, 10, 100, 1000};
-	private final int[] levelByMillibuckets = { 10, 100, 1000, 10000 };
+	private final int[] levelByMillibuckets = {10, 100, 1000, 10000};
 
 	// Spatial IO/Dimension
 	private int storageProviderID = -1;
@@ -125,7 +175,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;
@@ -148,6 +198,7 @@ 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 );
@@ -155,32 +206,24 @@ 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,
+		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();
-				"Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!" ).getBoolean();
 
-		this.setCategoryComment( "GrindStone",
+		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" );
-				"Creates recipe of the following pattern automatically: '1 oreTYPE => 2 dustTYPE' and '(1 ingotTYPE or 1 crystalTYPE or 1 gemTYPE) => 1 dustTYPE'" );
+		this.nonBlockingItems = this.get( "BlockingMode", "nonBlockingItems", nonBlockingItems, "NonBlockingItems" ).getStringList();
-		this.grinderOres = this.get( "GrindStone", "grinderOres", this.grinderOres, "The list of types to handle. Specify without a prefix like ore or dust." )
+
-				.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.grinderBlackList = Sets.newHashSet(
+		this.grinderOres = this.get( "GrindStone", "grinderOres", this.grinderOres, "The list of types to handle. Specify without a prefix like ore or dust." ).getStringList();
-				this.get( "GrindStone", "blacklist", new String[] {}, "Blacklists the exact oredict name from being handled by any recipe." )
+		this.grinderBlackList = Sets.newHashSet( this.get( "GrindStone", "blacklist", new String[]{}, "Blacklists the exact oredict name from being handled by any recipe." ).getStringList() );
-						.getStringList() );
+		this.oreDoublePercentage = this.get( "GrindStone", "oreDoublePercentage", this.oreDoublePercentage, "Chance to actually get an output with stacksize > 1." ).getDouble( this.oreDoublePercentage );
-		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 )
+		this.spawnChargedChance = (float) ( 1.0 - this.get( "worldGen", "spawnChargedChance", 1.0 - this.spawnChargedChance ).getDouble( 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 )
+		this.meteoriteMaximumSpawnHeight = this.get( "worldGen", "meteoriteMaximumSpawnHeight", this.meteoriteMaximumSpawnHeight ).getInt( 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 );
@@ -188,23 +231,16 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 
 		this.minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance;
 
-		this.addCustomCategoryComment( "wireless",
+		this.addCustomCategoryComment( "wireless", "Range= wirelessBaseRange + wirelessBoosterRangeMultiplier * Math.pow( boosters, wirelessBoosterExp )\nPowerDrain= wirelessBaseCost + wirelessCostMultiplier * Math.pow( boosters, 1 + boosters / wirelessHighWirelessCount )" );
-				"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 )
+		this.wirelessBoosterRangeMultiplier = this.get( "wireless", "wirelessBoosterRangeMultiplier", this.wirelessBoosterRangeMultiplier ).getDouble( this.wirelessBoosterRangeMultiplier );
-				.getDouble(
-						this.wirelessBoosterRangeMultiplier );
 		this.wirelessBoosterExp = this.get( "wireless", "wirelessBoosterExp", this.wirelessBoosterExp ).getDouble( this.wirelessBoosterExp );
-		this.wirelessTerminalDrainMultiplier = this.get( "wireless", "wirelessTerminalDrainMultiplier", this.wirelessTerminalDrainMultiplier )
+		this.wirelessTerminalDrainMultiplier = this.get( "wireless", "wirelessTerminalDrainMultiplier", this.wirelessTerminalDrainMultiplier ).getDouble( this.wirelessTerminalDrainMultiplier );
-				.getDouble(
-						this.wirelessTerminalDrainMultiplier );
 
-		this.formationPlaneEntityLimit = this.get( "automation", "formationPlaneEntityLimit", this.formationPlaneEntityLimit )
+		this.formationPlaneEntityLimit = this.get( "automation", "formationPlaneEntityLimit", this.formationPlaneEntityLimit ).getInt( 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 );
@@ -245,8 +281,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 
 		try
 		{
-			this.selectedPowerUnit = PowerUnits.valueOf(
+			this.selectedPowerUnit = PowerUnits.valueOf( this.get( "Client", "PowerUnit", this.selectedPowerUnit.name(), this.getListComment( this.selectedPowerUnit ) ).getString() );
-					this.get( "Client", "PowerUnit", this.selectedPowerUnit.name(), this.getListComment( this.selectedPowerUnit ) ).getString() );
 		}
 		catch( final Throwable t )
 		{
@@ -262,17 +297,13 @@ 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 )
+			this.spatialPowerMultiplier = this.get( "spatialio", "spatialPowerMultiplier", this.spatialPowerMultiplier ).getDouble( 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 )
+			this.craftingCalculationTimePerTick = this.get( "craftingCPU", "craftingCalculationTimePerTick", this.craftingCalculationTimePerTick ).getInt( this.craftingCalculationTimePerTick );
-					.getInt(
-							this.craftingCalculationTimePerTick );
 		}
 
 		this.updatable = true;
@@ -446,8 +477,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 			return true;
 		}
 
-		this.setCategoryComment( "OreCamouflage",
+		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." );
-				"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() );
 
@@ -715,6 +745,11 @@ public final class AEConfig extends Configuration implements IConfigurableObject
 		return this.quartzOresClusterAmount;
 	}
 
+	public String[] getNonBlockingItems()
+	{
+		return nonBlockingItems;
+	}
+
 	public int getChargedChange()
 	{
 		return this.chargedChange;

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

@@ -183,8 +183,7 @@ public final class AppEng
 		AELog.info( "Pre Initialization ( ended after " + watch.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );
 
 		// Instantiate all Plugins
-		List<Object> injectables = Lists.newArrayList(
+		List<Object> injectables = Lists.newArrayList( AEApi.instance() );
-				AEApi.instance() );
 		new PluginLoader().loadPlugins( injectables, event.getAsmData() );
 	}
 

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

@@ -52,6 +52,7 @@ 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;
@@ -69,6 +70,7 @@ 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;
@@ -77,6 +79,7 @@ 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;
@@ -89,9 +92,7 @@ public final class ApiParts implements IParts
 	public ApiParts( FeatureFactory registry, PartModels partModels )
 	{
 		final ItemPart itemPart = new ItemPart();
-		registry.item( "part", () -> itemPart )
+		registry.item( "part", () -> itemPart ).rendering( new ItemPartRendering( partModels, itemPart ) ).build();
-				.rendering( new ItemPartRendering( partModels, itemPart ) )
-				.build();
 
 		// Register all part models
 		for( PartType partType : PartType.values() )
@@ -112,6 +113,7 @@ 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 ) );
@@ -119,8 +121,7 @@ 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
+		this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart.createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) );
-				.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 ) );
@@ -130,6 +131,7 @@ 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 ) );
@@ -139,6 +141,7 @@ 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 ) );
@@ -245,6 +248,12 @@ public final class ApiParts implements IParts
 		return this.storageBus;
 	}
 
+	@Override
+	public IItemDefinition oreDictStorageBus()
+	{
+		return this.oreDictStorageBus;
+	}
+
 	@Override
 	public IItemDefinition importBus()
 	{
@@ -329,6 +338,11 @@ public final class ApiParts implements IParts
 		return this.p2PTunnelFE;
 	}
 
+	public IItemDefinition p2PTunnelGTEU()
+	{
+		return this.p2PTunnelGTEU;
+	}
+
 	@Override
 	public IItemDefinition p2PTunnelLight()
 	{
@@ -379,6 +393,12 @@ public final class ApiParts implements IParts
 		return this.patternTerminal;
 	}
 
+	@Override
+	public IItemDefinition expandedProcessingPatternTerminal()
+	{
+		return this.expandedProcessingPatternTerminal;
+	}
+
 	@Override
 	public IItemDefinition craftingTerminal()
 	{

src/main/java/appeng/core/features/AEFeature.java

@@ -25,13 +25,13 @@ public enum AEFeature
 	// is just flat out required by tons of
 	// important stuff.
 	CORE( "Core", null )
-	{
+			{
-		@Override
+				@Override
-		public boolean isVisible()
+				public boolean isVisible()
-		{
+				{
-			return false;
+					return false;
-		}
+				}
-	},
+			},
 
 	CERTUS_QUARTZ_WORLD_GEN( "CertusQuartzWorldGen", Constants.CATEGORY_WORLD ),
 	METEORITE_WORLD_GEN( "MeteoriteWorldGen", Constants.CATEGORY_WORLD ),
@@ -126,6 +126,7 @@ 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 ),
@@ -163,7 +164,6 @@ 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 ),

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

@@ -19,13 +19,14 @@
 package appeng.core.features.registries;
 
 
-import java.util.HashMap;
+import java.util.*;
-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;
@@ -67,6 +68,25 @@ 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
 		 */
@@ -127,12 +147,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
+		// itemduct
-																										// (opaque)
+		// (opaque)
 
 		/**
 		 * attune based on lots of random item related stuff
@@ -148,12 +168,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
+		// hardened
-																										// (opaque)
+		// (opaque)
 
 		for( final AEColor c : AEColor.values() )
 		{

src/main/java/appeng/core/localization/GuiText.java

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

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

@@ -21,6 +21,9 @@ 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;
@@ -53,39 +56,6 @@ 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;
@@ -171,6 +141,8 @@ 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 ),
@@ -185,6 +157,8 @@ 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

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

@@ -192,7 +192,20 @@ public class PacketInventoryAction extends AppEngPacket
 			}
 			else if( this.action == InventoryAction.PLACE_JEI_GHOST_ITEM )
 			{
-				if( sender.openContainer.inventorySlots.get( this.slot ) instanceof SlotFake )
+				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 )
 					{
@@ -217,20 +230,6 @@ public class PacketInventoryAction extends AppEngPacket
 						AELog.debug( e );
 					}
 				}
-
-				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
 			{

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

@@ -23,11 +23,12 @@ 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.Iterator;
+import java.util.List;
 
 import appeng.api.config.FuzzyMode;
-import appeng.api.storage.data.IItemList;
+import appeng.container.implementations.ContainerExpandedProcessingPatternTerm;
 import appeng.container.implementations.ContainerPatternTerm;
 import gregtech.common.items.MetaTool;
 import io.netty.buffer.ByteBuf;
@@ -69,8 +70,9 @@ import appeng.util.prioritylist.IPartitionList;
 public class PacketJEIRecipe extends AppEngPacket
 {
 
-	private ItemStack[][] recipe;
+	private List<ItemStack[]> recipe;
-	private ItemStack[] output;
+	private List<ItemStack> output;
+	static ItemStack[] emptyArray = {ItemStack.EMPTY};
 
 
 	// automatic.
@@ -81,28 +83,35 @@ public class PacketJEIRecipe extends AppEngPacket
 		final NBTTagCompound comp = CompressedStreamTools.readCompressed( bytes );
 		if( comp != null )
 		{
-			this.recipe = new ItemStack[9][];
+			this.recipe = new ArrayList<>();
-			for( int x = 0; x < this.recipe.length; x++ )
+
+			for( int x = 0; x < comp.getKeySet().size(); x++ )
 			{
-				final NBTTagList list = comp.getTagList( "#" + x, 10 );
+				if( comp.hasKey( "#" + x ) )
-				if( list.tagCount() > 0 )
 				{
-					this.recipe[x] = new ItemStack[list.tagCount()];
+					final NBTTagList list = comp.getTagList( "#" + x, 10 );
-					for( int y = 0; y < list.tagCount(); y++ )
+					if( list.tagCount() > 0 )
 					{
-						this.recipe[x][y] = new ItemStack( list.getCompoundTagAt( 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 ) );
+						}
+					}
+					else
+					{
+						this.recipe.add( emptyArray );
 					}
 				}
 			}
-			if ( comp.hasKey("outputs") ) {
+
-				final NBTTagList outputList = comp.getTagList("outputs", 10);
+			if( comp.hasKey( "outputs" ) )
-				this.output = new ItemStack[3];
+			{
-				for( int x = 0; x < this.output.length; x++ )
+				final NBTTagList outputList = comp.getTagList( "outputs", 10 );
+				this.output = new ArrayList<>();
+				for( int z = 0; z < outputList.tagCount(); z++ )
 				{
-					if( outputList.tagCount() > 0 )
+					this.output.add( new ItemStack( outputList.getCompoundTagAt( z ) ) );
-					{
-						this.output[x] = new ItemStack(outputList.getCompoundTagAt( x ));
-					}
 				}
 			}
 		}
@@ -166,15 +175,22 @@ 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[x] != null ) {
+					if( !cct.useRealItems() && this.recipe.get( x ) != null )
-						if (this.recipe[x].length > 0 )
+					{
-						currentItem.setCount( recipe[x][0].getCount() );
+						if( this.recipe.get( x ).length > 0 )
+						{
+							currentItem.setCount( recipe.get( x )[0].getCount() );
+						}
 					}
 
 					// put away old item
@@ -193,12 +209,12 @@ public class PacketJEIRecipe extends AppEngPacket
 					}
 				}
 
-				if( currentItem.isEmpty() && this.recipe[x] != null )
+				if( currentItem.isEmpty() && recipe.size() > x && recipe.get( x ) != null )
 				{
 					// for each variant
-					for( int y = 0; y < this.recipe[x].length && currentItem.isEmpty(); y++ )
+					for( int y = 0; y < this.recipe.get( x ).length && currentItem.isEmpty(); y++ )
 					{
-						final IAEItemStack request = AEItemStack.fromItemStack( this.recipe[x][y] );
+						final IAEItemStack request = AEItemStack.fromItemStack( this.recipe.get( x )[y] );
 						if( request != null )
 						{
 							// try ae
@@ -247,7 +263,7 @@ public class PacketJEIRecipe extends AppEngPacket
 								{
 									if (!cct.useRealItems())
 									{
-										out.setStackSize( recipe[x][y].getCount() );
+										out.setStackSize( recipe.get( x )[y].getCount() );
 									}
 									currentItem = out.createItemStack();
 								}
@@ -260,20 +276,20 @@ public class PacketJEIRecipe extends AppEngPacket
 
 								if( cct.useRealItems() )
 								{
-									currentItem = ad.removeSimilarItems(1, this.recipe[x][y],FuzzyMode.IGNORE_ALL, null );
+									currentItem = ad.removeSimilarItems( 1, this.recipe.get( x )[y], FuzzyMode.IGNORE_ALL, null );
 								}
 								else
 								{
-									currentItem = ad.simulateSimilarRemove(recipe[x][y].getCount(), this.recipe[x][y],FuzzyMode.IGNORE_ALL, null );
+									currentItem = ad.simulateSimilarRemove( recipe.get( x )[y].getCount(), this.recipe.get( x )[y], FuzzyMode.IGNORE_ALL, null );
 								}
 							}
 						}
 					}
 					if (!cct.useRealItems())
 					{
-						if( currentItem.isEmpty() && this.recipe[x] != null )
+						if( currentItem.isEmpty() && recipe.size() > x && this.recipe.get( x ) != null )
 						{
-							currentItem = this.recipe[x][0].copy();
+							currentItem = this.recipe.get( x )[0].copy();
 						}
 					}
 				}
@@ -282,14 +298,17 @@ public class PacketJEIRecipe extends AppEngPacket
 
 			con.onCraftMatrixChanged( new WrapperInvItemHandler( craftMatrix ) );
 
-			if( this.output != null && con instanceof ContainerPatternTerm && !( (ContainerPatternTerm) con ).isCraftingMode() )
+			if( this.output != null && ( ( con instanceof ContainerPatternTerm && !( (ContainerPatternTerm) con ).isCraftingMode() ) || con instanceof ContainerExpandedProcessingPatternTerm ) ) {
-			{
+                IItemHandler outputSlots = cct.getInventoryByName("output");
-				IItemHandler outputSlots = cct.getInventoryByName( "output" );
+                for (int i = 0; i < outputSlots.getSlots(); ++i) {
-				for( int i = 0; i < this.output.length; ++i )
+                    ItemHandlerUtil.setStackInSlot(outputSlots, i, ItemStack.EMPTY);
-				{
+                }
-					if( this.output[i] == null ) continue;
+                for (int i = 0; i < this.output.size() && i < outputSlots.getSlots(); ++i) {
-					ItemHandlerUtil.setStackInSlot( outputSlots, i, this.output[i] );
+                    if (this.output.get(i) == null || this.output.get(i) == ItemStack.EMPTY) {
-				}
+                        continue;
+                    }
+                    ItemHandlerUtil.setStackInSlot(outputSlots, i, this.output.get(i));
+                }
 			}
 		}
 	}
@@ -302,9 +321,9 @@ public class PacketJEIRecipe extends AppEngPacket
 	 */
 	private ItemStack canUseInSlot( int slot, ItemStack is )
 	{
-		if( this.recipe[slot] != null )
+		if( this.recipe.get( slot ) != null )
 		{
-			for( ItemStack option : this.recipe[slot] )
+			for( ItemStack option : this.recipe.get( slot ) )
 			{
 				if( ItemStack.areItemStacksEqual( is, option ) )
 				{

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

@@ -24,6 +24,8 @@ 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;
 
@@ -40,17 +42,6 @@ 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;
@@ -166,58 +157,109 @@ public class PacketValueConfig extends AppEngPacket
 			final ContainerFluidLevelEmitter lvc = (ContainerFluidLevelEmitter) c;
 			lvc.setLevel( Long.parseLong( this.Value ), player );
 		}
-		else if( this.Name.startsWith( "PatternTerminal." ) && c instanceof ContainerPatternTerm )
+		else if( this.Name.startsWith( "PatternTerminal." ) )
 		{
-			final ContainerPatternTerm cpt = (ContainerPatternTerm) c;
+			if( c instanceof ContainerPatternTerm )
-			if( this.Name.equals( "PatternTerminal.CraftMode" ) )
 			{
-				cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) );
+				final ContainerPatternTerm cpt = (ContainerPatternTerm) c;
-			}
+				if( this.Name.equals( "PatternTerminal.CraftMode" ) )
-			else if( this.Name.equals( "PatternTerminal.Encode" ) )
-			{
-				if (this.Value.equals( "2" )) {
-					cpt.encodeAndMoveToInventory();
-				}
-				else
 				{
-					cpt.encode();
+					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" ) );
 				}
 			}
-			else if( this.Name.equals( "PatternTerminal.Clear" ) )
+			else if( c instanceof ContainerExpandedProcessingPatternTerm )
 			{
-				cpt.clear();
+				final ContainerExpandedProcessingPatternTerm cept = (ContainerExpandedProcessingPatternTerm) c;
-			}
+				if( this.Name.equals( "PatternTerminal.Encode" ) )
-			else if( this.Name.equals( "PatternTerminal.MultiplyByTwo" ) )
+				{
-			{
+					if( this.Value.equals( "2" ) )
-				cpt.multiply(2);
+					{
-			}
+						cept.encodeAndMoveToInventory();
-			else if( this.Name.equals( "PatternTerminal.MultiplyByThree" ) )
+					}
-			{
+					else
-				cpt.multiply(3);
+					{
-			}
+						cept.encode();
-			else if( this.Name.equals( "PatternTerminal.DivideByTwo" ) )
+					}
-			{
+				}
-				cpt.divide(2);
+				else if( this.Name.equals( "PatternTerminal.Clear" ) )
-			}
+				{
-			else if( this.Name.equals( "PatternTerminal.DivideByThree" ) )
+					cept.clear();
-			{
+				}
-				cpt.divide(3);
+				else if( this.Name.equals( "PatternTerminal.MultiplyByTwo" ) )
-			}
+				{
-			else if( this.Name.equals( "PatternTerminal.IncreaseByOne" ) )
+					cept.multiply( 2 );
-			{
+				}
-				cpt.increase(1);
+				else if( this.Name.equals( "PatternTerminal.MultiplyByThree" ) )
-			}
+				{
-			else if( this.Name.equals( "PatternTerminal.DecreaseByOne" ) )
+					cept.multiply( 3 );
-			{
+				}
-				cpt.decrease(1);
+				else if( this.Name.equals( "PatternTerminal.DivideByTwo" ) )
-			}
+				{
-			else if( this.Name.equals( "PatternTerminal.MaximizeCount" ) )
+					cept.divide( 2 );
-			{
+				}
-				cpt.maximizeCount();
+				else if( this.Name.equals( "PatternTerminal.DivideByThree" ) )
-			}
+				{
-			else if( this.Name.equals( "PatternTerminal.Substitute" ) )
+					cept.divide( 3 );
-			{
+				}
-				cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) );
+				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();
+				}
 			}
 		}
 		else if( this.Name.startsWith( "StorageBus." ) )
@@ -234,6 +276,11 @@ 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" ) )
 				{
@@ -248,6 +295,20 @@ 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;
@@ -324,6 +385,14 @@ 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();

src/main/java/appeng/crafting/CraftingJob.java

@@ -50,16 +50,20 @@ import appeng.hooks.TickHandler;
 
 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 ms";
+	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_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> usedWhileBuilding = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+	private final IItemList<IAEItemStack> uniques = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+
 	private final HashMap<String, TwoIntegers> opsAndMultiplier = new HashMap<>();
 	private final Object monitor = new Object();
-	private final Stopwatch watch = Stopwatch.createUnstarted();
+	private final Stopwatch tickSpreadingWatch = Stopwatch.createUnstarted();
+	private final Stopwatch craftingTreeWatch = Stopwatch.createUnstarted();
 	private CraftingTreeNode tree;
 	private final IAEItemStack output;
 	private boolean simulate = false;
@@ -86,8 +90,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.callback = callback;
 		final ICraftingGrid cc = grid.getCache( ICraftingGrid.class );
 		final IStorageGrid sg = grid.getCache( IStorageGrid.class );
-		this.original = new MECraftingInventory( sg
+		this.original = new MECraftingInventory( sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );
-				.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );
 
 		this.setTree( this.getCraftingTree( cc, what ) );
 		this.availableCheck = null;
@@ -103,6 +106,16 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.availableCheck.injectItems( o, Actionable.MODULATE, this.actionSrc );
 	}
 
+	public IItemList<IAEItemStack> getUsedWhileBuilding()
+	{
+		return usedWhileBuilding;
+	}
+
+	public IItemList<IAEItemStack> getUniques()
+	{
+		return uniques;
+	}
+
 	IAEItemStack checkUse( final IAEItemStack available )
 	{
 		return this.availableCheck.extractItems( available, Actionable.MODULATE, this.actionSrc );
@@ -139,7 +152,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 				TickHandler.INSTANCE.registerCraftingSimulation( this.world, this );
 				this.handlePausing();
 
-				final Stopwatch timer = Stopwatch.createStarted();
+				craftingTreeWatch.start();
 
 				final MECraftingInventory craftingInventory = new MECraftingInventory( this.original, true, false, true );
 				craftingInventory.ignore( this.output );
@@ -154,9 +167,8 @@ public class CraftingJob implements Runnable, ICraftingJob
 					AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) );
 				}
 
-				this.logCraftingJob( "real", timer );
+				craftingTreeWatch.stop();
-				// if ( mode == Actionable.MODULATE )
+				this.logCraftingJob( "real, success", craftingTreeWatch );
-				// craftingInventory.moveItemsToStorage( storage );
 			}
 			catch( final CraftBranchFailure e )
 			{
@@ -164,23 +176,32 @@ public class CraftingJob implements Runnable, ICraftingJob
 
 				try
 				{
-					final Stopwatch timer = Stopwatch.createStarted();
+					if( actionSrc.player().isPresent() )
-					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 TwoIntegers ti = this.opsAndMultiplier.get( s );
+						craftingTreeWatch.reset().start();
-						AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) );
+						final MECraftingInventory craftingInventory = new MECraftingInventory( this.original, true, false, true );
-					}
+						craftingInventory.ignore( this.output );
 
-					this.logCraftingJob( "simulate", timer );
+						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 TwoIntegers ti = this.opsAndMultiplier.get( s );
+							AELog.crafting( s + " * " + ti.times + " = " + ( ti.perOp * ti.times ) );
+						}
+
+						craftingTreeWatch.stop();
+						this.logCraftingJob( "simulate", craftingTreeWatch );
+					}
+					else
+					{
+						craftingTreeWatch.stop();
+						this.logCraftingJob( "real, failed", craftingTreeWatch );
+					}
 				}
 				catch( final CraftBranchFailure e1 )
 				{
@@ -226,10 +247,11 @@ public class CraftingJob implements Runnable, ICraftingJob
 			this.incTime = 0;
 			synchronized ( this.monitor )
 			{
-				if( this.watch.elapsed( TimeUnit.MICROSECONDS ) > this.time )
+				if( this.tickSpreadingWatch.elapsed( TimeUnit.MICROSECONDS ) > this.time )
 				{
 					this.running = false;
-					this.watch.stop();
+					this.craftingTreeWatch.stop();
+					this.tickSpreadingWatch.stop();
 					this.monitor.notify();
 				}
 
@@ -245,12 +267,13 @@ 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++;
 	}
 
@@ -263,7 +286,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 
 		this.availableCheck = null;
 
-		synchronized( this.monitor )
+		synchronized ( this.monitor )
 		{
 			this.running = false;
 			this.done = true;
@@ -311,7 +334,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 	/**
 	 * @return true if this needs more simulation
 	 */
-	public boolean simulateFor(final int milli)
+	public boolean simulateFor( final int milli )
 	{
 		this.time = milli;
 
@@ -323,8 +346,8 @@ public class CraftingJob implements Runnable, ICraftingJob
 			}
 			if( !this.actionSrc.player().isPresent() )
 			{
-				this.watch.reset();
+				this.tickSpreadingWatch.reset();
-				this.watch.start();
+				this.tickSpreadingWatch.start();
 				this.monitor.notify();
 			}
 			this.running = true;
@@ -353,7 +376,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 		if( AELog.isCraftingLogEnabled() )
 		{
 			final String itemToOutput = this.output.toString();
-			final long elapsedTime = timer.elapsed( TimeUnit.MILLISECONDS );
+			final long elapsedTime = timer.elapsed( TimeUnit.MICROSECONDS );
 			final String actionSource;
 
 			if( this.actionSrc.player().isPresent() )

src/main/java/appeng/crafting/CraftingTreeNode.java

@@ -81,13 +81,42 @@ public class CraftingTreeNode
 		for( final ICraftingPatternDetails details : cc.getCraftingFor( this.what, this.parent == null ? null : this.parent.details, slot, this.world ) )// in
 		// order.
 		{
-			if( this.parent == null || this.parent.notRecursive( details ) )
+			if( this.parent == null || this.parent.notRecursive() )
 			{
 				this.nodes.add( new CraftingTreeProcess( cc, job, details, this, depth + 1 ) );
 			}
 		}
 	}
 
+	public CraftingTreeNode( final ICraftingGrid cc, final CraftingJob job, final IAEItemStack wat, final CraftingTreeProcess par, final int slot, final int depth, boolean available )
+	{
+		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 );
+
+		if( this.canEmit )
+		{
+			return; // if you can emit for something, you can't make it with patterns.
+		}
+
+		if( !available )
+		{
+			for( final ICraftingPatternDetails details : cc.getCraftingFor( this.what, this.parent == null ? null : this.parent.details, slot, this.world ) )// in
+			// order.
+			{
+				if( this.parent == null || this.parent.notRecursive() )
+				{
+					this.nodes.add( new CraftingTreeProcess( cc, job, details, this, depth + 1 ) );
+				}
+			}
+		}
+	}
+
 	boolean notRecursive( final ICraftingPatternDetails details )
 	{
 		IAEItemStack[] o = details.getCondensedOutputs();
@@ -115,7 +144,7 @@ public class CraftingTreeNode
 			return true;
 		}
 
-		return this.parent.notRecursive( details );
+		return this.parent.notRecursive();
 	}
 
 	IAEItemStack request( final MECraftingInventory inv, long l, final IActionSource src ) throws CraftBranchFailure, InterruptedException
@@ -124,31 +153,8 @@ public class CraftingTreeNode
 		final List<IAEItemStack> thingsUsed = new ArrayList<>();
 
 		this.what.setStackSize( l );
-		IAEItemStack available = inv.extractItems( this.what, Actionable.MODULATE, src );
 
-		if( available != null )
+		if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() )
-		{
-			if( !this.exhausted )
-			{
-				final IAEItemStack is = this.job.checkUse( available );
-
-				if( is != null )
-				{
-					thingsUsed.add( is.copy() );
-					this.used.add( is );
-				}
-			}
-
-			this.bytes += available.getStackSize();
-			l -= available.getStackSize();
-
-			if( l == 0 )
-			{
-				return available;
-			}
-		}
-
-		else if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() )
 		{
 			final Collection<IAEItemStack> itemList;
 			final IItemList<IAEItemStack> inventoryList = inv.getItemList();
@@ -177,12 +183,12 @@ public class CraftingTreeNode
 
 			for( IAEItemStack fuzz : itemList )
 			{
-				if( this.parent.details.isValidItemForSlot( this.getSlot(), fuzz.copy().setStackSize( 1 ).createItemStack(), this.world ) )
+				if( this.parent.details.isValidItemForSlot( this.getSlot(), fuzz.copy().getCachedItemStack( 1 ), this.world ) )
 				{
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( l );
 
-					available = inv.extractItems( fuzz, Actionable.MODULATE, src );
+					final IAEItemStack available = inv.extractItems( fuzz, Actionable.MODULATE, src );
 
 					if( available != null )
 					{
@@ -208,6 +214,32 @@ public class CraftingTreeNode
 				}
 			}
 		}
+		else
+		{
+			final IAEItemStack available = inv.extractItems( this.what, Actionable.MODULATE, src );
+
+			if( available != null )
+			{
+				if( !this.exhausted )
+				{
+					final IAEItemStack is = this.job.checkUse( available );
+
+					if( is != null )
+					{
+						thingsUsed.add( is.copy() );
+						this.used.add( is );
+					}
+				}
+
+				this.bytes += available.getStackSize();
+				l -= available.getStackSize();
+
+				if( l == 0 )
+				{
+					return available;
+				}
+			}
+		}
 
 		if( this.canEmit )
 		{
@@ -234,7 +266,7 @@ public class CraftingTreeNode
 
 				madeWhat.setStackSize( l );
 
-				available = inv.extractItems( madeWhat, Actionable.MODULATE, src );
+				final IAEItemStack available = inv.extractItems( madeWhat, Actionable.MODULATE, src );
 
 				if( available != null )
 				{
@@ -264,7 +296,7 @@ public class CraftingTreeNode
 						pro.request( subInv, 1, src );
 
 						this.what.setStackSize( l );
-						available = subInv.extractItems( this.what, Actionable.MODULATE, src );
+						final IAEItemStack available = subInv.extractItems( this.what, Actionable.MODULATE, src );
 
 						if( available != null )
 						{
@@ -313,6 +345,11 @@ public class CraftingTreeNode
 		throw new CraftBranchFailure( this.what, l );
 	}
 
+	boolean notRecursive()
+	{
+		return job.getUniques().findPrecise( this.what ) == null || this.parent == null;
+	}
+
 	void dive( final CraftingJob job )
 	{
 		if( this.missing > 0 )

src/main/java/appeng/crafting/CraftingTreeProcess.java

@@ -19,15 +19,13 @@
 package appeng.crafting;
 
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Map.Entry;
 
-import net.minecraft.inventory.InventoryCrafting;
+import appeng.api.config.FuzzyMode;
+import appeng.util.item.AEItemStack;
+import it.unimi.dsi.fastutil.objects.Object2LongArrayMap;
 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;
@@ -37,25 +35,21 @@ 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;
 
 
 public class CraftingTreeProcess
 {
-
 	private final CraftingTreeNode parent;
 	final ICraftingPatternDetails details;
 	private final CraftingJob job;
-	private final Map<CraftingTreeNode, Long> nodes = new HashMap<>();
+	private final Object2LongArrayMap<CraftingTreeNode> nodes = new Object2LongArrayMap<>();
 	private final int depth;
 	boolean possible = true;
-	private World world;
 	private long crafts = 0;
-	private boolean containerItems;
+	private IItemList<IAEItemStack> 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 )
@@ -66,144 +60,84 @@ public class CraftingTreeProcess
 		this.depth = depth;
 		final World world = job.getWorld();
 
-		if( details.isCraftable() )
+		final IAEItemStack[] list = details.getInputs();
+
+		for( final IAEItemStack part : details.getCondensedInputs() )
 		{
-			final IAEItemStack[] list = details.getInputs();
+			if( part.getItem().hasContainerItem( part.getDefinition() ) )
-
-			final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
-			final IAEItemStack[] is = details.getInputs();
-			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
-				ic.setInventorySlotContents( x, is[x] == null ? ItemStack.EMPTY : is[x].createItemStack() );
+				if( containerItems == null )
-			}
-
-			for( int x = 0; x < ic.getSizeInventory(); x++ )
-			{
-				final ItemStack g = ic.getStackInSlot( x );
-				if( !g.isEmpty() && g.getCount() > 1 )
 				{
-					this.fullSimulation = true;
+					containerItems = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 				}
+				containerItems.add( part );
+				this.limitQty = true;
 			}
-
+		}
-			for( final IAEItemStack part : details.getCondensedInputs() )
+		// this is minor different then below, this slot uses the pattern, but kinda fudges it.
-			{
+		for( IAEItemStack part : details.getCondensedInputs() ) {
-				final ItemStack g = part.createItemStack();
+			if (part == null) {
-
+				continue;
-				boolean isAnInput = false;
+			}
-				for( final IAEItemStack a : details.getCondensedOutputs() )
+			for (int x = 0; x < list.length; x++) {
-				{
+				final IAEItemStack comparePart = list[x];
-					if( !g.isEmpty() && a != null && a.equals( g ) )
+				if (part.equals(comparePart)) {
-					{
+					if (isContainerItem(part)) {
-						isAnInput = true;
+						part = list[x];
 					}
-				}
+					this.nodes.put(new CraftingTreeNode(cc, job, part.copy(), this, x, depth + 1), part.getStackSize());
-
+					if (details.canSubstitute()) {
-				if( isAnInput )
+						for ()
-				{
-					this.limitQty = true;
-				}
-
-				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 )
-					{
-						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 ) )
-						{
-							// use the first slot...
-							this.nodes.put( new CraftingTreeNode( cc, job, part.copy(), this, x, depth + 1 ), part.getStackSize() );
-							break;
-						}
 					}
+					break;
 				}
 			}
 		}
-		else
-		{
-			for( final IAEItemStack part : details.getCondensedInputs() )
-			{
-				final ItemStack g = part.createItemStack();
 
-				boolean isAnInput = false;
+		if(!this.limitQty) {
-				for( final IAEItemStack a : details.getCondensedOutputs() )
+			for (final IAEItemStack part : details.getCondensedOutputs()) {
-				{
+				for (final IAEItemStack o : details.getCondensedInputs()) {
-					if( !g.isEmpty() && a != null && a.equals( g ) )
+					if (part.equals(o)) {
-					{
+						this.limitQty = true;
-						isAnInput = true;
+						break;
 					}
 				}
-
-				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() );
 			}
 		}
 	}
 
-	boolean notRecursive( final ICraftingPatternDetails details )
+	boolean isContainerItem(IAEItemStack iaeItemStack) {
+		return (containerItems != null && !containerItems.findFuzzy(iaeItemStack, FuzzyMode.IGNORE_ALL).isEmpty());
+	}
+
+	boolean notRecursive()
 	{
-		return this.parent == null || this.parent.notRecursive( details );
+		return this.parent == null || this.parent.notRecursive();
 	}
 
 	long getTimes( final long remaining, final long stackSize )
 	{
-		if( this.limitQty || this.fullSimulation )
+		if( this.limitQty )
 		{
 			return 1;
 		}
 		return ( remaining / stackSize ) + ( remaining % stackSize != 0 ? 1 : 0 );
 	}
 
-	void request( final MECraftingInventory inv, final long i, final IActionSource src ) throws CraftBranchFailure, InterruptedException
+	void request( final MECraftingInventory inv, final long amountOfTimes, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
 		this.job.handlePausing();
-		if( this.fullSimulation )
+
+		// request and remove inputs...
+		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
 		{
-			final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
+			final IAEItemStack craftableStack = entry.getKey().getStack( entry.getValue() );
+			final IAEItemStack stack = entry.getKey().request( inv, craftableStack.getStackSize() * amountOfTimes, src );
 
-			for( final Entry<CraftingTreeNode, Long> entry : this.nodes.entrySet() )
+			if( containerItems != null && !this.containerItems.findFuzzy( stack, FuzzyMode.IGNORE_ALL ).isEmpty() )
 			{
-				final IAEItemStack item = entry.getKey().getStack( entry.getValue() );
+				final ItemStack is = Platform.getContainerItem( stack.createItemStack() );
-				final IAEItemStack stack = entry.getKey().request( inv, item.getStackSize(), src );
+				final IAEItemStack o = AEItemStack.fromItemStack( is );
-
-				ic.setInventorySlotContents( entry.getKey().getSlot(), stack.createItemStack() );
-			}
-
-			for( int x = 0; x < ic.getSizeInventory(); x++ )
-			{
-				ItemStack is = ic.getStackInSlot( x );
-				is = Platform.getContainerItem( is );
-
-				final IAEItemStack o = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is );
 				if( o != null )
 				{
 					this.bytes++;
@@ -211,26 +145,6 @@ public class CraftingTreeProcess
 				}
 			}
 		}
-		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 )
-				{
-					final ItemStack is = Platform.getContainerItem( stack.createItemStack() );
-					final IAEItemStack o = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is );
-					if( o != null )
-					{
-						this.bytes++;
-						inv.injectItems( o, Actionable.MODULATE, src );
-					}
-				}
-			}
-		}
 
 		// assume its possible.
 
@@ -238,18 +152,18 @@ public class CraftingTreeProcess
 		for( final IAEItemStack out : this.details.getCondensedOutputs() )
 		{
 			final IAEItemStack o = out.copy();
-			o.setStackSize( o.getStackSize() * i );
+			o.setStackSize( o.getStackSize() * amountOfTimes );
 			inv.injectItems( o, Actionable.MODULATE, src );
 		}
-		this.crafts += i;
+		this.crafts += amountOfTimes;
 	}
 
 	void dive( final CraftingJob job )
 	{
 		job.addTask( this.getAmountCrafted( this.parent.getStack( 1 ) ), this.crafts, this.details, this.depth );
-		for( final CraftingTreeNode pro : this.nodes.keySet() )
+		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
 		{
-			pro.dive( job );
+			entry.getKey().dive( job );
 		}
 
 		job.addBytes( this.crafts * 8 + this.bytes );
@@ -286,9 +200,9 @@ public class CraftingTreeProcess
 		this.crafts = 0;
 		this.bytes = 0;
 
-		for( final CraftingTreeNode pro : this.nodes.keySet() )
+		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
 		{
-			pro.setSimulate();
+			entry.getKey().setSimulate();
 		}
 	}
 
@@ -296,9 +210,9 @@ public class CraftingTreeProcess
 	{
 		craftingCPUCluster.addCrafting( this.details, this.crafts );
 
-		for( final CraftingTreeNode pro : this.nodes.keySet() )
+		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
 		{
-			pro.setJob( storage, craftingCPUCluster, src );
+			entry.getKey().setJob( storage, craftingCPUCluster, src );
 		}
 	}
 
@@ -311,9 +225,9 @@ public class CraftingTreeProcess
 			plan.addRequestable( i );
 		}
 
-		for( final CraftingTreeNode pro : this.nodes.keySet() )
+		for( final Entry<CraftingTreeNode, Long> entry : this.nodes.object2LongEntrySet() )
 		{
-			pro.getPlan( plan );
+			entry.getKey().getPlan( plan );
 		}
 	}
 }

src/main/java/appeng/crafting/MECraftingInventory.java

@@ -97,8 +97,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 			this.injectedCache = null;
 		}
 
-		this.localCache = this.target
+		this.localCache = this.target.getAvailableItems( new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) );
-				.getAvailableItems( new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) );
 
 		this.par = parent;
 	}
@@ -321,7 +320,6 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 						}
 					}
 					failed = true;
-					if( !src.player().isPresent() ) break;
 				}
 			}
 		}

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

@@ -68,7 +68,7 @@ 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, 53, 16, 68 ) );
+			this.guiSlots.add( new GuiFluidTank( fluidTank, i, DualityFluidInterface.NUMBER_OF_TANKS + i, 36 + 18 * i, 57, 16, 64 ) );
 			this.guiSlots.add( new GuiFluidSlot( configFluids, i, i, 35 + 18 * i, 35 ) );
 		}
 

src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java

@@ -77,14 +77,14 @@ public class GuiFluidTank extends GuiCustomSlot implements ITooltip
 				TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite( fluid.getFluid().getStill().toString() );
 				final int scaledHeight = (int) ( this.height * ( (float) fluid.getStackSize() / this.tank.getTankProperties()[this.slot].getCapacity() ) );
 
-				int iconHeightRemainder = scaledHeight % this.getHeight();
+				int iconHeightRemainder = scaledHeight % 16;
 				if( iconHeightRemainder > 0 )
 				{
-					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder, sprite, this.getWidth(), iconHeightRemainder );
+					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder, sprite, 16, iconHeightRemainder );
 				}
-				for( int i = 0; i < scaledHeight / this.getHeight(); i++ )
+				for( int i = 0; i < scaledHeight / 16; i++ )
 				{
-					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder - ( i + 1 ) * 16, sprite, this.getWidth(), this.getHeight() );
+					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder - ( i + 1 ) * 16, sprite, 16, 16 );
 				}
 			}
 		}
@@ -113,7 +113,7 @@ public class GuiFluidTank extends GuiCustomSlot implements ITooltip
 	@Override
 	public int yPos()
 	{
-		return this.y - 1;
+		return this.y - 4;
 	}
 
 	@Override
@@ -125,7 +125,7 @@ public class GuiFluidTank extends GuiCustomSlot implements ITooltip
 	@Override
 	public int getHeight()
 	{
-		return this.height + 1;
+		return this.height + 4;
 	}
 
 	@Override

src/main/java/appeng/fluids/helper/DualityFluidInterface.java

@@ -93,7 +93,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 
 	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;
+	private boolean resetConfigCache = true;
 	private IMEMonitor<IAEFluidStack> configCachedHandler;
 
 	public DualityFluidInterface( final AENetworkProxy networkProxy, final IFluidInterfaceHost ih )
@@ -117,15 +117,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 
 	public IUpgradeableHost getHost()
 	{
-		if( this.iHost instanceof IUpgradeableHost )
+		return this.iHost;
-		{
-			return this.iHost;
-		}
-		if( this.iHost instanceof IUpgradeableHost )
-		{
-			return this.iHost;
-		}
-		return null;
 	}
 
 	@Override
@@ -458,6 +450,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 			if( cfg != hasConfig )
 			{
 				resetConfigCache = true;
+				this.notifyNeighbors();
 			}
 		}
 		else if( inventory == this.tanks )

src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java

@@ -115,7 +115,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 	@Override
 	public void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan )
 	{
-		if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && diffStack.equals( this.config.getFluidInSlot( 0 ) ) )
+		if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && fullStack.equals( this.config.getFluidInSlot( 0 ) ) )
 		{
 			this.lastReportedValue = fullStack.getStackSize();
 			this.updateState();

src/main/java/appeng/helpers/DualityInterface.java

@@ -23,15 +23,15 @@ import java.util.*;
 
 import javax.annotation.Nullable;
 
-import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
+import appeng.util.inv.BlockingInventoryAdaptor;
 import appeng.util.*;
 import appeng.util.inv.*;
 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 gregtech.api.metatileentity.MetaTileEntityHolder;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Items;
@@ -108,14 +108,14 @@ import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
 
 public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
 {
-	private int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};
-
 	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;
 
 	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;
@@ -125,12 +125,8 @@ 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()
+	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
-																																	.storage()
+	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
-																																	.getStorageChannel( IItemStorageChannel.class ) );
-	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
-																																	   .storage()
-																																	   .getStorageChannel( IFluidStorageChannel.class ) );
 	private final UpgradeInventory upgrades;
 	private boolean hasConfig = false;
 	private int priority;
@@ -141,7 +137,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private final Accessor accessor = new Accessor();
 	private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
 	private EnumMap<EnumFacing, List<ItemStack>> waitingToSendFacing = new EnumMap<>( EnumFacing.class );
-	private GTCEInventoryAdaptor GTad;
 	private boolean resetConfigCache = true;
 	private IMEMonitor<IAEItemStack> configCachedHandler;
 
@@ -185,6 +180,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			if( cfg != hasConfig )
 			{
 				resetConfigCache = true;
+				this.notifyNeighbors();
 			}
 		}
 		else if( inv == this.patterns && ( !removed.isEmpty() || !added.isEmpty() ) )
@@ -244,12 +240,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 		NBTTagCompound sidedWaitList = new NBTTagCompound();
 
-		if (this.waitingToSendFacing != null)
+		if( this.waitingToSendFacing != null )
 		{
 			for( EnumFacing s : this.iHost.getTargets() )
 			{
 				NBTTagList waitingListSided = new NBTTagList();
-				if (this.waitingToSendFacing.containsKey( s ))
+				if( this.waitingToSendFacing.containsKey( s ) )
 				{
 					for( final ItemStack is : this.waitingToSendFacing.get( s ) )
 					{
@@ -357,8 +353,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			return;
 		}
-		if (this.waitingToSendFacing == null){
+		if( this.waitingToSendFacing == null )
-			this.waitingToSendFacing = new EnumMap<>(EnumFacing.class);
+		{
+			this.waitingToSendFacing = new EnumMap<>( EnumFacing.class );
 		}
 
 		this.waitingToSendFacing.computeIfAbsent( f, k -> new ArrayList<>() );
@@ -415,7 +412,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				// :P
 			}
 		}
-
 		this.notifyNeighbors();
 	}
 
@@ -429,15 +425,17 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			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;
 
-				for( int x = 0; x < accountedFor.length ; x++ )
+				for( int x = 0; x < accountedFor.length; x++ )
 				{
 					final ItemStack is = this.patterns.getStackInSlot( x );
 					if( details.getPattern() == is )
@@ -448,41 +446,49 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 				if( !found )
 				{
+					removed = true;
 					i.remove();
 				}
 			}
 		}
 
-		for( int x = 0; x < accountedFor.length ; x++ )
+		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() ) );
+		    this.gridProxy.getGrid().postEvent( new MENetworkCraftingPatternChange( this, this.gridProxy.getNode() ) );
 		}
-		catch( final GridAccessException e )
+		catch( GridAccessException e )
 		{
-			// :P
+			e.printStackTrace();
 		}
 	}
 
-	private boolean hasWorkToDo() {
+	private boolean hasWorkToDo()
+	{
 
-		if (hasItemsToSend()){
+		if( hasItemsToSend() )
+		{
 			return true;
 		}
 
-		if(hasItemsToSendFacing()){
+		if( hasItemsToSendFacing() )
+		{
 			return true;
 		}
 
-		for (final IAEItemStack requiredWork : this.requireWork) {
+		for( final IAEItemStack requiredWork : this.requireWork )
-			if (requiredWork != null) {
+		{
+			if( requiredWork != null )
+			{
 				return true;
 			}
 		}
@@ -593,7 +599,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 	private boolean hasItemsToSendFacing()
 	{
-		if (waitingToSendFacing != null)
+		if( waitingToSendFacing != null )
 		{
 			for( EnumFacing enumFacing : waitingToSendFacing.keySet() )
 			{
@@ -613,10 +619,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		List<ItemStack> dropList = new ArrayList<>();
 		for( int invSlot = 0; invSlot < patterns.getSlots(); invSlot++ )
 		{
-			if( invSlot > 8 +  this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) * 9 )
+			if( invSlot > 8 + this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) * 9 )
 			{
 				ItemStack is = patterns.getStackInSlot( invSlot );
-				if( is.isEmpty() ) continue;
+				if( is.isEmpty() )
+				{
+					continue;
+				}
 				dropList.add( patterns.extractItem( invSlot, Integer.MAX_VALUE, false ) );
 			}
 		}
@@ -633,8 +642,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	@Override
 	public boolean canInsert( final ItemStack stack )
 	{
-		final IAEItemStack out = this.destination.injectItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ),
+		final IAEItemStack out = this.destination.injectItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( stack ), Actionable.SIMULATE, null );
-				Actionable.SIMULATE, null );
 		if( out == null )
 		{
 			return true;
@@ -708,7 +716,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			this.pushItemsOut( this.iHost.getTargets() );
 		}
 
-		if (hasItemsToSendFacing())
+		if( hasItemsToSendFacing() )
 		{
 			for( EnumFacing enumFacing : waitingToSendFacing.keySet() )
 			{
@@ -731,7 +739,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();
 
@@ -778,8 +786,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 	private void pushItemsOut( final EnumFacing s )
 	{
-		if (!this.waitingToSendFacing.containsKey(s) ||
+		if( !this.waitingToSendFacing.containsKey( s ) || ( this.waitingToSendFacing.containsKey( s ) && this.waitingToSendFacing.get( s ).isEmpty() ) )
-				(this.waitingToSendFacing.containsKey(s) && this.waitingToSendFacing.get( s ).isEmpty())) {
+		{
 			return;
 		}
 
@@ -792,17 +800,18 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			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();
-			final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 			if( ad != null )
 			{
 				final ItemStack result = ad.addItems( whatToSend );
 				if( !result.isEmpty() )
 				{
-					whatToSend.setCount( whatToSend.getCount() - ( whatToSend.getCount() - result.getCount() ) );
+					whatToSend.setCount( result.getCount() );
 				}
 				else
 				{
@@ -843,42 +852,7 @@ 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( this.craftingTracker.isBusy( x ) )
+			if( itemStack.getStackSize() < 0 )
-			{
-				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();
-				}
-
-				IAEItemStack storedStack = this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findPrecise( itemStack );
-				if( storedStack != null )
-				{
-					if( storedStack.getStackSize() > 0 )
-					{
-						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 if( storedStack.isCraftable() )
-					{
-						changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
-					}
-				}
-			}
-			else if( itemStack.getStackSize() < 0 )
 			{
 				IAEItemStack toStore = itemStack.copy();
 				toStore.setStackSize( -toStore.getStackSize() );
@@ -916,6 +890,50 @@ 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();
+				}
+				else
+				{
+					itemStack.setCachedItemStack( inputStack );
+				}
+
+				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() )
+					{
+						changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
+					}
+				}
+			}
 			// else wtf?
 		}
 		catch( final GridAccessException e )
@@ -943,17 +961,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				if (this.failedCraftTriesSlot[x] <= 0)
+				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(), this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
-				{
-					boolean crafted = this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
-						this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
-
-					if (crafted) this.failedCraftTriesSlot[x] = 0;
-					else{
-						this.failedCraftTriesSlot[x] += 2;
-					}
-				}
-				this.failedCraftTriesSlot[x] -= 1;
 			}
 		}
 		catch( final GridAccessException e )
@@ -1093,12 +1101,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 	private boolean invIsBlocked( InventoryAdaptor inv )
 	{
-		return  (inv.containsItems());
+		return ( inv.containsItems() );
 	}
 
-	private static boolean invIsBlockedGTCE( GTCEInventoryAdaptor inv )
+	private static boolean invIsCustomBlocking( BlockingInventoryAdaptor inv )
 	{
-		return ( !inv.canRemoveAllExceptCircuits() );
+		return ( inv.containsBlockingItems() );
 	}
 
 	@Override
@@ -1155,24 +1163,26 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			{
 				if( this.isBlocking() )
 				{
-					IPhantomTile phantomTE = null;
+					IPhantomTile phantomTE;
-					if( Loader.isModLoaded( "actuallyadditions" ) && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
+					if( Loader.isModLoaded( "actuallyadditions" ) && te instanceof IPhantomTile )
 					{
 						phantomTE = ( (IPhantomTile) te );
 						if( phantomTE.hasBoundPosition() )
 						{
 							TileEntity phantom = w.getTileEntity( phantomTE.getBoundPosition() );
-							if( phantom instanceof MetaTileEntityHolder && isGTCEblocked( phantom, s ) )
+							if( NonBlockingItems.INSTANCE.getMap().containsKey( phantom.getBlockType().getRegistryName().getResourceDomain() ) )
 							{
-								visitedFaces.remove( s );
+								if( isCustomInvBlocking( phantom, s ) )
-								continue;
+								{
+									visitedFaces.remove( s );
+									continue;
+								}
 							}
 						}
 					}
-
+					else if( NonBlockingItems.INSTANCE.getMap().containsKey( te.getBlockType().getRegistryName().getResourceDomain() ) )
-					else if( Loader.isModLoaded( "gregtech" ) && te instanceof MetaTileEntityHolder )
 					{
-						if( isGTCEblocked( te, s ) )
+						if( isCustomInvBlocking( te, s ) )
 						{
 							visitedFaces.remove( s );
 							continue;
@@ -1227,28 +1237,31 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			for( final EnumFacing s : possibleDirections )
 			{
 				final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
-				IPhantomTile phantomTE = null;
+				IPhantomTile phantomTE;
 
 				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 				if( ad != null )
 				{
-					if( Loader.isModLoaded( "actuallyadditions") && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
+					if( Loader.isModLoaded( "actuallyadditions" ) && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
 					{
 						phantomTE = ( (IPhantomTile) te );
 						if( phantomTE.hasBoundPosition() )
 						{
 							TileEntity phantom = w.getTileEntity( phantomTE.getBoundPosition() );
-							if( phantom instanceof MetaTileEntityHolder && !isGTCEblocked( phantom, s ) )
+							if( NonBlockingItems.INSTANCE.getMap().containsKey( phantom.getBlockType().getRegistryName().getResourceDomain() ) )
 							{
-								allAreBusy = false;
+								if( !isCustomInvBlocking( phantom, s ) )
-								break;
+								{
+									allAreBusy = false;
+									break;
+								}
 							}
 						}
 					}
 
-					else if( Loader.isModLoaded( "gregtech" ) && te instanceof MetaTileEntityHolder )
+					else if( NonBlockingItems.INSTANCE.getMap().containsKey( te.getBlockType().getRegistryName().getResourceDomain() ) )
 					{
-						if( !isGTCEblocked( te, s ) )
+						if( !isCustomInvBlocking( te, s ) )
 						{
 							allAreBusy = false;
 							break;
@@ -1267,10 +1280,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		return busy;
 	}
 
-	boolean isGTCEblocked(TileEntity te, EnumFacing s)
+	boolean isCustomInvBlocking( TileEntity te, EnumFacing s )
 	{
-		GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
+		BlockingInventoryAdaptor blockingInventoryAdaptor = BlockingInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-		return invIsBlockedGTCE( GTad );
+		return invIsCustomBlocking( blockingInventoryAdaptor );
 	}
 
 	private boolean sameGrid( final IGrid grid ) throws GridAccessException
@@ -1293,7 +1306,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				continue;
 			}
 
-			if( !ad.simulateAdd( is.copy() ).isEmpty() )
+			if( !ad.simulateAdd( is ).isEmpty() )
 			{
 				return false;
 			}
@@ -1330,13 +1343,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 		if( this.waitingToSendFacing != null )
 		{
-			for (List<ItemStack> itemList : waitingToSendFacing.values())
+			for( List<ItemStack> itemList : waitingToSendFacing.values() )
 			{
-				for (final ItemStack is : itemList)
+				for( final ItemStack is : itemList )
 				{
-					if (!is.isEmpty())
+					if( !is.isEmpty() )
 					{
-						drops.add(is);
+						drops.add( is );
 					}
 				}
 			}
@@ -1466,9 +1479,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final Block directedBlock = directedBlockState.getBlock();
 				ItemStack what = new ItemStack( directedBlock, 1, directedBlock.getMetaFromState( directedBlockState ) );
 
-				if ( Loader.isModLoaded("gregtech") && directedBlock instanceof BlockMachine )
+				if( Loader.isModLoaded( "gregtech" ) && directedBlock instanceof BlockMachine )
 				{
-					MetaTileEntity metaTileEntity = getMetaTileEntity(hostWorld, targ);
+					MetaTileEntity metaTileEntity = getMetaTileEntity( hostWorld, targ );
 					return metaTileEntity.getMetaFullName();
 				}
 

src/main/java/appeng/helpers/MultiCraftingTracker.java

@@ -24,6 +24,7 @@ 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;
 
@@ -83,57 +84,70 @@ 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 && d.simulateAdd( ais.createItemStack() ).isEmpty() )
+		if( ais != null )
 		{
-			final Future<ICraftingJob> craftingJob = this.getJob( x );
+			ItemStack inputStack = ais.getCachedItemStack( ais.getStackSize() );
 
-			if( this.getLink( x ) != null )
+			ItemStack remaining = d.simulateAdd( inputStack );
-			{
-				return false;
-			}
-			else if( craftingJob != null )
-			{
 
-				try
+			if( remaining.isEmpty() )
+			{
+				ais.setCachedItemStack( inputStack );
+
+				final Future<ICraftingJob> craftingJob = this.getJob( x );
+
+				if( this.getLink( x ) != null )
 				{
-					ICraftingJob job = null;
+					return false;
-					if( craftingJob.isDone() )
+				}
+				else if( craftingJob != null )
+				{
+
+					try
 					{
-						job = craftingJob.get();
+						ICraftingJob job = null;
-					}
+						if( craftingJob.isDone() )
-
-					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 );
+							job = craftingJob.get();
+						}
 
-							return true;
+						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;
+							}
 						}
 					}
+					catch( final InterruptedException e )
+					{
+						// :P
+					}
+					catch( final ExecutionException e )
+					{
+						// :P
+					}
 				}
-				catch( final InterruptedException e )
+				else
 				{
-					// :P
+					if( this.getLink( x ) == null )
-				}
+					{
-				catch( final ExecutionException e )
+						final IAEItemStack aisC = ais.copy();
-				{
+						aisC.setStackSize( itemToCraft );
-					// :P
+
+						this.setJob( x, cg.beginCraftingJob( w, g, mySrc, aisC, null ) );
+					}
 				}
 			}
 			else
 			{
-				if( this.getLink( x ) == null )
+				ais.setCachedItemStack( remaining );
-				{
-					final IAEItemStack aisC = ais.copy();
-					aisC.setStackSize( itemToCraft );
-
-					this.setJob( x, cg.beginCraftingJob( w, g, mySrc, aisC, null ) );
-				}
 			}
 		}
 		return false;

src/main/java/appeng/helpers/NonBlockingItems.java

@@ -0,0 +1,122 @@
+package appeng.helpers;
+
+import appeng.core.AEConfig;
+import appeng.core.AELog;
+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" ) )
+						{
+							for( MetaItem<?> metaItem : MetaItem.getMetaItems() )
+							{
+								MetaItem<?>.MetaValueItem metaItem2 = metaItem.getItem( ModItemMeta[1] );
+								if( metaItem.getItem( ModItemMeta[1] ) != null )
+								{
+									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;
+										} );
+									}
+									else
+									{
+										AELog.error( "Item not found on nonBlocking config: " + s );
+									}
+								}
+								break;
+							}
+						}
+						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;
+	}
+}

src/main/java/appeng/helpers/PatternHelper.java

@@ -20,7 +20,6 @@ package appeng.helpers;
 
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -38,9 +37,6 @@ 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;
@@ -50,13 +46,16 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 {
 
 	private static final int CRAFTING_GRID_DIMENSION = 3;
-	private static final int ALL_INPUT_LIMIT = CRAFTING_GRID_DIMENSION * CRAFTING_GRID_DIMENSION;
+	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;
-	private static final int PROCESSING_OUTPUT_LIMIT = 3;
+	public static final int PROCESSING_OUTPUT_LIMIT = 6;
 
 	private final ItemStack patternItem;
-	private final InventoryCrafting crafting = new InventoryCrafting( new ContainerNull(), 3, 3 );
+	private final InventoryCrafting crafting;
-	private final InventoryCrafting testFrame = new InventoryCrafting( new ContainerNull(), 3, 3 );
+	private final InventoryCrafting testFrame;
 	private final ItemStack correctOutput;
 	private final IRecipe standardRecipe;
 	private final IAEItemStack[] condensedInputs;
@@ -84,6 +83,9 @@ 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 );
@@ -149,9 +151,9 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		}
 		final int outputLength = out.size();
 
-		this.inputs = in.toArray(new IAEItemStack[ALL_INPUT_LIMIT]);
+		this.inputs = in.toArray( new IAEItemStack[isCrafting ? CRAFTING_INPUT_LIMIT : PROCESSING_INPUT_LIMIT] );
-		this.outputs = out.toArray(new IAEItemStack[outputLength]);
+		this.outputs = out.toArray( new IAEItemStack[outputLength] );
-		this.substituteInputs = new HashMap<>(ALL_INPUT_LIMIT);
+		this.substituteInputs = new HashMap<>( CRAFTING_INPUT_LIMIT );
 
 		final Map<IAEItemStack, IAEItemStack> tmpOutputs = new HashMap<>();
 

src/main/java/appeng/hooks/TickHandler.java

@@ -190,10 +190,11 @@ public class TickHandler
 			synchronized ( this.craftingJobs )
 			{
 				final Collection<CraftingJob> jobSet = this.craftingJobs.get( wte.world );
-				if (!jobSet.isEmpty()) {
+				if( !jobSet.isEmpty() )
+				{
 					final int jobSize = jobSet.size();
 					final int microSecondsPerTick = AEConfig.instance().getCraftingCalculationTimePerTick() * 1000;
-					final int simTime = Math.max(1, microSecondsPerTick / jobSize);
+					final int simTime = Math.max( 1, microSecondsPerTick / jobSize );
 
 					jobSet.removeIf( cj -> !cj.simulateFor( simTime ) );
 				}
@@ -206,7 +207,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() )
@@ -238,7 +239,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 )
@@ -259,7 +260,7 @@ public class TickHandler
 		final Stopwatch sw = Stopwatch.createStarted();
 
 		IWorldCallable<?> c = null;
-		while( ( c = queue.poll() ) != null )
+		while ( ( c = queue.poll() ) != null )
 		{
 			try
 			{
@@ -275,15 +276,11 @@ 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 );
 		}

src/main/java/appeng/integration/IntegrationType.java

@@ -30,35 +30,37 @@ import appeng.integration.modules.waila.WailaModule;
 public enum IntegrationType
 {
 	IC2( IntegrationSide.BOTH, "Industrial Craft 2", "ic2" )
-	{
+			{
-		@Override
+				@Override
-		public IIntegrationModule createInstance()
+				public IIntegrationModule createInstance()
-		{
+				{
-			return Integrations.setIc2( new IC2Module() );
+					return Integrations.setIc2( new IC2Module() );
-		}
+				}
-	},
+			},
+
+	GTCE( IntegrationSide.BOTH, "GregTech", "gregtech" ),
 
 	RC( IntegrationSide.BOTH, "Railcraft", "railcraft" ),
 
 	MFR( IntegrationSide.BOTH, "Mine Factory Reloaded", "minefactoryreloaded" ),
 
 	Waila( IntegrationSide.BOTH, "Waila", "waila" )
-	{
+			{
-		@Override
+				@Override
-		public IIntegrationModule createInstance()
+				public IIntegrationModule createInstance()
-		{
+				{
-			return new WailaModule();
+					return new WailaModule();
-		}
+				}
-	},
+			},
 
 	InvTweaks( IntegrationSide.CLIENT, "Inventory Tweaks", "inventorytweaks" )
-	{
+			{
-		@Override
+				@Override
-		public IIntegrationModule createInstance()
+				public IIntegrationModule createInstance()
-		{
+				{
-			return Integrations.setInvTweaks( new InventoryTweaksModule() );
+					return Integrations.setInvTweaks( new InventoryTweaksModule() );
-		}
+				}
-	},
+			},
 
 	JEI( IntegrationSide.CLIENT, "Just Enough Items", "jei" )
 	{

src/main/java/appeng/integration/modules/gregtech/GTCEInventoryAdaptor.java

@@ -1,26 +0,0 @@
-package appeng.integration.modules.gregtech;
-
-import appeng.util.inv.ItemSlot;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-
-public abstract class GTCEInventoryAdaptor implements Iterable<ItemSlot>
-{
-    public static GTCEInventoryAdaptor getAdaptor(final TileEntity te, final EnumFacing d)
-    {
-        if (te != null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d))
-        {
-            // Attempt getting an IItemHandler for the given side via caps
-            IItemHandler itemHandler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d);
-            if (itemHandler != null)
-            {
-                return new GTCEItemHandler(itemHandler);
-            }
-        }
-        return null;
-    }
-
-    public abstract boolean canRemoveAllExceptCircuits();
-}

src/main/java/appeng/integration/modules/gregtech/GTCEItemHandler.java

@@ -1,58 +0,0 @@
-package appeng.integration.modules.gregtech;
-
-import appeng.util.inv.ItemHandlerIterator;
-import appeng.util.inv.ItemSlot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-
-public class GTCEItemHandler extends GTCEInventoryAdaptor
-{
-    ArrayList<Integer> GTCElenses = new ArrayList<>(Arrays.asList(15085,15214,15092,15111,15113,15219,15218,15243,15244,15209,15117,15206,15216,15331,15212,15213,15154,15122,15157,15190,15247));
-    ArrayList<Integer> GTCEmolds = new ArrayList<>(Arrays.asList(32301,32303,32304,32305,32306,32307,32308,32309,32313,32314,32315,32317,32350,32351,32352,32353,32354,32355,32356,32358,32359,32360,32361,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373));
-    Item smallGearExtruderShape = Item.getByNameOrId("contenttweaker:smallgearextrudershape");
-    Item creativePortableTankMold = Item.getByNameOrId("contenttweaker:creativeportabletankmold");
-
-    protected final IItemHandler itemHandler;
-
-    public GTCEItemHandler(IItemHandler itemHandler)
-    {
-        this.itemHandler = itemHandler;
-    }
-
-    boolean isBlockableItem(ItemStack stack)
-    {
-        if ( stack.getItem() == Item.getByNameOrId("gregtech:meta_item_1") ) {
-            int metadata = stack.getItemDamage();
-            if ( metadata == 32766 || GTCElenses.contains(metadata) || GTCEmolds.contains(metadata)) {
-                return false;
-            }
-        }
-        if ( stack.getItem() == smallGearExtruderShape ) return false;
-        if ( stack.getItem() == creativePortableTankMold) return false;
-        return true;
-    }
-
-    @Override
-    public boolean canRemoveAllExceptCircuits()
-    {
-        int slots = this.itemHandler.getSlots();
-        for ( int slot = 0; slot < slots; slot++ ) {
-            ItemStack is = this.itemHandler.getStackInSlot(slot);
-            if ( is.isEmpty() || !isBlockableItem(is) ) continue;
-
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Iterator<ItemSlot> iterator()
-    {
-        return new ItemHandlerIterator( this.itemHandler );
-    }
-}

src/main/java/appeng/integration/modules/jei/JEIPlugin.java

@@ -26,6 +26,7 @@ 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;
 
@@ -90,16 +91,13 @@ public class JEIPlugin implements IModPlugin
 		this.registerDescriptions( definitions, registry );
 
 		// Allow recipe transfer from JEI to crafting and pattern terminal
-		registry.getRecipeTransferRegistry()
+		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ), VanillaRecipeCategoryUid.CRAFTING );
-				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ),
+		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ), Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
-						VanillaRecipeCategoryUid.CRAFTING );
+		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerExpandedProcessingPatternTerm.class ), Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
-		registry.getRecipeTransferRegistry()
-				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ),
-						Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
 
 		aeGuiHandler = new AEGuiHandler();
-		registry.addAdvancedGuiHandlers(aeGuiHandler);
+		registry.addAdvancedGuiHandlers( aeGuiHandler );
-		registry.addGhostIngredientHandler( aeGuiHandler.getGuiContainerClass(), aeGuiHandler);
+		registry.addGhostIngredientHandler( aeGuiHandler.getGuiContainerClass(), aeGuiHandler );
 	}
 
 	private void registerDescriptions( IDefinitions definitions, IModRegistry registry )

src/main/java/appeng/items/parts/PartType.java

@@ -28,6 +28,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import appeng.parts.misc.*;
+import appeng.parts.p2p.*;
+import appeng.parts.reporting.*;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -57,33 +60,12 @@ import appeng.parts.automation.PartFormationPlane;
 import appeng.parts.automation.PartIdentityAnnihilationPlane;
 import appeng.parts.automation.PartImportBus;
 import appeng.parts.automation.PartLevelEmitter;
-import appeng.parts.misc.PartCableAnchor;
-import appeng.parts.misc.PartInterface;
-import appeng.parts.misc.PartInvertedToggleBus;
-import appeng.parts.misc.PartStorageBus;
-import appeng.parts.misc.PartToggleBus;
 import appeng.parts.networking.PartCableCovered;
 import appeng.parts.networking.PartCableGlass;
 import appeng.parts.networking.PartCableSmart;
 import appeng.parts.networking.PartDenseCableCovered;
 import appeng.parts.networking.PartDenseCableSmart;
 import appeng.parts.networking.PartQuartzFiber;
-import appeng.parts.p2p.PartP2PFEPower;
-import appeng.parts.p2p.PartP2PFluids;
-import appeng.parts.p2p.PartP2PIC2Power;
-import appeng.parts.p2p.PartP2PItems;
-import appeng.parts.p2p.PartP2PLight;
-import appeng.parts.p2p.PartP2PRedstone;
-import appeng.parts.p2p.PartP2PTunnelME;
-import appeng.parts.reporting.PartConversionMonitor;
-import appeng.parts.reporting.PartCraftingTerminal;
-import appeng.parts.reporting.PartDarkPanel;
-import appeng.parts.reporting.PartInterfaceTerminal;
-import appeng.parts.reporting.PartPanel;
-import appeng.parts.reporting.PartPatternTerminal;
-import appeng.parts.reporting.PartSemiDarkPanel;
-import appeng.parts.reporting.PartStorageMonitor;
-import appeng.parts.reporting.PartTerminal;
 import appeng.util.Platform;
 
 
@@ -92,96 +74,84 @@ public enum PartType
 	INVALID_TYPE( -1, "invalid", EnumSet.of( AEFeature.CORE ), EnumSet.noneOf( IntegrationType.class ), null ),
 
 	CABLE_GLASS( 0, "cable_glass", EnumSet.of( AEFeature.GLASS_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableGlass.class )
-	{
+			{
-		@Override
+				@Override
-		public boolean isCable()
+				public boolean isCable()
-		{
+				{
-			return true;
+					return true;
-		}
+				}
 
-		@Override
+				@Override
-		@SideOnly( Side.CLIENT )
+				@SideOnly( Side.CLIENT )
-		protected List<ModelResourceLocation> createItemModels( String baseName )
+				protected List<ModelResourceLocation> createItemModels( String baseName )
-		{
+				{
-			return Arrays.stream( AEColor.values() )
+					return Arrays.stream( AEColor.values() ).map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ).collect( Collectors.toList() );
-					.map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) )
+				}
-					.collect( Collectors.toList() );
+			},
-		}
-	},
 
 	CABLE_COVERED( 20, "cable_covered", EnumSet.of( AEFeature.COVERED_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableCovered.class )
-	{
+			{
-		@Override
+				@Override
-		public boolean isCable()
+				public boolean isCable()
-		{
+				{
-			return true;
+					return true;
-		}
+				}
 
-		@Override
+				@Override
-		@SideOnly( Side.CLIENT )
+				@SideOnly( Side.CLIENT )
-		protected List<ModelResourceLocation> createItemModels( String baseName )
+				protected List<ModelResourceLocation> createItemModels( String baseName )
-		{
+				{
-			return Arrays.stream( AEColor.values() )
+					return Arrays.stream( AEColor.values() ).map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ).collect( Collectors.toList() );
-					.map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) )
+				}
-					.collect( Collectors.toList() );
+			},
-		}
-	},
 
 	CABLE_SMART( 40, "cable_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.SMART_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartCableSmart.class )
-	{
+			{
-		@Override
+				@Override
-		public boolean isCable()
+				public boolean isCable()
-		{
+				{
-			return true;
+					return true;
-		}
+				}
 
-		@Override
+				@Override
-		@SideOnly( Side.CLIENT )
+				@SideOnly( Side.CLIENT )
-		protected List<ModelResourceLocation> createItemModels( String baseName )
+				protected List<ModelResourceLocation> createItemModels( String baseName )
-		{
+				{
-			return Arrays.stream( AEColor.values() )
+					return Arrays.stream( AEColor.values() ).map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ).collect( Collectors.toList() );
-					.map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) )
+				}
-					.collect( Collectors.toList() );
+			},
-		}
-	},
 
-	CABLE_DENSE_SMART( 60, "cable_dense_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet
+	CABLE_DENSE_SMART( 60, "cable_dense_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCableSmart.class )
-			.noneOf( IntegrationType.class ), PartDenseCableSmart.class )
+			{
-	{
+				@Override
-		@Override
+				public boolean isCable()
-		public boolean isCable()
+				{
-		{
+					return true;
-			return true;
+				}
-		}
 
-		@Override
+				@Override
-		@SideOnly( Side.CLIENT )
+				@SideOnly( Side.CLIENT )
-		protected List<ModelResourceLocation> createItemModels( String baseName )
+				protected List<ModelResourceLocation> createItemModels( String baseName )
-		{
+				{
-			return Arrays.stream( AEColor.values() )
+					return Arrays.stream( AEColor.values() ).map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ).collect( Collectors.toList() );
-					.map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) )
+				}
-					.collect( Collectors.toList() );
+			},
-		}
-	},
 
-	CABLE_DENSE_COVERED( 500, "cable_dense_covered", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet
+	CABLE_DENSE_COVERED( 500, "cable_dense_covered", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCableCovered.class )
-			.noneOf( IntegrationType.class ), PartDenseCableCovered.class )
+			{
-	{
+				@Override
-		@Override
+				public boolean isCable()
-		public boolean isCable()
+				{
-		{
+					return true;
-			return true;
+				}
-		}
 
-		@Override
+				@Override
-		@SideOnly( Side.CLIENT )
+				@SideOnly( Side.CLIENT )
-		protected List<ModelResourceLocation> createItemModels( String baseName )
+				protected List<ModelResourceLocation> createItemModels( String baseName )
-		{
+				{
-			return Arrays.stream( AEColor.values() )
+					return Arrays.stream( AEColor.values() ).map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) ).collect( Collectors.toList() );
-					.map( color -> modelFromBaseName( baseName + "_" + color.name().toLowerCase() ) )
+				}
-					.collect( Collectors.toList() );
+			},
-		}
-	},
 
 	TOGGLE_BUS( 80, "toggle_bus", EnumSet.of( AEFeature.TOGGLE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartToggleBus.class ),
 
@@ -193,14 +163,13 @@ public enum PartType
 
 	MONITOR( 160, "monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartPanel.class, "itemIlluminatedPanel" ),
 
-	SEMI_DARK_MONITOR( 180, "semi_dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet
+	SEMI_DARK_MONITOR( 180, "semi_dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartSemiDarkPanel.class, "itemIlluminatedPanel" ),
-			.noneOf( IntegrationType.class ), PartSemiDarkPanel.class, "itemIlluminatedPanel" ),
 
 	DARK_MONITOR( 200, "dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet.noneOf( IntegrationType.class ), PartDarkPanel.class, "itemIlluminatedPanel" ),
 
 	STORAGE_BUS( 220, "storage_bus", EnumSet.of( AEFeature.STORAGE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartStorageBus.class ),
-	FLUID_STORAGE_BUS( 221, "fluid_storage_bus", EnumSet.of( AEFeature.FLUID_STORAGE_BUS ), EnumSet
+	FLUID_STORAGE_BUS( 221, "fluid_storage_bus", EnumSet.of( AEFeature.FLUID_STORAGE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartFluidStorageBus.class ),
-			.noneOf( IntegrationType.class ), PartFluidStorageBus.class ),
+	OREDICT_STORAGE_BUS( 222, "oredict_storage_bus", EnumSet.of( AEFeature.STORAGE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartOreDicStorageBus.class ),
 
 	IMPORT_BUS( 240, "import_bus", EnumSet.of( AEFeature.IMPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ),
 
@@ -211,113 +180,109 @@ public enum PartType
 	FLUID_EXPORT_BUS( 261, "fluid_export_bus", EnumSet.of( AEFeature.FLUID_EXPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartFluidExportBus.class ),
 
 	LEVEL_EMITTER( 280, "level_emitter", EnumSet.of( AEFeature.LEVEL_EMITTER ), EnumSet.noneOf( IntegrationType.class ), PartLevelEmitter.class ),
-	FLUID_LEVEL_EMITTER( 281, "fluid_level_emitter", EnumSet.of( AEFeature.FLUID_LEVEL_EMITTER ), EnumSet
+	FLUID_LEVEL_EMITTER( 281, "fluid_level_emitter", EnumSet.of( AEFeature.FLUID_LEVEL_EMITTER ), EnumSet.noneOf( IntegrationType.class ), PartFluidLevelEmitter.class ),
-			.noneOf( IntegrationType.class ), PartFluidLevelEmitter.class ),
 
-	ANNIHILATION_PLANE( 300, "annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE ), EnumSet
+	ANNIHILATION_PLANE( 300, "annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ),
-			.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ),
 
-	IDENTITY_ANNIHILATION_PLANE( 301, "identity_annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE ), EnumSet
+	IDENTITY_ANNIHILATION_PLANE( 301, "identity_annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ),
-			.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ),
 
-	FLUID_ANNIHILATION_PLANE( 302, "fluid_annihilation_plane", EnumSet.of( AEFeature.FLUID_ANNIHILATION_PLANE ), EnumSet
+	FLUID_ANNIHILATION_PLANE( 302, "fluid_annihilation_plane", EnumSet.of( AEFeature.FLUID_ANNIHILATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFluidAnnihilationPlane.class ),
-			.noneOf( IntegrationType.class ), PartFluidAnnihilationPlane.class ),
 
 	FORMATION_PLANE( 320, "formation_plane", EnumSet.of( AEFeature.FORMATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ),
 
-	FLUID_FORMATION_PLANE( 321, "fluid_formation_plane", EnumSet.of( AEFeature.FLUID_FORMATION_PLANE ), EnumSet
+	FLUID_FORMATION_PLANE( 321, "fluid_formation_plane", EnumSet.of( AEFeature.FLUID_FORMATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFluidFormationPlane.class ),
-			.noneOf( IntegrationType.class ), PartFluidFormationPlane.class ),
 
 	PATTERN_TERMINAL( 340, "pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ),
 
-	CRAFTING_TERMINAL( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet
+	EXPANDED_PROCESSING_PATTERN_TERMINAL( 341, "expanded_processing_pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartExpandedProcessingPatternTerminal.class ),
-			.noneOf( IntegrationType.class ), PartCraftingTerminal.class ),
+
+	CRAFTING_TERMINAL( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ),
 
 	TERMINAL( 380, "terminal", EnumSet.of( AEFeature.TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ),
 
 	STORAGE_MONITOR( 400, "storage_monitor", EnumSet.of( AEFeature.STORAGE_MONITOR ), EnumSet.noneOf( IntegrationType.class ), PartStorageMonitor.class ),
 
-	CONVERSION_MONITOR( 420, "conversion_monitor", EnumSet.of( AEFeature.PART_CONVERSION_MONITOR ), EnumSet
+	CONVERSION_MONITOR( 420, "conversion_monitor", EnumSet.of( AEFeature.PART_CONVERSION_MONITOR ), EnumSet.noneOf( IntegrationType.class ), PartConversionMonitor.class ),
-			.noneOf( IntegrationType.class ), PartConversionMonitor.class ),
 
 	INTERFACE( 440, "interface", EnumSet.of( AEFeature.INTERFACE ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ),
 	FLUID_INTERFACE( 441, "fluid_interface", EnumSet.of( AEFeature.FLUID_INTERFACE ), EnumSet.noneOf( IntegrationType.class ), PartFluidInterface.class ),
 
-	P2P_TUNNEL_ME( 460, "p2p_tunnel_me", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME ), EnumSet
+	P2P_TUNNEL_ME( 460, "p2p_tunnel_me", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel )
-			.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel )
+			{
-	{
+				@Override
-		@Override
+				String getUnlocalizedName()
-		String getUnlocalizedName()
+				{
-		{
+					return "p2p_tunnel";
-			return "p2p_tunnel";
+				}
-		}
+			},
-	},
 
-	P2P_TUNNEL_REDSTONE( 461, "p2p_tunnel_redstone", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE ), EnumSet
+	P2P_TUNNEL_REDSTONE( 461, "p2p_tunnel_redstone", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel )
-			.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel )
+			{
-	{
+				@Override
-		@Override
+				String getUnlocalizedName()
-		String getUnlocalizedName()
+				{
-		{
+					return "p2p_tunnel";
-			return "p2p_tunnel";
+				}
-		}
+			},
-	},
 
-	P2P_TUNNEL_ITEMS( 462, "p2p_tunnel_items", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS ), EnumSet
+	P2P_TUNNEL_ITEMS( 462, "p2p_tunnel_items", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel )
-			.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel )
+			{
-	{
+				@Override
-		@Override
+				String getUnlocalizedName()
-		String getUnlocalizedName()
+				{
-		{
+					return "p2p_tunnel";
-			return "p2p_tunnel";
+				}
-		}
+			},
-	},
 
-	P2P_TUNNEL_FLUIDS( 463, "p2p_tunnel_fluids", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FLUIDS ), EnumSet
+	P2P_TUNNEL_FLUIDS( 463, "p2p_tunnel_fluids", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FLUIDS ), EnumSet.noneOf( IntegrationType.class ), PartP2PFluids.class, GuiText.FluidTunnel )
-			.noneOf( IntegrationType.class ), PartP2PFluids.class, GuiText.FluidTunnel )
+			{
-	{
+				@Override
-		@Override
+				String getUnlocalizedName()
-		String getUnlocalizedName()
+				{
-		{
+					return "p2p_tunnel";
-			return "p2p_tunnel";
+				}
-		}
+			},
-	},
 
-	P2P_TUNNEL_IC2( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet
+	P2P_TUNNEL_IC2( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet.of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel )
-			.of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel )
+			{
-	{
+				@Override
-		@Override
+				String getUnlocalizedName()
-		String getUnlocalizedName()
+				{
-		{
+					return "p2p_tunnel";
-			return "p2p_tunnel";
+				}
-		}
+			},
-	},
 
-	P2P_TUNNEL_LIGHT( 467, "p2p_tunnel_light", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT ), EnumSet
+	P2P_TUNNEL_LIGHT( 467, "p2p_tunnel_light", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel )
-			.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel )
+			{
-	{
+				@Override
-		@Override
+				String getUnlocalizedName()
-		String getUnlocalizedName()
+				{
-		{
+					return "p2p_tunnel";
-			return "p2p_tunnel";
+				}
-		}
+			},
-	},
 
-	P2P_TUNNEL_FE( 469, "p2p_tunnel_fe", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FE ), EnumSet
+	P2P_TUNNEL_FE( 469, "p2p_tunnel_fe", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FE ), EnumSet.noneOf( IntegrationType.class ), PartP2PFEPower.class, GuiText.FETunnel )
-			.noneOf( IntegrationType.class ), PartP2PFEPower.class, GuiText.FETunnel )
+			{
-	{
+				@Override
-		@Override
+				String getUnlocalizedName()
-		String getUnlocalizedName()
+				{
-		{
+					return "p2p_tunnel";
-			return "p2p_tunnel";
+				}
-		}
+			},
-	},
+
+	P2P_TUNNEL_GTEU( 470, "p2p_tunnel_gteu", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_GTEU ), EnumSet.of( IntegrationType.GTCE ), PartP2PGTCEPower.class, GuiText.GTEUTunnel )
+			{
+				@Override
+				String getUnlocalizedName()
+				{
+					return "p2p_tunnel";
+				}
+			},
 
 	// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of(
 	// IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
 
-	INTERFACE_TERMINAL( 480, "interface_terminal", EnumSet.of( AEFeature.INTERFACE_TERMINAL ), EnumSet
+	INTERFACE_TERMINAL( 480, "interface_terminal", EnumSet.of( AEFeature.INTERFACE_TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ),
-			.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ),
 
 	FLUID_TERMINAL( 520, "fluid_terminal", EnumSet.of( AEFeature.FLUID_TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartFluidTerminal.class );
 
@@ -358,8 +323,7 @@ public enum PartType
 		this.oreName = oreDict;
 
 		// The part is enabled if all features + integrations it needs are enabled
-		this.enabled = features.stream().allMatch( AEConfig.instance()::isFeatureEnabled ) && integrations.stream()
+		this.enabled = features.stream().allMatch( AEConfig.instance()::isFeatureEnabled ) && integrations.stream().allMatch( IntegrationRegistry.INSTANCE::isEnabled );
-				.allMatch( IntegrationRegistry.INSTANCE::isEnabled );
 
 		if( this.enabled )
 		{

src/main/java/appeng/me/Grid.java

@@ -19,12 +19,8 @@
 package appeng.me;
 
 
-import java.util.Collection;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
 import appeng.api.AEApi;
 import appeng.api.networking.IGrid;
@@ -220,9 +216,7 @@ public class Grid implements IGrid
 	@Override
 	public MENetworkEvent postEvent( final MENetworkEvent ev )
 	{
-		CraftingGridCache.pauseRebuilds();
 		final MENetworkEvent ret = this.eventBus.postEvent( this, ev );
-		CraftingGridCache.unpauseRebuilds();
 		return ret;
 	}
 

src/main/java/appeng/me/GridNode.java

@@ -59,12 +59,13 @@ import appeng.me.cache.CraftingGridCache;
 import appeng.me.pathfinding.IPathItem;
 import appeng.util.IWorldCallable;
 import appeng.util.ReadOnlyCollection;
+import net.minecraftforge.common.util.Constants;
 
 
 public class GridNode implements IGridNode, IPathItem
 {
 	private static final MENetworkChannelsChanged EVENT = new MENetworkChannelsChanged();
-	private static final int[] CHANNEL_COUNT = { 0, 8, 32 };
+	private static final int[] CHANNEL_COUNT = {0, 8, 32};
 
 	private final List<IGridConnection> connections = new ArrayList<>();
 	private final IGridBlock gridProxy;
@@ -165,8 +166,6 @@ public class GridNode implements IGridNode, IPathItem
 	{
 		final Object tracker = new Object();
 
-		CraftingGridCache.pauseRebuilds();
-
 		Deque<GridNode> nextRun = new ArrayDeque<>();
 		nextRun.add( this );
 
@@ -177,9 +176,9 @@ public class GridNode implements IGridNode, IPathItem
 			final Deque<IGridConnection> nextConn = new ArrayDeque<>();
 			final IGridConnectionVisitor gcv = (IGridConnectionVisitor) g;
 
-			while( !nextRun.isEmpty() )
+			while ( !nextRun.isEmpty() )
 			{
-				while( !nextConn.isEmpty() )
+				while ( !nextConn.isEmpty() )
 				{
 					gcv.visitConnection( nextConn.poll() );
 				}
@@ -195,7 +194,7 @@ public class GridNode implements IGridNode, IPathItem
 		}
 		else
 		{
-			while( !nextRun.isEmpty() )
+			while ( !nextRun.isEmpty() )
 			{
 				final Iterable<GridNode> thisRun = nextRun;
 				nextRun = new ArrayDeque<>();
@@ -206,7 +205,6 @@ public class GridNode implements IGridNode, IPathItem
 				}
 			}
 		}
-		CraftingGridCache.unpauseRebuilds();
 	}
 
 	@Override
@@ -268,7 +266,7 @@ public class GridNode implements IGridNode, IPathItem
 	@Override
 	public void destroy()
 	{
-		while( !this.connections.isEmpty() )
+		while ( !this.connections.isEmpty() )
 		{
 			// not part of this network for real anymore.
 			if( this.connections.size() == 1 )
@@ -333,7 +331,11 @@ public class GridNode implements IGridNode, IPathItem
 	@Override
 	public void loadFromNBT( final String name, final NBTTagCompound nodeData )
 	{
-		if( this.myGrid == null )
+		if( this.myGrid != null )
+		{
+			throw new IllegalStateException( "Loading data after part of a grid, this is invalid." );
+		}
+		if( nodeData.hasKey( name, 10 ) )
 		{
 			final NBTTagCompound node = nodeData.getCompoundTag( name );
 			this.playerID = node.getInteger( "p" );
@@ -345,7 +347,9 @@ public class GridNode implements IGridNode, IPathItem
 		}
 		else
 		{
-			throw new IllegalStateException( "Loading data after part of a grid, this is invalid." );
+			this.playerID = -1; // Unknown owner
+			setLastSecurityKey( -1 );
+			setGridStorage( null );
 		}
 	}
 
@@ -371,7 +375,7 @@ public class GridNode implements IGridNode, IPathItem
 	@Override
 	public boolean meetsChannelRequirements()
 	{
-		return( !this.gridProxy.getFlags().contains( GridFlags.REQUIRE_CHANNEL ) || this.getUsedChannels() > 0 );
+		return ( !this.gridProxy.getFlags().contains( GridFlags.REQUIRE_CHANNEL ) || this.getUsedChannels() > 0 );
 	}
 
 	@Override

src/main/java/appeng/me/cache/CraftingGridCache.java

@@ -113,9 +113,9 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	private final GenericInterestManager<CraftingWatcher> interestManager = new GenericInterestManager<>( this.interests );
 	private IStorageGrid storageGrid;
 	private IEnergyGrid energyGrid;
+	int i;
 	private boolean updateList = false;
-	private static int pauseRebuilds = 0;
+	private boolean updatePatterns = false;
-	private static Set<CraftingGridCache> rebuildNeeded = new HashSet<>();
 
 	public CraftingGridCache( final IGrid grid )
 	{
@@ -140,8 +140,14 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			this.updateCPUClusters();
 		}
 
+		if( updatePatterns )
+		{
+			this.recalculateCraftingPatterns();
+			this.updatePatterns = false;
+		}
+
 		final Iterator<CraftingLinkNexus> craftingLinkIterator = this.craftingLinks.values().iterator();
-		while( craftingLinkIterator.hasNext() )
+		while ( craftingLinkIterator.hasNext() )
 		{
 			if( craftingLinkIterator.next().isDead( this.grid, this ) )
 			{
@@ -187,7 +193,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		if( machine instanceof ICraftingProvider )
 		{
 			this.craftingProviders.remove( machine );
-			this.updatePatterns();
+			this.updatePatterns = true;
 		}
 	}
 
@@ -221,7 +227,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		if( machine instanceof ICraftingProvider )
 		{
 			this.craftingProviders.add( (ICraftingProvider) machine );
-			this.updatePatterns();
+			this.updatePatterns = true;
 		}
 	}
 
@@ -242,36 +248,15 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		// nothing!
 	}
 
-	public static void pauseRebuilds()
-	{
-		pauseRebuilds++;
-	}
-
-	public static void unpauseRebuilds()
-	{
-		pauseRebuilds--;
-		if (pauseRebuilds == 0 && rebuildNeeded.size() > 0)
-		{
-			ImmutableSet<CraftingGridCache> needed = ImmutableSet.copyOf(rebuildNeeded);
-			rebuildNeeded.clear();
-			for ( CraftingGridCache cache: needed )
-			{
-				cache.updatePatterns();
-			}
-		}
-	}
-
 	private void updatePatterns()
 	{
-		// coalesce change events during a grid traversal to a single rebuild
+		this.updatePatterns = true;
-		if (pauseRebuilds != 0)
+	}
-		{
-			rebuildNeeded.add(this);
-			return;
-		}
 
-		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>(this.craftableItems);
+	private void recalculateCraftingPatterns()
-		final Set<IAEItemStack> oldEmitableItems = new HashSet<>(this.emitableItems);
+	{
+		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>( this.craftableItems );
+		final Set<IAEItemStack> oldEmitableItems = new HashSet<>( this.emitableItems );
 
 		// erase list.
 		this.craftingMethods.clear();
@@ -312,25 +297,29 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			this.craftableItems.put( e.getKey(), ImmutableList.copyOf( e.getValue() ) );
 		}
 
-		Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftablesChanged = new Object2ObjectArrayMap<>();
+		List<IAEItemStack> craftablesChanged = new ArrayList<>();
 
 		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> i = oldItems.entrySet();
-		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : i) {
+		for( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : i )
-			if (!this.craftableItems.containsKey( ais.getKey() )) {
+		{
+			if( !this.craftableItems.containsKey( ais.getKey() ) )
+			{
 				IAEItemStack changedStack = ais.getKey().copy();
 				changedStack.reset();
 				changedStack.setCraftable( false );
-				craftablesChanged.put( changedStack, ais.getValue() );
+				craftablesChanged.add( changedStack );
 			}
 		}
 
 		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> j = this.craftableItems.entrySet();
-		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : j) {
+		for( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : j )
-			if (!oldItems.containsKey( ais )){
+		{
+			if( !oldItems.containsKey( ais ) )
+			{
 				IAEItemStack changedStack = ais.getKey().copy();
 				changedStack.reset();
 				changedStack.setCraftable( true );
-				craftablesChanged.put( changedStack, ais.getValue() );
+				craftablesChanged.add( changedStack );
 			}
 		}
 
@@ -341,7 +330,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 				IAEItemStack changedStack = st.copy();
 				changedStack.reset();
 				changedStack.setCraftable( false );
-				craftablesChanged.put( changedStack, null );
+				craftablesChanged.add( changedStack );
 			}
 		}
 
@@ -352,12 +341,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 				IAEItemStack changedStack = st.copy();
 				changedStack.reset();
 				changedStack.setCraftable( true );
-				craftablesChanged.put( changedStack, null );
+				craftablesChanged.add( changedStack );
 			}
 		}
 
-		this.storageGrid.postCraftablesChanges( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), craftablesChanged.keySet(),
+		this.storageGrid.postCraftablesChanges( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), craftablesChanged, new BaseActionSource() );
-				new BaseActionSource() );
 	}
 
 	private void updateCPUClusters()
@@ -535,22 +523,6 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 		if( res == null )
 		{
-			if( details != null && details.isCraftable() )
-			{
-				for( final IAEItemStack ais : this.craftableItems.keySet() )
-				{
-					if( ais.getItem() == whatToCraft.getItem() && ( !ais.getItem().getHasSubtypes() || ais.getItemDamage() == whatToCraft.getItemDamage() ) )
-					{
-						// TODO: check if OK
-						// TODO: this is slightly hacky, but fine as long as we only deal with itemstacks
-						if( details.isValidItemForSlot( slotIndex, ais.asItemStackRepresentation(), world ) )
-						{
-							return this.craftableItems.get( ais );
-						}
-					}
-				}
-			}
-
 			return ImmutableSet.of();
 		}
 
@@ -596,8 +568,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 				}
 			}
 
-			Collections.sort( validCpusClusters, ( firstCluster, nextCluster ) ->
+			Collections.sort( validCpusClusters, ( firstCluster, nextCluster ) -> {
-			{
 				if( prioritizePower )
 				{
 					final int comparison1 = Long.compare( nextCluster.getCoProcessors(), firstCluster.getCoProcessors() );
@@ -676,7 +647,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 	public boolean hasCpu( final ICraftingCPU cpu )
 	{
-		if (cpu instanceof CraftingCPUCluster)
+		if( cpu instanceof CraftingCPUCluster )
 		{
 			return this.craftingCPUClusters.contains( (CraftingCPUCluster) cpu );
 		}
@@ -710,7 +681,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 		private void findNext()
 		{
-			while( this.iterator.hasNext() && this.cpuCluster == null )
+			while ( this.iterator.hasNext() && this.cpuCluster == null )
 			{
 				this.cpuCluster = this.iterator.next();
 				if( !this.cpuCluster.isActive() || this.cpuCluster.isDestroyed() )

src/main/java/appeng/me/cache/GridStorageCache.java

@@ -66,8 +66,9 @@ public class GridStorageCache implements IStorageGrid
 	private final SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
 	private final GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<>( this.interests );
 	private final HashMap<IGridNode, IStackWatcher> watchers = new HashMap<>();
-	private Map<IStorageChannel<? extends IAEStack>, NetworkInventoryHandler<?>> storageNetworks;
+	private final Map<IStorageChannel<? extends IAEStack>, NetworkInventoryHandler<?>> storageNetworks;
-	private Map<IStorageChannel<? extends IAEStack>, NetworkMonitor<?>> storageMonitors;
+	private final Map<IStorageChannel<? extends IAEStack>, NetworkMonitor<?>> storageMonitors;
+	private int localDepth;
 
 	public GridStorageCache( final IGrid g )
 	{
@@ -170,15 +171,14 @@ public class GridStorageCache implements IStorageGrid
 
 	private CellChangeTracker addCellProvider( final ICellProvider cc, final CellChangeTracker tracker )
 	{
-		if( this.inactiveCellProviders.contains( cc ) && !this.activeCellProviders.contains( cc ))
+		if( this.inactiveCellProviders.contains( cc ) )
 		{
 			this.inactiveCellProviders.remove( cc );
 			this.activeCellProviders.add( cc );
 
 			final IActionSource actionSrc = cc instanceof IActionHost ? new MachineSource( (IActionHost) cc ) : new BaseActionSource();
 
-			this.storageMonitors.forEach( ( channel, monitor ) ->
+			this.storageMonitors.forEach( ( channel, monitor ) -> {
-			{
 				for( final IMEInventoryHandler<?> h : cc.getCellArray( channel ) )
 				{
 					tracker.postChanges( channel, 1, h, actionSrc );
@@ -213,6 +213,11 @@ public class GridStorageCache implements IStorageGrid
 	@MENetworkEventSubscribe
 	public void cellUpdate( final MENetworkCellArrayUpdate ev )
 	{
+		if( localDepth > 0 )
+		{
+			return;
+		}
+		localDepth++;
 		this.storageNetworks.clear();
 
 		final List<ICellProvider> ll = new ArrayList<ICellProvider>();
@@ -247,8 +252,9 @@ public class GridStorageCache implements IStorageGrid
 				this.removeCellProvider( cc, tracker );
 			}
 		}
-
 		tracker.applyChanges();
+		localDepth--;
+		this.storageMonitors.forEach( ( channel, monitor ) -> monitor.setForceUpdate( true ) );
 	}
 
 	private <T extends IAEStack<T>, C extends IStorageChannel<T>> void postChangesToNetwork( final C chan, final int upOrDown, final IItemList<T> availableItems, final IActionSource src )

src/main/java/appeng/me/cache/NetworkMonitor.java

@@ -19,7 +19,6 @@
 package appeng.me.cache;
 
 
-import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import appeng.api.AEApi;
@@ -36,7 +35,6 @@ import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.me.storage.ItemWatcher;
-import com.google.common.collect.Queues;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 
@@ -47,9 +45,10 @@ import java.util.Map.Entry;
 public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 {
 	@Nonnull
-	private static final Set<NetworkMonitor<?>> NESTED_MONITORS = new HashSet<>();
+	private static final HashMap<IActionSource, LinkedList<NetworkMonitor<?>>> src2MonitorsMap = new HashMap<>();
-	private static final HashMap<IActionSource, Set<NetworkMonitor<?>>> sourceSetHashMap = new HashMap<>();
+	private static final Set<IActionSource> nestingSources = new HashSet<>();
-	protected static boolean nested = false;
+
+	protected boolean wasNested = false;
 	protected boolean isNested = false;
 
 	@Nonnull
@@ -62,11 +61,9 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	private final Object2ObjectMap<IMEMonitorHandlerReceiver<T>, Object> listeners;
 
 	private boolean sendEvent = false;
-	private boolean forceUpdate = false;
-	@Nonnegative
-	private int localDepthSemaphore = 0;
 	private long gridItemCount;
 	private long gridFluidCount;
+	public boolean forceUpdate;
 
 	public NetworkMonitor( final GridStorageCache cache, final IStorageChannel<T> chan )
 	{
@@ -229,16 +226,13 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 	protected void postChange( final boolean add, final Iterable<T> changes, final IActionSource src )
 	{
-
+		src2MonitorsMap.putIfAbsent( src, new LinkedList<>() );
-		if( sourceSetHashMap.get( src ) != null && sourceSetHashMap.get( src ).contains( this ) )
+		if( src2MonitorsMap.get( src ).contains( this ) )
 		{
-			NESTED_MONITORS.add( this );
+			nestingSources.add( src );
-			nested = true;
 			return;
 		}
-
+		src2MonitorsMap.get( src ).add( this );
-		sourceSetHashMap.putIfAbsent( src, new HashSet<>() );
-		sourceSetHashMap.get( src ).add( this );
 
 		this.sendEvent = true;
 
@@ -282,30 +276,26 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 		this.notifyListenersOfChange( changes, src );
 
-		sourceSetHashMap.get( src ).remove( this );
+		if( src2MonitorsMap.get( src ).getFirst() == this )
-		if( sourceSetHashMap.get( src ).isEmpty() )
 		{
-			sourceSetHashMap.remove( src );
+			boolean nested = nestingSources.contains( src );
-		}
+			src2MonitorsMap.get( src ).forEach( networkMonitor -> networkMonitor.isNested = nested );
 
-		if( sourceSetHashMap.isEmpty() )
+			src2MonitorsMap.get( src ).forEach( networkMonitor -> {
-		{
+				if( networkMonitor.isNested != networkMonitor.wasNested )
-			for( NetworkMonitor<?> nm : NESTED_MONITORS )
+				{
-			{
+					networkMonitor.wasNested = networkMonitor.isNested;
-				nm.setupForceUpdate();
+					networkMonitor.setForceUpdate( true );
-			}
+				}
-			nested = false;
+			} );
-			NESTED_MONITORS.clear();
+			src2MonitorsMap.remove( src );
+			nestingSources.remove( src );
 		}
 	}
 
-	void setupForceUpdate()
+	public void setForceUpdate( boolean forceUpdate )
 	{
-		if( nested != isNested )
+		this.forceUpdate = forceUpdate;
-		{
-			isNested = nested;
-			forceUpdate();
-		}
 	}
 
 	void forceUpdate()
@@ -373,6 +363,10 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 	void onTick()
 	{
+		if( forceUpdate )
+		{
+			forceUpdate();
+		}
 		if( this.sendEvent )
 		{
 			this.sendEvent = false;

src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java

@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
 
 import appeng.api.config.Upgrades;
 import appeng.helpers.DualityInterface;
+import appeng.helpers.PatternHelper;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 
@@ -742,24 +743,35 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 							{
 								continue;
 							}
+							if( details.isCraftable() )
+							{
+								ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
+							}
+							else
+							{
+								ic = new InventoryCrafting( new ContainerNull(), PatternHelper.PROCESSING_INPUT_WIDTH, PatternHelper.PROCESSING_INPUT_HEIGHT );
+							}
 
-							ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
 							boolean found = false;
 
-							for (int x = 0; x < input.length; x++) {
+							for( int x = 0; x < input.length; x++ )
-								if (input[x] != null) {
+							{
+								if( input[x] != null )
+								{
 									found = false;
 
-									if (details.isCraftable()) {
+									if( details.isCraftable() )
+									{
 										final Collection<IAEItemStack> itemList;
 
-										if (details.canSubstitute()) {
+										if( details.canSubstitute() )
-											final List<IAEItemStack> substitutes = details.getSubstituteInputs(x);
+										{
-											itemList = new ArrayList<>(substitutes.size());
+											final List<IAEItemStack> substitutes = details.getSubstituteInputs( x );
+											itemList = new ArrayList<>( substitutes.size() );
 
-											for (IAEItemStack stack : substitutes) {
+											for( IAEItemStack stack : substitutes )
-												itemList.addAll(this.inventory.getItemList().findFuzzy(stack,
+											{
-														FuzzyMode.IGNORE_ALL));
+												itemList.addAll( this.inventory.getItemList().findFuzzy( stack, FuzzyMode.IGNORE_ALL ) );
 											}
 										} else {
 											itemList = new ArrayList<>(1);

src/main/java/appeng/parts/PartBasicState.java

@@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack;
 
 import appeng.api.implementations.IPowerChannelState;
 import appeng.api.networking.GridFlags;
+import appeng.api.networking.events.MENetworkBootingStatusChange;
 import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.events.MENetworkEventSubscribe;
 import appeng.api.networking.events.MENetworkPowerStatusChange;
@@ -59,6 +60,12 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
 		this.getHost().markForUpdate();
 	}
 
+	@MENetworkEventSubscribe
+	public void bootingRender( final MENetworkBootingStatusChange bs )
+	{
+		this.getHost().markForUpdate();
+	}
+
 	@Override
 	public void writeToStream( final ByteBuf data ) throws IOException
 	{

src/main/java/appeng/parts/automation/PartExportBus.java

@@ -22,6 +22,7 @@ package appeng.parts.automation;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
+import com.google.common.primitives.Ints;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -70,8 +71,6 @@ import appeng.util.item.AEItemStack;
 
 public class PartExportBus extends PartSharedItemBus implements ICraftingRequester
 {
-	private final int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};
-
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/export_bus_base" );
 
 	@PartModels
@@ -131,10 +130,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 		try
 		{
 			final InventoryAdaptor destination = this.getHandler();
-			final IMEMonitor<IAEItemStack> inv = this.getProxy()
+			final IMEMonitor<IAEItemStack> inv = this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
-					.getStorage()
-					.getInventory(
-							AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 			final IEnergyGrid energy = this.getProxy().getEnergy();
 			final ICraftingGrid cg = this.getProxy().getCrafting();
 			final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
@@ -150,21 +146,17 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 					final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport );
 
-					if( ais == null || this.itemToSend <= 0 ) continue;
+					if( ais == null || this.itemToSend <= 0 )
-
+					{
-					if ( this.craftOnly() ) {
-						if (this.failedCraftTriesSlot[x] <= 0) {
-
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
 						continue;
 					}
 
+					if( this.craftOnly() )
+					{
+						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
+
+					}
+
 					final long before = this.itemToSend;
 
 					if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
@@ -188,15 +180,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 					if( this.itemToSend == before && this.isCraftingEnabled() )
 					{
-						if (this.failedCraftTriesSlot[x] <= 0) {
+						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
-
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
 					}
 				}
 
@@ -278,11 +262,30 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 				if( energy.extractAEPower( power, mode, PowerMultiplier.CONFIG ) > power - 0.01 )
 				{
-					if( mode == Actionable.MODULATE )
+					ItemStack inputStack = items.getCachedItemStack( items.getStackSize() );
+
+					ItemStack remaining;
+
+					if( mode == Actionable.SIMULATE )
 					{
-						return AEItemStack.fromItemStack( d.addItems( items.createItemStack() ) );
+						remaining = d.simulateAdd( inputStack );
+						items.setCachedItemStack( inputStack );
 					}
-					return AEItemStack.fromItemStack( d.simulateAdd( items.createItemStack() ) );
+					else
+					{
+						remaining = d.addItems( inputStack );
+						if( !remaining.isEmpty() )
+						{
+							items.setCachedItemStack( remaining );
+						}
+					}
+
+					if( remaining == inputStack )
+					{
+						return items;
+					}
+
+					return AEItemStack.fromItemStack( remaining );
 				}
 			}
 		}
@@ -318,11 +321,21 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 	private void pushItemIntoTarget( final InventoryAdaptor d, final IEnergyGrid energy, final IMEInventory<IAEItemStack> inv, IAEItemStack ais )
 	{
-		final ItemStack is = ais.createItemStack();
+		ItemStack inputStack = ais.getCachedItemStack( ais.getStackSize() );
-		is.setCount( (int) this.itemToSend );
 
-		final ItemStack o = d.simulateAdd( is );
+		ItemStack remaining = d.simulateAdd( inputStack );
-		final long canFit = o.isEmpty() ? this.itemToSend : this.itemToSend - o.getCount();
+
+		// Store the stack in the cache for next time.
+		if( !remaining.isEmpty() )
+		{
+			ais.setCachedItemStack( remaining );
+			if( remaining == inputStack )
+			{
+				return;
+			}
+		}
+
+		final long canFit = remaining.isEmpty() ? this.itemToSend : this.itemToSend - remaining.getCount();
 
 		if( canFit > 0 )
 		{
@@ -334,7 +347,9 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 			{
 				this.itemToSend -= itemsToAdd.getStackSize();
 
-				final ItemStack failed = d.addItems( itemsToAdd.createItemStack() );
+				inputStack.setCount( Ints.saturatedCast( itemsToAdd.getStackSize() ) );
+
+				final ItemStack failed = d.addItems( inputStack );
 				if( !failed.isEmpty() )
 				{
 					ais.setStackSize( failed.getCount() );

src/main/java/appeng/parts/automation/PartLevelEmitter.java

@@ -352,23 +352,11 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	}
 
 	@Override
-	public void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan )
+	public void onStackChange( final IItemList o, final IAEStack fullStack, final IAEStack diffStack, final IActionSource src, final IStorageChannel chan )
 	{
-		if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
+		if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) && fullStack.equals( this.config.getAEStackInSlot( 0 ) ) && this.getInstalledUpgrades( Upgrades.FUZZY ) == 0 )
 		{
-			IAEItemStack myStack = this.config.getAEStackInSlot( 0 );
+			this.lastReportedValue = fullStack.getStackSize();
-			if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-			{
-				final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
-				if( Platform.itemComparisons().isFuzzyEqualItem( myStack.getDefinition(), ( (IAEItemStack) diffStack ).getDefinition(), fzMode ) )
-				{
-					this.lastReportedValue += diffStack.getStackSize();
-				}
-			}
-			else if( diffStack.equals( myStack ) )
-			{
-				this.lastReportedValue += diffStack.getStackSize();
-			}
 			this.updateState();
 		}
 	}

src/main/java/appeng/parts/misc/ItemHandlerAdapter.java

@@ -62,8 +62,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	private StorageFilter mode;
 	private AccessRestriction access;
 
-	private ItemStack stackCache = null;
-
 	ItemHandlerAdapter( IItemHandler itemHandler, IGridProxyable proxy )
 	{
 		this.itemHandler = itemHandler;
@@ -82,39 +80,31 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
 	{
 		// Try to reuse the cached stack
-		@Nullable ItemStack currentCached = stackCache;
+		ItemStack inputStack = iox.getCachedItemStack( iox.getStackSize() );
-		stackCache = null;
+
+		ItemStack remaining = inputStack;
 
-		ItemStack orgInput;
 		int slotCount = this.itemHandler.getSlots();
-
-		if( currentCached != null && iox.isSameType( currentCached ) )
-		{
-			// Cache is suitable, just update the count
-			orgInput = currentCached;
-			currentCached.setCount( Ints.saturatedCast( iox.getStackSize() ) );
-		}
-		else
-		{
-			// We need a new stack :-(
-			orgInput = iox.createItemStack();
-		}
-
-		ItemStack remaining = orgInput;
-
 		for( int i = 0; i < slotCount && !remaining.isEmpty(); i++ )
 		{
 			remaining = this.itemHandler.insertItem( i, remaining, type == Actionable.SIMULATE );
 		}
 
 		// Store the stack in the cache for next time.
-		if( !remaining.isEmpty() && remaining != orgInput )
+		if( type == Actionable.SIMULATE )
 		{
-			stackCache = remaining;
+			iox.setCachedItemStack( inputStack );
+		}
+		else
+		{
+			if( !remaining.isEmpty() )
+			{
+				iox.setCachedItemStack( remaining );
+			}
 		}
 
 		// At this point, we still have some items left...
-		if( remaining == orgInput )
+		if( remaining == inputStack )
 		{
 			// The stack remained unmodified, target inventory is full
 			return iox;
@@ -147,7 +137,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		ItemStack gathered = ItemStack.EMPTY;
 
 		final boolean simulate = ( mode == Actionable.SIMULATE );
-		for ( int i = 0; i < this.itemHandler.getSlots(); i++ )
+		for( int i = 0; i < this.itemHandler.getSlots(); i++ )
 		{
 			ItemStack stackInInventorySlot = this.itemHandler.getStackInSlot( i );
 
@@ -172,8 +162,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 					{
 						// Something broke. It should never return more than we requested...
 						// We're going to silently eat the remainder
-						AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.",
+						AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.", this.itemHandler.getClass().getName(), extracted.toString(), remainingCurrentSlot );
-								this.itemHandler.getClass().getName(), extracted.toString(), remainingCurrentSlot );
 						extracted.setCount( remainingCurrentSlot );
 					}
 
@@ -329,17 +318,17 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				currentlyOnStorage.add( is.getAEItemStack() );
 			}
 
-			for ( final IAEItemStack is : currentlyCached )
+			for( final IAEItemStack is : currentlyCached )
 			{
 				is.setStackSize( -is.getStackSize() );
 			}
 
-			for ( final IAEItemStack is : currentlyOnStorage )
+			for( final IAEItemStack is : currentlyOnStorage )
 			{
 				currentlyCached.add( is );
 			}
 
-			for ( final IAEItemStack is : currentlyCached )
+			for( final IAEItemStack is : currentlyCached )
 			{
 				if( is.getStackSize() != 0 )
 				{

src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java

@@ -35,232 +35,225 @@ import java.util.*;
 
 class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
 {
-    private final Object2ObjectMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new Object2ObjectOpenHashMap<>();
+	private final Object2ObjectMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new Object2ObjectOpenHashMap<>();
-    private IActionSource mySource;
+	private IActionSource mySource;
-    private final IItemRepository itemRepository;
+	private final IItemRepository itemRepository;
-    private final IGridProxyable proxyable;
+	private final IGridProxyable proxyable;
-    private final InventoryCache cache;
+	private final InventoryCache cache;
-    private AccessRestriction access;
+	private AccessRestriction access;
 
-    private ItemStack stackCache;
+	ItemRepositoryAdapter( IItemRepository itemRepository, IGridProxyable proxy )
+	{
+		this.itemRepository = itemRepository;
+		this.proxyable = proxy;
+		this.cache = new InventoryCache( this.itemRepository );
+		if( this.proxyable instanceof PartStorageBus )
+		{
+			PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
+			this.access = ( (AccessRestriction) partStorageBus.getConfigManager().getSetting( Settings.ACCESS ) );
+		}
+		this.cache.update();
+	}
 
-    ItemRepositoryAdapter( IItemRepository itemRepository, IGridProxyable proxy )
+	@Override
-    {
+	public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
-        this.itemRepository = itemRepository;
+	{
-        this.proxyable = proxy;
+		// Try to reuse the cached stack
-        this.cache = new InventoryCache( this.itemRepository );
+		ItemStack inputStack = iox.getCachedItemStack( iox.getStackSize() );
-        if( this.proxyable instanceof PartStorageBus )
-        {
-            PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
-            this.access = ( (AccessRestriction) partStorageBus.getConfigManager().getSetting( Settings.ACCESS ) );
-        }
-        this.cache.update();
-    }
 
-    @Override
+		ItemStack remaining;
-    public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
-    {
-        // Try to reuse the cached stack
-        @Nullable ItemStack currentCached = stackCache;
-        stackCache = null;
 
-        ItemStack orgInput;
+		remaining = this.itemRepository.insertItem( inputStack, type == Actionable.SIMULATE );
-        if( currentCached != null && iox.isSameType( currentCached ) )
-        {
-            // Cache is suitable, just update the count
-            orgInput = currentCached;
-            currentCached.setCount( Ints.saturatedCast( iox.getStackSize() ) );
-        }
-        else
-        {
-            // We need a new stack :-(
-            orgInput = iox.createItemStack();
-        }
-        ItemStack remaining = this.itemRepository.insertItem( orgInput, type == Actionable.SIMULATE );
 
-        // Store the stack in the cache for next time.
+		// Store the stack in the cache for next time.
-        if( !remaining.isEmpty() && remaining != orgInput )
+		if( type == Actionable.SIMULATE )
-        {
+		{
-            stackCache = remaining;
+			iox.setCachedItemStack( inputStack );
-        }
+		}
+		else
+		{
+			if( !remaining.isEmpty() )
+			{
+				iox.setCachedItemStack( remaining );
+			}
+		}
 
-        // At this point, we still have some items left...
+		// At this point, we still have some items left...
-        if( remaining == orgInput )
+		if( remaining == inputStack )
-        {
+		{
-            // The stack remained unmodified, target inventory is full
+			// The stack remained unmodified, target inventory is full
-            return iox;
+			return iox;
-        }
+		}
 
-        if( type == Actionable.MODULATE )
+		if( type == Actionable.MODULATE )
-        {
+		{
-            IAEItemStack added = iox.copy().setStackSize( iox.getStackSize() - remaining.getCount() );
+			IAEItemStack added = iox.copy().setStackSize( iox.getStackSize() - remaining.getCount() );
-            this.cache.currentlyCached.add( added );
+			this.cache.currentlyCached.add( added );
-            this.postDifference( Collections.singletonList( added ) );
+			this.postDifference( Collections.singletonList( added ) );
-            try
+			try
-            {
+			{
-                this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-            }
+			}
-            catch( GridAccessException ex )
+			catch( GridAccessException ex )
-            {
+			{
-                // meh
+				// meh
-            }
+			}
-        }
+		}
 
-        return AEItemStack.fromItemStack( remaining );
+		return AEItemStack.fromItemStack( remaining );
 
-    }
+	}
 
-    @Override
+	@Override
-    public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
+	public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
-    {
+	{
-        int remainingSize = Ints.saturatedCast( request.getStackSize() );
+		int remainingSize = Ints.saturatedCast( request.getStackSize() );
 
-        final boolean simulate = ( mode == Actionable.SIMULATE );
+		final boolean simulate = ( mode == Actionable.SIMULATE );
 
-        ItemStack extracted = this.itemRepository.extractItem( request.getDefinition(), remainingSize, simulate );
+		ItemStack extracted = this.itemRepository.extractItem( request.getDefinition(), remainingSize, simulate );
 
-        if( extracted.getCount() > remainingSize )
+		if( extracted.getCount() > remainingSize )
-        {
+		{
-            // Something broke. It should never return more than we requested...
+			// Something broke. It should never return more than we requested...
-            // We're going to silently eat the remainder
+			// We're going to silently eat the remainder
-            AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.",
+			AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.", this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
-                    this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
+			extracted.setCount( remainingSize );
-            extracted.setCount( remainingSize );
+		}
-        }
 
-        if( !extracted.isEmpty() )
+		if( !extracted.isEmpty() )
-        {
+		{
-            IAEItemStack extractedAEItemStack = AEItemStack.fromItemStack( extracted );
+			IAEItemStack extractedAEItemStack = AEItemStack.fromItemStack( extracted );
-            if( mode == Actionable.MODULATE )
+			if( mode == Actionable.MODULATE )
-            {
+			{
-                IAEItemStack cachedStack = this.cache.currentlyCached.findPrecise( request );
+				IAEItemStack cachedStack = this.cache.currentlyCached.findPrecise( request );
-                if (cachedStack != null)
+				if( cachedStack != null )
-                {
+				{
-                    cachedStack.decStackSize( extractedAEItemStack.getStackSize() );
+					cachedStack.decStackSize( extractedAEItemStack.getStackSize() );
-                    this.postDifference( Collections.singletonList( extractedAEItemStack.copy().setStackSize( -extractedAEItemStack.getStackSize() ) ) );
+					this.postDifference( Collections.singletonList( extractedAEItemStack.copy().setStackSize( -extractedAEItemStack.getStackSize() ) ) );
-                }
+				}
-                try
+				try
-                {
+				{
-                    this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+					this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-                }
+				}
-                catch( GridAccessException ex )
+				catch( GridAccessException ex )
-                {
+				{
-                    // meh
+					// meh
-                }
+				}
-            }
+			}
-            return extractedAEItemStack;
+			return extractedAEItemStack;
-        }
+		}
-        return null;
+		return null;
-    }
+	}
 
-    @Override
+	@Override
-    public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
+	public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
-    {
+	{
-        return this.cache.getAvailableItems( out );
+		return this.cache.getAvailableItems( out );
-    }
+	}
 
-    @Override
+	@Override
-    public IStorageChannel<IAEItemStack> getChannel()
+	public IStorageChannel<IAEItemStack> getChannel()
-    {
+	{
-        return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
+		return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
-    }
+	}
 
-    @Override
+	@Override
-    public void addListener( IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken )
+	public void addListener( IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken )
-    {
+	{
-        this.listeners.put( l, verificationToken );
+		this.listeners.put( l, verificationToken );
-    }
+	}
 
-    @Override
+	@Override
-    public void removeListener( IMEMonitorHandlerReceiver<IAEItemStack> l )
+	public void removeListener( IMEMonitorHandlerReceiver<IAEItemStack> l )
-    {
+	{
-        this.listeners.remove( l );
+		this.listeners.remove( l );
-    }
+	}
 
-    private void postDifference( Iterable<IAEItemStack> a )
+	private void postDifference( Iterable<IAEItemStack> a )
-    {
+	{
-        final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
+		final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
-        while ( i.hasNext() )
+		while ( i.hasNext() )
-        {
+		{
-            final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
+			final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
-            final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
+			final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
-            if( key.isValid( l.getValue() ) )
+			if( key.isValid( l.getValue() ) )
-            {
+			{
-                key.postChange( this, a, this.mySource );
+				key.postChange( this, a, this.mySource );
-            }
+			}
-            else
+			else
-            {
+			{
-                i.remove();
+				i.remove();
-            }
+			}
-        }
+		}
-    }
+	}
 
-    @Override
+	@Override
-    public TickRateModulation onTick()
+	public TickRateModulation onTick()
-    {
+	{
-        List<IAEItemStack> changes = this.cache.update();
+		List<IAEItemStack> changes = this.cache.update();
-        if( !changes.isEmpty() && access.hasPermission( AccessRestriction.READ ) )
+		if( !changes.isEmpty() && access.hasPermission( AccessRestriction.READ ) )
-        {
+		{
-            this.postDifference( changes );
+			this.postDifference( changes );
-            return TickRateModulation.URGENT;
+			return TickRateModulation.URGENT;
-        }
+		}
-        else
+		else
-        {
+		{
-            return TickRateModulation.SLOWER;
+			return TickRateModulation.SLOWER;
-        }
+		}
-    }
+	}
 
-    @Override
+	@Override
-    public void setActionSource( final IActionSource mySource )
+	public void setActionSource( final IActionSource mySource )
-    {
+	{
-        this.mySource = mySource;
+		this.mySource = mySource;
-    }
+	}
 
-    private static class InventoryCache
+	private static class InventoryCache
-    {
+	{
-        private IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+		private IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-        private final IItemRepository iItemRepository;
+		private final IItemRepository iItemRepository;
 
-        public InventoryCache( IItemRepository iItemRepository )
+		public InventoryCache( IItemRepository iItemRepository )
-        {
+		{
-            this.iItemRepository = iItemRepository;
+			this.iItemRepository = iItemRepository;
-        }
+		}
 
-        public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
+		public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
-        {
+		{
-            currentlyCached.iterator().forEachRemaining( out::add );
+			currentlyCached.iterator().forEachRemaining( out::add );
-            return out;
+			return out;
-        }
+		}
 
-        public List<IAEItemStack> update()
+		public List<IAEItemStack> update()
-        {
+		{
-            final List<IAEItemStack> changes = new ArrayList<>();
+			final List<IAEItemStack> changes = new ArrayList<>();
 
-            IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+			IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-            this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).forEach( currentlyOnStorage::add );
+			this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).forEach( currentlyOnStorage::add );
 
-            for ( final IAEItemStack is : currentlyCached )
+			for( final IAEItemStack is : currentlyCached )
-            {
+			{
-                is.setStackSize( -is.getStackSize() );
+				is.setStackSize( -is.getStackSize() );
-            }
+			}
 
-            for ( final IAEItemStack is : currentlyOnStorage )
+			for( final IAEItemStack is : currentlyOnStorage )
-            {
+			{
-                currentlyCached.add( is );
+				currentlyCached.add( is );
-            }
+			}
 
-            for ( final IAEItemStack is : currentlyCached )
+			for( final IAEItemStack is : currentlyCached )
-            {
+			{
-                if( is.getStackSize() != 0 )
+				if( is.getStackSize() != 0 )
-                {
+				{
-                    changes.add( is );
+					changes.add( is );
-                }
+				}
-            }
+			}
 
-            currentlyCached = currentlyOnStorage;
+			currentlyCached = currentlyOnStorage;
 
-            return changes;
+			return changes;
-        }
+		}
 
-    }
+	}
 }

src/main/java/appeng/parts/misc/PartOreDicStorageBus.java

@@ -0,0 +1,225 @@
+package appeng.parts.misc;
+
+import appeng.api.AEApi;
+import appeng.api.config.*;
+import appeng.api.networking.storage.IBaseMonitor;
+import appeng.api.networking.storage.IStorageGrid;
+import appeng.api.networking.ticking.ITickManager;
+import appeng.api.parts.IPartModel;
+import appeng.api.storage.IMEInventory;
+import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.core.AppEng;
+import appeng.core.sync.GuiBridge;
+import appeng.items.parts.PartModels;
+import appeng.me.GridAccessException;
+import appeng.me.cache.GridStorageCache;
+import appeng.me.storage.ITickingMonitor;
+import appeng.me.storage.MEInventoryHandler;
+import appeng.parts.PartModel;
+import appeng.util.ConfigManager;
+import appeng.util.Platform;
+import appeng.util.item.OreHelper;
+import appeng.util.prioritylist.IPartitionList;
+import appeng.util.prioritylist.OreDictPriorityList;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.Vec3d;
+
+
+public class PartOreDicStorageBus extends PartStorageBus
+{
+    public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/oredict_storage_bus_base" );
+    @PartModels
+    public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_off" ) );
+    @PartModels
+    public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_on" ) );
+    @PartModels
+    public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_has_channel" ) );
+
+    public String oreExp = "";
+    OreDictPriorityList<IAEItemStack> priorityList;
+
+    public PartOreDicStorageBus( ItemStack is )
+    {
+        super( is );
+    }
+
+    @Override
+    public void readFromNBT( NBTTagCompound data )
+    {
+        super.readFromNBT( data );
+        this.oreExp = data.getString( "oreMatch" );
+        this.priorityList = new OreDictPriorityList<>( OreHelper.INSTANCE.getMatchingOre( oreExp ), oreExp );
+    }
+
+    @Override
+    public void writeToNBT( NBTTagCompound data )
+    {
+        super.writeToNBT( data );
+        data.setString( "oreMatch", getOreExp() );
+    }
+
+    @Override
+    public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
+    {
+        if( Platform.isServer() )
+        {
+            Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_OREDICTSTORAGEBUS );
+        }
+        return true;
+    }
+
+    @Override
+    public GuiBridge getGuiBridge()
+    {
+        return GuiBridge.GUI_OREDICTSTORAGEBUS;
+    }
+
+    @Override
+    public MEInventoryHandler<IAEItemStack> getInternalHandler()
+    {
+        if( this.cached )
+        {
+            return this.handler;
+        }
+
+        final boolean wasSleeping = this.monitor == null;
+
+        this.cached = true;
+        final TileEntity self = this.getHost().getTile();
+        final TileEntity target = self.getWorld().getTileEntity( self.getPos().offset( this.getSide().getFacing() ) );
+        final int newHandlerHash = this.createHandlerHash( target );
+
+        if( newHandlerHash != 0 && newHandlerHash == this.handlerHash )
+        {
+            return this.handler;
+        }
+
+        this.handlerHash = newHandlerHash;
+        this.handler = null;
+        if( this.monitor != null )
+        {
+            ( (IBaseMonitor<IAEItemStack>) monitor ).removeListener( this );
+        }
+        this.monitor = null;
+        if( target != null )
+        {
+            IMEInventory<IAEItemStack> inv = this.getInventoryWrapper( target );
+
+            if( inv instanceof ITickingMonitor )
+            {
+                this.monitor = (ITickingMonitor) inv;
+                this.monitor.setActionSource( mySrc );
+                this.monitor.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
+            }
+
+            if( inv != null )
+            {
+                this.handler = new MEInventoryHandler<>( inv, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+
+                this.handler.setBaseAccess( (AccessRestriction) this.getConfigManager().getSetting( Settings.ACCESS ) );
+                this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
+                this.handler.setPriority( this.priority );
+
+                this.handler.setPartitionList( this.getPriorityList() );
+
+                if( inv instanceof IBaseMonitor )
+                {
+                    if( ( (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS ) ).hasPermission( AccessRestriction.READ ) )
+                    {
+                        ( (IBaseMonitor<IAEItemStack>) inv ).addListener( this, this.handler );
+                    }
+                }
+            }
+        }
+
+        // update sleep state...
+        if( wasSleeping != ( this.monitor == null ) )
+        {
+            try
+            {
+                final ITickManager tm = this.getProxy().getTick();
+                if( this.monitor == null )
+                {
+                    tm.sleepDevice( this.getProxy().getNode() );
+                }
+                else
+                {
+                    tm.wakeDevice( this.getProxy().getNode() );
+                }
+            }
+            catch( final GridAccessException e )
+            {
+                // :(
+            }
+        }
+
+        try
+        {
+            // force grid to update handlers...
+            ( (GridStorageCache) this.getProxy().getGrid().getCache( IStorageGrid.class ) ).cellUpdate( null );
+        }
+        catch( final GridAccessException e )
+        {
+            // :3
+        }
+
+        return this.handler;
+    }
+
+    private IPartitionList<IAEItemStack> getPriorityList()
+    {
+        if( priorityList == null )
+        {
+            this.priorityList = new OreDictPriorityList<>( OreHelper.INSTANCE.getMatchingOre( oreExp ), oreExp );
+        }
+        return priorityList;
+    }
+
+    public String getOreExp()
+    {
+        if( this.oreExp == null )
+        {
+            return "";
+        }
+        return oreExp;
+    }
+
+    public void saveOreMatch( String oreMatch )
+    {
+        if( !this.oreExp.equals( oreMatch ) )
+        {
+            this.oreExp = oreMatch;
+
+            this.priorityList = new OreDictPriorityList<>( OreHelper.INSTANCE.getMatchingOre( oreExp ), oreExp );
+            if( this.handler != null )
+            {
+                handler.setPartitionList( this.priorityList );
+            }
+            this.getHost().markForSave();
+        }
+    }
+
+    @Override
+    public IPartModel getStaticModels()
+    {
+        if( this.isActive() && this.isPowered() )
+        {
+            return MODELS_HAS_CHANNEL;
+        }
+        else if( this.isPowered() )
+        {
+            return MODELS_ON;
+        }
+        else
+        {
+            return MODELS_OFF;
+        }
+    }
+
+}

src/main/java/appeng/parts/misc/PartSharedStorageBus.java

@@ -1,229 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2018, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.parts.misc;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import appeng.api.config.AccessRestriction;
-import appeng.fluids.parts.PartFluidInterface;
-import appeng.fluids.tile.TileFluidInterface;
-import appeng.tile.misc.TileInterface;
-import appeng.tile.networking.TileCableBus;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-
-import appeng.api.AEApi;
-import appeng.api.networking.events.MENetworkCellArrayUpdate;
-import appeng.api.networking.events.MENetworkChannelsChanged;
-import appeng.api.networking.events.MENetworkEventSubscribe;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
-import appeng.api.networking.ticking.IGridTickable;
-import appeng.api.parts.IPartCollisionHelper;
-import appeng.api.storage.ICellContainer;
-import appeng.api.storage.ICellInventory;
-import appeng.api.storage.IMEInventoryHandler;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.util.AECableType;
-import appeng.api.util.IConfigManager;
-import appeng.helpers.IPriorityHost;
-import appeng.me.GridAccessException;
-import appeng.parts.automation.PartUpgradeable;
-
-
-/**
- * @author BrockWS
- * @version rv6 - 22/05/2018
- * @since rv6 22/05/2018
- */
-public abstract class PartSharedStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IPriorityHost
-{
-	private boolean wasActive = false;
-	private int priority = 0;
-	protected boolean accessChanged;
-	protected boolean readOncePass;
-
-	public PartSharedStorageBus( ItemStack is )
-	{
-		super( is );
-	}
-
-	protected void updateStatus()
-	{
-		final boolean currentActive = this.getProxy().isActive();
-		if( this.wasActive != currentActive )
-		{
-			this.wasActive = currentActive;
-			try
-			{
-				this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
-				this.getHost().markForUpdate();
-			}
-			catch( final GridAccessException ignore )
-			{
-				// :P
-			}
-		}
-	}
-
-	@Override
-	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged changedChannels )
-	{
-		this.updateStatus();
-	}
-
-	/**
-	 * Helper method to get this parts storage channel
-	 *
-	 * @return Storage channel
-	 */
-	public IStorageChannel getStorageChannel()
-	{
-		return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
-	}
-
-	protected abstract void resetCache();
-
-	protected abstract void resetCache( boolean fullReset );
-
-	@Override
-	public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
-	{
-		return Collections.emptyList();
-	}
-
-	@Override
-	public void blinkCell( int slot )
-	{
-	}
-
-	@Override
-	public void saveChanges( ICellInventory<?> cellInventory )
-	{
-	}
-
-	@Override
-	public int getPriority()
-	{
-		return this.priority;
-	}
-
-	@Override
-	public void setPriority( final int newValue )
-	{
-		this.priority = newValue;
-		this.getHost().markForSave();
-		this.resetCache( true );
-	}
-
-	@Override
-	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange c )
-	{
-		this.updateStatus();
-	}
-
-	@Override
-	public void upgradesChanged()
-	{
-		super.upgradesChanged();
-		this.resetCache( true );
-	}
-
-	@Override
-	public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
-	{
-		if( settingName.name().equals( "ACCESS" ) )
-		{
-			this.accessChanged = true;
-		}
-		this.resetCache( true );
-		this.getHost().markForSave();
-	}
-
-	@Override
-	public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
-	{
-		if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
-		{
-
-			final TileEntity te = w.getTileEntity( neighbor );
-
-			// In case the TE was destroyed, we have to do a full reset immediately.
-			if( te instanceof TileCableBus )
-			{
-				if( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartFluidInterface )
-				{
-					this.resetCache( true );
-					this.resetCache();
-				}
-			}
-			else if( te == null || te instanceof TileFluidInterface )
-			{
-				this.resetCache( true );
-				this.resetCache();
-			}
-			else
-			{
-				this.resetCache( false );
-			}
-		}
-	}
-
-	@Override
-	public void readFromNBT( final NBTTagCompound data )
-	{
-		super.readFromNBT( data );
-		this.priority = data.getInteger( "priority" );
-		this.accessChanged = false;
-	}
-
-	@Override
-	public void writeToNBT( final NBTTagCompound data )
-	{
-		super.writeToNBT( data );
-		data.setInteger( "priority", this.priority );
-	}
-
-	@Override
-	public void getBoxes( final IPartCollisionHelper bch )
-	{
-		bch.addBox( 3, 3, 15, 13, 13, 16 );
-		bch.addBox( 2, 2, 14, 14, 14, 15 );
-		bch.addBox( 5, 5, 12, 11, 11, 14 );
-	}
-
-	@Override
-	protected int getUpgradeSlots()
-	{
-		return 5;
-	}
-
-	@Override
-	public float getCableConnectionLength( AECableType cable )
-	{
-		return 4;
-	}
-}

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -19,15 +19,51 @@
 package appeng.parts.misc;
 
 
-import java.util.Collections;
+import appeng.api.AEApi;
-import java.util.List;
+import appeng.api.config.*;
-import java.util.Objects;
+import appeng.api.networking.IGridNode;
-
+import appeng.api.networking.events.MENetworkCellArrayUpdate;
+import appeng.api.networking.events.MENetworkChannelsChanged;
+import appeng.api.networking.events.MENetworkEventSubscribe;
+import appeng.api.networking.events.MENetworkPowerStatusChange;
+import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.storage.IStorageGrid;
+import appeng.api.networking.ticking.IGridTickable;
+import appeng.api.networking.ticking.ITickManager;
+import appeng.api.networking.ticking.TickRateModulation;
+import appeng.api.networking.ticking.TickingRequest;
+import appeng.api.parts.IPart;
+import appeng.api.parts.IPartCollisionHelper;
+import appeng.api.parts.IPartModel;
+import appeng.api.storage.*;
+import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IItemList;
+import appeng.api.util.AECableType;
+import appeng.api.util.IConfigManager;
+import appeng.capabilities.Capabilities;
+import appeng.core.AppEng;
+import appeng.core.settings.TickRates;
+import appeng.core.sync.GuiBridge;
+import appeng.helpers.IPriorityHost;
+import appeng.helpers.Reflected;
+import appeng.items.parts.PartModels;
+import appeng.me.GridAccessException;
 import appeng.me.cache.GridStorageCache;
+import appeng.me.helpers.MachineSource;
+import appeng.me.storage.ITickingMonitor;
+import appeng.me.storage.MEInventoryHandler;
+import appeng.parts.PartModel;
+import appeng.parts.automation.PartUpgradeable;
+import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.misc.TileInterface;
 import appeng.tile.networking.TileCableBus;
 import appeng.util.ConfigManager;
+import appeng.util.Platform;
+import appeng.util.inv.InvOperation;
+import appeng.util.prioritylist.FuzzyPriorityList;
+import appeng.util.prioritylist.PrecisePriorityList;
 import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -44,85 +80,29 @@ import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 
-import appeng.api.AEApi;
+import java.util.Collections;
-import appeng.api.config.AccessRestriction;
+import java.util.List;
-import appeng.api.config.FuzzyMode;
+import java.util.Objects;
-import appeng.api.config.IncludeExclude;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.config.Upgrades;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.events.MENetworkCellArrayUpdate;
-import appeng.api.networking.events.MENetworkChannelsChanged;
-import appeng.api.networking.events.MENetworkEventSubscribe;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
-import appeng.api.networking.security.IActionSource;
-import appeng.api.networking.storage.IBaseMonitor;
-import appeng.api.networking.ticking.IGridTickable;
-import appeng.api.networking.ticking.ITickManager;
-import appeng.api.networking.ticking.TickRateModulation;
-import appeng.api.networking.ticking.TickingRequest;
-import appeng.api.parts.IPartCollisionHelper;
-import appeng.api.parts.IPartHost;
-import appeng.api.parts.IPartModel;
-import appeng.api.storage.ICellContainer;
-import appeng.api.storage.ICellInventory;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.IMEInventoryHandler;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.IStorageMonitorable;
-import appeng.api.storage.IStorageMonitorableAccessor;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.api.util.AECableType;
-import appeng.api.util.AEPartLocation;
-import appeng.api.util.IConfigManager;
-import appeng.capabilities.Capabilities;
-import appeng.core.AppEng;
-import appeng.core.settings.TickRates;
-import appeng.core.sync.GuiBridge;
-import appeng.helpers.IInterfaceHost;
-import appeng.helpers.IPriorityHost;
-import appeng.helpers.Reflected;
-import appeng.items.parts.PartModels;
-import appeng.me.GridAccessException;
-import appeng.me.helpers.MachineSource;
-import appeng.me.storage.ITickingMonitor;
-import appeng.me.storage.MEInventoryHandler;
-import appeng.parts.PartModel;
-import appeng.parts.automation.PartUpgradeable;
-import appeng.tile.inventory.AppEngInternalAEInventory;
-import appeng.util.Platform;
-import appeng.util.inv.InvOperation;
-import appeng.util.prioritylist.FuzzyPriorityList;
-import appeng.util.prioritylist.PrecisePriorityList;
 
 
 public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPriorityHost
 {
-	@CapabilityInject(IItemRepository.class)
-	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY = null;
-
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_base" );
-
 	@PartModels
 	public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_off" ) );
-
 	@PartModels
 	public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_on" ) );
-
 	@PartModels
 	public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_has_channel" ) );
-
+	@CapabilityInject( IItemRepository.class )
-	private final IActionSource mySrc;
+	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY = null;
-	private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 );
+	protected final IActionSource mySrc;
-	private int priority = 0;
+	protected final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 );
-	private boolean cached = false;
+	protected int priority = 0;
-	private ITickingMonitor monitor = null;
+	protected boolean cached = false;
-	private MEInventoryHandler<IAEItemStack> handler = null;
+	protected ITickingMonitor monitor = null;
-	private int handlerHash = 0;
+	protected MEInventoryHandler<IAEItemStack> handler = null;
+	protected int handlerHash = 0;
 	private boolean wasActive = false;
 	private byte resetCacheLogic = 0;
 	private boolean accessChanged;
@@ -235,9 +215,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 
 	private void resetCache( final boolean fullReset )
 	{
-		if( this.getHost() == null || this.getHost().getTile() == null || this.getHost().getTile().getWorld() == null || this.getHost()
+		if( this.getHost() == null || this.getHost().getTile() == null || this.getHost().getTile().getWorld() == null || this.getHost().getTile().getWorld().isRemote )
-				.getTile()
-				.getWorld().isRemote )
 		{
 			return;
 		}
@@ -278,7 +256,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 				readOncePass = false;
 				try
 				{
-					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, source );
+					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, mySrc );
 				}
 				catch( final GridAccessException e )
 				{
@@ -320,23 +298,39 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
 		{
-
 			final TileEntity te = w.getTileEntity( neighbor );
 
 			// In case the TE was destroyed, we have to do a full reset immediately.
 			if( te instanceof TileCableBus )
 			{
-				if( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartInterface )
+				IPart iPart = ( (TileCableBus) te ).getPart( this.getSide().getOpposite() );
+				if( iPart == null )
 				{
 					this.resetCache( true );
 					this.resetCache();
 				}
+				else if( iPart instanceof PartInterface )
+				{
+					if( createHandlerHash( te ) != handlerHash )
+					{
+						this.resetCache( true );
+						this.resetCache();
+					}
+				}
 			}
-			else if( te == null || te instanceof TileInterface )
+			else if( te == null )
 			{
 				this.resetCache( true );
 				this.resetCache();
 			}
+			else if( te instanceof TileInterface )
+			{
+				if( createHandlerHash( te ) != handlerHash )
+				{
+					this.resetCache( true );
+					this.resetCache();
+				}
+			}
 			else
 			{
 				this.resetCache( false );
@@ -431,7 +425,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		}
 	}
 
-	private IMEInventory<IAEItemStack> getInventoryWrapper( TileEntity target )
+	IMEInventory<IAEItemStack> getInventoryWrapper( TileEntity target )
 	{
 
 		EnumFacing targetSide = this.getSide().getFacing().getOpposite();
@@ -455,7 +449,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		}
 
 		// Check via cap for IItemRepository
-		if (ITEM_REPOSITORY_CAPABILITY != null && target.hasCapability( ITEM_REPOSITORY_CAPABILITY, targetSide ))
+		if( ITEM_REPOSITORY_CAPABILITY != null && target.hasCapability( ITEM_REPOSITORY_CAPABILITY, targetSide ) )
 		{
 			IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
 			if( handlerRepo != null )
@@ -474,7 +468,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 
 	}
 
-	private int createHandlerHash( TileEntity target )
+	int createHandlerHash( TileEntity target )
 	{
 		if( target == null )
 		{
@@ -485,6 +479,15 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 
 		if( target.hasCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, targetSide ) )
 		{
+			IStorageMonitorableAccessor accessor = target.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, targetSide );
+			if( accessor != null )
+			{
+				IStorageMonitorable inventory = accessor.getInventory( this.mySrc );
+				if( inventory != null )
+				{
+					return Objects.hash( target, inventory.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
+				}
+			}
 			return Objects.hash( target, target.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, targetSide ) );
 		}
 
@@ -537,9 +540,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 
 			if( inv != null )
 			{
-				this.checkInterfaceVsStorageBus( target, this.getSide().getOpposite() );
+				this.handler = new MEInventoryHandler<>( inv, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
-
-				this.handler = new MEInventoryHandler<IAEItemStack>( inv, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 
 				this.handler.setBaseAccess( (AccessRestriction) this.getConfigManager().getSetting( Settings.ACCESS ) );
 				this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
@@ -559,13 +560,11 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 
 				if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
 				{
-					this.handler
+					this.handler.setPartitionList( new FuzzyPriorityList<>( priorityList, (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE ) ) );
-							.setPartitionList( new FuzzyPriorityList<IAEItemStack>( priorityList, (FuzzyMode) this.getConfigManager()
-									.getSetting( Settings.FUZZY_MODE ) ) );
 				}
 				else
 				{
-					this.handler.setPartitionList( new PrecisePriorityList<IAEItemStack>( priorityList ) );
+					this.handler.setPartitionList( new PrecisePriorityList<>( priorityList ) );
 				}
 
 				if( inv instanceof IBaseMonitor )
@@ -602,7 +601,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		try
 		{
 			// force grid to update handlers...
-			(( GridStorageCache ) this.getProxy().getGrid().getCache( IStorageGrid.class )).cellUpdate( null );
+			( (GridStorageCache) this.getProxy().getGrid().getCache( IStorageGrid.class ) ).cellUpdate( null );
 		}
 		catch( final GridAccessException e )
 		{
@@ -612,32 +611,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		return this.handler;
 	}
 
-	private void checkInterfaceVsStorageBus( final TileEntity target, final AEPartLocation side )
-	{
-		IInterfaceHost achievement = null;
-
-		if( target instanceof IInterfaceHost )
-		{
-			achievement = (IInterfaceHost) target;
-		}
-
-		if( target instanceof IPartHost )
-		{
-			final Object part = ( (IPartHost) target ).getPart( side );
-			if( part instanceof IInterfaceHost )
-			{
-				achievement = (IInterfaceHost) part;
-			}
-		}
-
-		if( achievement != null && achievement.getActionableNode() != null )
-		{
-			// Platform.addStat( achievement.getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement()
-			// );
-			// Platform.addStat( getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() );
-		}
-	}
-
 	@Override
 	public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
 	{

src/main/java/appeng/parts/p2p/PartP2PGTCEPower.java

@@ -0,0 +1,308 @@
+package appeng.parts.p2p;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import appeng.api.parts.IPartModel;
+import appeng.items.parts.PartModels;
+import appeng.me.GridAccessException;
+import gregtech.api.capability.GregtechCapabilities;
+import gregtech.api.capability.IEnergyContainer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.fml.common.Optional;
+
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.Queue;
+
+
+public class PartP2PGTCEPower extends PartP2PTunnel<PartP2PGTCEPower>
+{
+	private static final P2PModels MODELS = new P2PModels( "part/p2p/p2p_tunnel_gteu" );
+	private static final IEnergyContainer NULL_ENERGY_STORAGE = new NullEnergyStorage();
+	private final IEnergyContainer inputHandler = new InputEnergyStorage();
+	private final IEnergyContainer outputHandler = new OutputEnergyStorage();
+	private final Queue<PartP2PGTCEPower> outputs = new ArrayDeque<>();
+
+	public PartP2PGTCEPower( ItemStack is )
+	{
+		super( is );
+	}
+
+	@PartModels
+	public static List<IPartModel> getModels()
+	{
+		return MODELS.getModels();
+	}
+
+	@Override
+	public IPartModel getStaticModels()
+	{
+		return MODELS.getModel( this.isPowered(), this.isActive() );
+	}
+
+	@Override
+	public void onTunnelNetworkChange()
+	{
+		this.getHost().notifyNeighbors();
+	}
+
+	private IEnergyContainer getAttachedEnergyStorage()
+	{
+		if( this.isActive() )
+		{
+			final TileEntity self = this.getTile();
+			final TileEntity te = self.getWorld().getTileEntity( self.getPos().offset( this.getSide().getFacing() ) );
+
+			if( te != null && te.hasCapability( GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER, this.getSide().getOpposite().getFacing() ) )
+			{
+				return te.getCapability( GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER, this.getSide().getOpposite().getFacing() );
+			}
+		}
+		return NULL_ENERGY_STORAGE;
+	}
+
+	@Override
+	public boolean hasCapability( @Nonnull Capability<?> capability )
+	{
+		if( capability == GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER )
+		{
+			return true;
+		}
+		return super.hasCapability( capability );
+	}
+
+	@Nullable
+	@Override
+	public <T> T getCapability( @Nonnull Capability<T> capability )
+	{
+		if( capability == GregtechCapabilities.CAPABILITY_ENERGY_CONTAINER )
+		{
+			if( this.isOutput() )
+			{
+				return (T) this.outputHandler;
+			}
+			return (T) this.inputHandler;
+		}
+		return super.getCapability( capability );
+	}
+
+	class InputEnergyStorage implements IEnergyContainer
+	{
+		@Override
+		public long getEnergyCanBeInserted()
+		{
+			long canInsert = 0;
+			if( outputs.isEmpty() )
+			{
+				try
+				{
+					for( PartP2PGTCEPower o : PartP2PGTCEPower.this.getOutputs() )
+						outputs.add( o );
+				}
+				catch( GridAccessException e )
+				{
+					e.printStackTrace();
+				}
+			}
+
+			while ( !outputs.isEmpty() )
+			{
+				PartP2PGTCEPower target = outputs.poll();
+				final IEnergyContainer output = target.getAttachedEnergyStorage();
+
+				if( output == null || output.getEnergyCanBeInserted() <= 0 )
+				{
+					continue;
+				}
+				canInsert += output.getEnergyCanBeInserted();
+			}
+			return canInsert;
+		}
+
+		@Override
+		public long acceptEnergyFromNetwork( EnumFacing facing, long voltage, long amperage )
+		{
+			long amperesUsed = 0L;
+
+			if( outputs.isEmpty() )
+			{
+				try
+				{
+					for( PartP2PGTCEPower o : PartP2PGTCEPower.this.getOutputs() )
+						outputs.add( o );
+				}
+				catch( GridAccessException e )
+				{
+					e.printStackTrace();
+				}
+			}
+
+			while ( !outputs.isEmpty() )
+			{
+				PartP2PGTCEPower target = outputs.poll();
+				final IEnergyContainer output = target.getAttachedEnergyStorage();
+
+				if( output == null || !output.inputsEnergy( facing ) || output.getEnergyCanBeInserted() <= 0 )
+				{
+					continue;
+				}
+
+				if( voltage > 0 )
+				{
+					amperesUsed += output.acceptEnergyFromNetwork( facing, voltage, amperage - amperesUsed );
+				}
+
+				if( amperage == amperesUsed )
+				{
+					break;
+				}
+			}
+			return amperesUsed;
+		}
+
+		@Override
+		public boolean inputsEnergy( EnumFacing enumFacing )
+		{
+			return true;
+		}
+
+		@Override
+		public long changeEnergy( long l )
+		{
+			return 0;
+		}
+
+		@Override
+		public long getEnergyStored()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getEnergyCapacity()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getInputAmperage()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getInputVoltage()
+		{
+			return 0;
+		}
+	}
+
+	class OutputEnergyStorage implements IEnergyContainer
+	{
+		@Override
+		public long acceptEnergyFromNetwork( EnumFacing facing, long voltage, long amperage )
+		{
+			if( facing == getSide().getFacing() )
+			{
+				return 0;
+			}
+			final IEnergyContainer output = getAttachedEnergyStorage();
+			voltage *= 0.95;
+			if( voltage > 0 )
+			{
+				return output.acceptEnergyFromNetwork( facing, voltage, amperage );
+			}
+			return 0;
+		}
+
+		@Override
+		public boolean inputsEnergy( EnumFacing enumFacing )
+		{
+			return false;
+		}
+
+		@Override
+		public boolean outputsEnergy( EnumFacing side )
+		{
+			return true;
+		}
+
+		@Override
+		public long changeEnergy( long l )
+		{
+			return 0;
+		}
+
+		@Override
+		public long getEnergyStored()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getEnergyCapacity()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getInputAmperage()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getInputVoltage()
+		{
+			return 0;
+		}
+	}
+
+	static class NullEnergyStorage implements IEnergyContainer
+	{
+		@Override
+		public long acceptEnergyFromNetwork( EnumFacing enumFacing, long l, long l1 )
+		{
+			return 0;
+		}
+
+		@Override
+		public boolean inputsEnergy( EnumFacing enumFacing )
+		{
+			return false;
+		}
+
+		@Override
+		public long changeEnergy( long l )
+		{
+			return 0;
+		}
+
+		@Override
+		public long getEnergyStored()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getEnergyCapacity()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getInputAmperage()
+		{
+			return 0;
+		}
+
+		@Override
+		public long getInputVoltage()
+		{
+			return 0;
+		}
+	}
+}

src/main/java/appeng/parts/p2p/PartP2PItems.java

@@ -33,10 +33,6 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.EmptyHandler;
 
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.events.MENetworkBootingStatusChange;
-import appeng.api.networking.events.MENetworkChannelsChanged;
-import appeng.api.networking.events.MENetworkEventSubscribe;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
@@ -76,11 +72,14 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
 		this.cachedInv = null;
 		try
 		{
-			for( PartP2PItems input : this.getInputs() )
+			if( this.isOutput() )
 			{
-				if( input != null && this.isOutput() )
+				for( PartP2PItems input : this.getInputs() )
 				{
-					input.onTunnelNetworkChange();
+					if( input != null )
+					{
+						input.onTunnelNetworkChange();
+					}
 				}
 			}
 		}
@@ -171,51 +170,6 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
 		return wasReq ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
 	}
 
-	@MENetworkEventSubscribe
-	public void changeStateA( final MENetworkBootingStatusChange bs )
-	{
-		if( !this.isOutput() )
-		{
-			this.cachedInv = null;
-			final int olderSize = this.oldSize;
-			this.oldSize = this.getDestination().getSlots();
-			if( olderSize != this.oldSize )
-			{
-				this.getHost().notifyNeighbors();
-			}
-		}
-	}
-
-	@MENetworkEventSubscribe
-	public void changeStateB( final MENetworkChannelsChanged bs )
-	{
-		if( !this.isOutput() )
-		{
-			this.cachedInv = null;
-			final int olderSize = this.oldSize;
-			this.oldSize = this.getDestination().getSlots();
-			if( olderSize != this.oldSize )
-			{
-				this.getHost().notifyNeighbors();
-			}
-		}
-	}
-
-	@MENetworkEventSubscribe
-	public void changeStateC( final MENetworkPowerStatusChange bs )
-	{
-		if( !this.isOutput() )
-		{
-			this.cachedInv = null;
-			final int olderSize = this.oldSize;
-			this.oldSize = this.getDestination().getSlots();
-			if( olderSize != this.oldSize )
-			{
-				this.getHost().notifyNeighbors();
-			}
-		}
-	}
-
 	@Override
 	public void onTunnelNetworkChange()
 	{

src/main/java/appeng/parts/p2p/PartP2PLight.java

@@ -32,8 +32,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.events.MENetworkChannelsChanged;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
@@ -62,20 +60,6 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
 		super( is );
 	}
 
-	@Override
-	public void chanRender( final MENetworkChannelsChanged c )
-	{
-		this.onTunnelNetworkChange();
-		super.chanRender( c );
-	}
-
-	@Override
-	public void powerRender( final MENetworkPowerStatusChange c )
-	{
-		this.onTunnelNetworkChange();
-		super.powerRender( c );
-	}
-
 	@Override
 	public void writeToStream( final ByteBuf data ) throws IOException
 	{
@@ -115,9 +99,17 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
 			this.lastValue = newLevel;
 			try
 			{
+				int light = 0;
+				for( PartP2PLight src : this.getInputs() )
+				{
+					if( src != null && src.getProxy().isActive() )
+					{
+						light = Math.max( light, src.lastValue );
+					}
+				}
 				for( final PartP2PLight out : this.getOutputs() )
 				{
-					out.setLightLevel( this.lastValue );
+					out.setLightLevel( light );
 				}
 			}
 			catch( final GridAccessException e )
@@ -198,17 +190,16 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
 		{
 			try
 			{
+				int light = 0;
 				for( PartP2PLight src : this.getInputs() )
 				{
 					if( src != null && src.getProxy().isActive() )
 					{
-						this.setLightLevel( src.lastValue );
+						light = Math.max( light, src.lastValue );
-					}
-					else
-					{
-						this.getHost().markForUpdate();
 					}
 				}
+				this.setLightLevel( light );
+				this.getHost().markForUpdate();
 			}
 			catch( GridAccessException e )
 			{

src/main/java/appeng/parts/p2p/PartP2PRedstone.java

@@ -31,10 +31,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import appeng.api.networking.events.MENetworkBootingStatusChange;
-import appeng.api.networking.events.MENetworkChannelsChanged;
-import appeng.api.networking.events.MENetworkEventSubscribe;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.parts.IPartModel;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
@@ -60,25 +56,21 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 		super( is );
 	}
 
-	@MENetworkEventSubscribe
-	public void changeStateA( final MENetworkBootingStatusChange bs )
-	{
-		this.setNetworkReady();
-	}
-
 	private void setNetworkReady()
 	{
 		if( this.isOutput() )
 		{
 			try
 			{
+				int power = 0;
 				for( PartP2PRedstone in : this.getInputs() )
 				{
 					if( in != null )
 					{
-						this.putInput( in.power );
+						power = Math.max( power, in.power );
 					}
 				}
+				this.putInput( power );
 			}
 			catch( GridAccessException e )
 			{
@@ -95,12 +87,20 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 		}
 
 		this.recursive = true;
-		if( this.isOutput() && this.getProxy().isActive() )
+		if( this.isOutput() )
 		{
-			final int newPower = (Integer) o;
+			if( this.getProxy().isActive() )
-			if( this.power != newPower )
 			{
-				this.power = newPower;
+				final int newPower = (Integer) o;
+				if( this.power != newPower )
+				{
+					this.power = newPower;
+					this.notifyNeighbors();
+				}
+			}
+			else
+			{
+				this.power = 0;
 				this.notifyNeighbors();
 			}
 		}
@@ -120,18 +120,6 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 		}
 	}
 
-	@MENetworkEventSubscribe
-	public void changeStateB( final MENetworkChannelsChanged bs )
-	{
-		this.setNetworkReady();
-	}
-
-	@MENetworkEventSubscribe
-	public void changeStateC( final MENetworkPowerStatusChange bs )
-	{
-		this.setNetworkReady();
-	}
-
 	@Override
 	public void readFromNBT( final NBTTagCompound tag )
 	{
@@ -176,7 +164,22 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 
 				this.power = b.getWeakPower( state, this.getTile().getWorld(), target, srcSide );
 				this.power = Math.max( this.power, b.getWeakPower( state, this.getTile().getWorld(), target, srcSide ) );
-				this.sendToOutput( this.power );
+				int powerOut = this.power;
+				try
+				{
+					for( PartP2PRedstone in : this.getInputs() )
+					{
+						if( in != null )
+						{
+							powerOut = Math.max( in.power, powerOut );
+						}
+					}
+				}
+				catch( GridAccessException e )
+				{
+					e.printStackTrace();
+				}
+				this.sendToOutput( powerOut );
 			}
 			else
 			{

src/main/java/appeng/parts/p2p/PartP2PTunnel.java

@@ -24,6 +24,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Optional;
 
+import appeng.api.networking.events.MENetworkBootingStatusChange;
+import appeng.api.networking.events.MENetworkChannelsChanged;
+import appeng.api.networking.events.MENetworkEventSubscribe;
+import appeng.api.networking.events.MENetworkPowerStatusChange;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -153,6 +157,30 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 		data.writeShort( this.getFrequency() );
 	}
 
+	@Override
+	@MENetworkEventSubscribe
+	public void chanRender( final MENetworkChannelsChanged c )
+	{
+		this.onTunnelNetworkChange();
+		super.chanRender( c );
+	}
+
+	@Override
+	@MENetworkEventSubscribe
+	public void powerRender( final MENetworkPowerStatusChange c )
+	{
+		this.onTunnelNetworkChange();
+		super.powerRender( c );
+	}
+
+	@Override
+	@MENetworkEventSubscribe
+	public void bootingRender( final MENetworkBootingStatusChange bs )
+	{
+		this.onTunnelNetworkChange();
+		super.bootingRender( bs );
+	}
+
 	@Override
 	public float getCableConnectionLength( AECableType cable )
 	{
@@ -178,7 +206,13 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 			return false;
 		}
 
-		final ItemStack is = player.getHeldItem( hand );
+		boolean pasteAsOutput = true;
+		ItemStack is = player.getHeldItem( hand );
+		if( is.isEmpty() )
+		{
+			pasteAsOutput = false;
+			is = player.getHeldItemOffhand();
+		}
 
 		// UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor( is.getItem() );
 		// AELog.info( "ID:" + id.toString() + " : " + is.getItemDamage() );
@@ -217,7 +251,8 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 						if( newBus instanceof PartP2PTunnel )
 						{
 							final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
-							if( !Keyboard.isKeyDown( Keyboard.KEY_LCONTROL ) && !Keyboard.isKeyDown( Keyboard.KEY_RCONTROL ) )
+
+							if( pasteAsOutput )
 							{
 								newTunnel.setOutput( true );
 							}
@@ -248,7 +283,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 
 			final IParts parts = AEApi.instance().definitions().parts();
 
-			switch( tt )
+			switch ( tt )
 			{
 				case LIGHT:
 					newType = parts.p2PTunnelLight().maybeStack( 1 ).orElse( ItemStack.EMPTY );
@@ -258,6 +293,10 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 					newType = parts.p2PTunnelFE().maybeStack( 1 ).orElse( ItemStack.EMPTY );
 					break;
 
+				case GTEU_POWER:
+					newType = parts.p2PTunnelGTEU().maybeStack( 1 ).orElse( ItemStack.EMPTY );
+					break;
+
 				case FLUID:
 					newType = parts.p2PTunnelFluids().maybeStack( 1 ).orElse( ItemStack.EMPTY );
 					break;
@@ -417,8 +456,10 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 
 			final AEColor[] colors = Platform.p2p().toColors( this.getFrequency() );
 			final int[] colorCode = new int[]{
-					colors[0].ordinal(), colors[0].ordinal(), colors[1].ordinal(), colors[1].ordinal(),
+					colors[0].ordinal(), colors[0].ordinal(),
-					colors[2].ordinal(), colors[2].ordinal(), colors[3].ordinal(), colors[3].ordinal(),
+					colors[1].ordinal(), colors[1].ordinal(),
+					colors[2].ordinal(), colors[2].ordinal(),
+					colors[3].ordinal(), colors[3].ordinal(),
 			};
 
 			data.setIntArray( "colorCode", colorCode );

src/main/java/appeng/parts/reporting/PartExpandedProcessingPatternTerminal.java

@@ -0,0 +1,152 @@
+package appeng.parts.reporting;
+
+import appeng.api.implementations.ICraftingPatternItem;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.api.parts.IPartModel;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.core.AppEng;
+import appeng.core.sync.GuiBridge;
+import appeng.helpers.Reflected;
+import appeng.items.parts.PartModels;
+import appeng.parts.PartModel;
+import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.util.inv.InvOperation;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.items.IItemHandler;
+
+import java.util.List;
+
+import static appeng.helpers.PatternHelper.PROCESSING_INPUT_LIMIT;
+import static appeng.helpers.PatternHelper.PROCESSING_OUTPUT_LIMIT;
+
+
+public class PartExpandedProcessingPatternTerminal extends AbstractPartTerminal
+{
+    @PartModels
+    public static final ResourceLocation MODEL_OFF = new ResourceLocation( AppEng.MOD_ID, "part/expanded_processing_pattern_terminal_off" );
+    @PartModels
+    public static final ResourceLocation MODEL_ON = new ResourceLocation( AppEng.MOD_ID, "part/expanded_processing_pattern_terminal_on" );
+
+    public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF );
+    public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_ON );
+    public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL );
+
+    private final AppEngInternalInventory crafting = new AppEngInternalInventory( this, PROCESSING_INPUT_LIMIT );
+
+    private final AppEngInternalInventory output = new AppEngInternalInventory( this, PROCESSING_OUTPUT_LIMIT );
+    private final AppEngInternalInventory pattern = new AppEngInternalInventory( this, 2 );
+
+    @Reflected
+    public PartExpandedProcessingPatternTerminal( final ItemStack is )
+    {
+        super( is );
+    }
+
+    @Override
+    public void getDrops( final List<ItemStack> drops, final boolean wrenched )
+    {
+        for( final ItemStack is : this.pattern )
+        {
+            if( !is.isEmpty() )
+            {
+                drops.add( is );
+            }
+        }
+    }
+
+    @Override
+    public void readFromNBT( NBTTagCompound data )
+    {
+        super.readFromNBT( data );
+        this.crafting.readFromNBT( data, "processingGrid" );
+        this.pattern.readFromNBT( data, "pattern" );
+        this.output.readFromNBT( data, "outputList" );
+    }
+
+    @Override
+    public void writeToNBT( NBTTagCompound data )
+    {
+        super.writeToNBT( data );
+        this.crafting.writeToNBT( data, "processingGrid" );
+        this.pattern.writeToNBT( data, "pattern" );
+        this.output.writeToNBT( data, "outputList" );
+    }
+
+    @Override
+    public GuiBridge getGui( final EntityPlayer p )
+    {
+        int x = (int) p.posX;
+        int y = (int) p.posY;
+        int z = (int) p.posZ;
+        if( this.getHost().getTile() != null )
+        {
+            x = this.getTile().getPos().getX();
+            y = this.getTile().getPos().getY();
+            z = this.getTile().getPos().getZ();
+        }
+
+        if( GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.getSide(), p ) )
+        {
+            return GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
+        }
+        return GuiBridge.GUI_ME;
+    }
+
+    @Override
+    public void onChangeInventory( final IItemHandler inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack )
+    {
+        if( inv == this.pattern && slot == 1 )
+        {
+            final ItemStack is = this.pattern.getStackInSlot( 1 );
+            if( !is.isEmpty() && is.getItem() instanceof ICraftingPatternItem )
+            {
+                final ICraftingPatternItem pattern = (ICraftingPatternItem) is.getItem();
+                final ICraftingPatternDetails details = pattern.getPatternForItem( is, this.getHost().getTile().getWorld() );
+                if( details != null )
+                {
+                    for( int x = 0; x < this.crafting.getSlots() && x < details.getInputs().length; x++ )
+                    {
+                        final IAEItemStack item = details.getInputs()[x];
+                        this.crafting.setStackInSlot( x, item == null ? ItemStack.EMPTY : item.createItemStack() );
+                    }
+
+                    for( int x = 0; x < this.output.getSlots() && x < details.getOutputs().length; x++ )
+                    {
+                        final IAEItemStack item = details.getOutputs()[x];
+                        this.output.setStackInSlot( x, item == null ? ItemStack.EMPTY : item.createItemStack() );
+                    }
+                }
+            }
+        }
+
+        this.getHost().markForSave();
+    }
+
+    @Override
+    public IItemHandler getInventoryByName( final String name )
+    {
+        if( name.equals( "crafting" ) )
+        {
+            return this.crafting;
+        }
+        if( name.equals( "output" ) )
+        {
+            return this.output;
+        }
+        if( name.equals( "pattern" ) )
+        {
+            return this.pattern;
+        }
+        return super.getInventoryByName( name );
+    }
+
+    @Override
+    public IPartModel getStaticModels()
+    {
+        return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL );
+    }
+}
+

src/main/java/appeng/tile/crafting/TileMolecularAssembler.java

@@ -20,8 +20,18 @@ package appeng.tile.crafting;
 
 
 import java.io.IOException;
+import java.util.EnumMap;
 import java.util.List;
+import java.util.Map;
 
+import appeng.api.networking.security.IActionSource;
+import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.IStorageMonitorable;
+import appeng.api.storage.IStorageMonitorableAccessor;
+import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.capabilities.Capabilities;
+import appeng.helpers.PatternHelper;
+import appeng.me.helpers.MachineSource;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.inventory.InventoryCrafting;
@@ -30,6 +40,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -86,6 +97,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 	private final AppEngInternalInventory patternInv = new AppEngInternalInventory( this, 1, 1 );
 	private final IItemHandler gridInvExt = new WrapperFilteredItemHandler( this.gridInv, new CraftingGridFilter() );
 	private final IItemHandler internalInv = new WrapperChainedItemHandler( this.gridInv, this.patternInv );
+	private final EnumMap<EnumFacing, Object> neighbors = new EnumMap<>( EnumFacing.class );
 	private final IConfigManager settings;
 	private final UpgradeInventory upgrades;
 	private boolean isPowered = false;
@@ -96,6 +108,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 	private boolean isAwake = false;
 	private boolean forcePlan = false;
 	private boolean reboot = true;
+	private final IActionSource mySrc = new MachineSource( this );
 
 	public TileMolecularAssembler()
 	{
@@ -114,6 +127,126 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 		return 5;
 	}
 
+	public void updateNeighbors()
+	{
+		for( EnumFacing f : EnumFacing.VALUES )
+		{
+			TileEntity te = world.getTileEntity( pos.offset( f ) );
+			Object capability = null;
+			if( te != null )
+			{
+				// Prioritize a handler to directly link to another ME network
+				IStorageMonitorableAccessor accessor = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, f.getOpposite() );
+
+				if( accessor != null )
+				{
+					IStorageMonitorable inventory = accessor.getInventory( this.mySrc );
+					if( inventory != null )
+					{
+						capability = inventory;
+					}
+				}
+
+				if( capability == null )
+				{
+					capability = InventoryAdaptor.getAdaptor( te, f.getOpposite() );
+				}
+			}
+
+			if( capability != null )
+			{
+				neighbors.put( f, capability );
+			}
+			else
+			{
+				neighbors.remove( f );
+			}
+		}
+	}
+
+	@Override
+	public void onReady()
+	{
+		super.onReady();
+		updateNeighbors();
+	}
+
+	public void updateNeighbors( IBlockAccess w, BlockPos pos, BlockPos neighbor )
+	{
+		EnumFacing updateFromFacing;
+		if( pos.getX() != neighbor.getX() )
+		{
+			if( pos.getX() > neighbor.getX() )
+			{
+				updateFromFacing = EnumFacing.WEST;
+			}
+			else
+			{
+				updateFromFacing = EnumFacing.EAST;
+			}
+		}
+		else if( pos.getY() != neighbor.getY() )
+		{
+			if( pos.getY() > neighbor.getY() )
+			{
+				updateFromFacing = EnumFacing.DOWN;
+			}
+			else
+			{
+				updateFromFacing = EnumFacing.UP;
+			}
+		}
+		else if( pos.getZ() != neighbor.getZ() )
+		{
+			if( pos.getZ() > neighbor.getZ() )
+			{
+				updateFromFacing = EnumFacing.NORTH;
+			}
+			else
+			{
+				updateFromFacing = EnumFacing.SOUTH;
+			}
+		}
+		else
+		{
+			return;
+		}
+
+		if( pos.offset( updateFromFacing ).equals( neighbor ) )
+		{
+			TileEntity te = w.getTileEntity( neighbor );
+			Object capability = null;
+			if( te != null )
+			{
+				// Prioritize a handler to directly link to another ME network
+				IStorageMonitorableAccessor accessor = te.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, updateFromFacing.getOpposite() );
+
+				if( accessor != null )
+				{
+					IStorageMonitorable inventory = accessor.getInventory( this.mySrc );
+					if( inventory != null )
+					{
+						capability = inventory;
+					}
+				}
+
+				if( capability == null )
+				{
+					capability = InventoryAdaptor.getAdaptor( te, updateFromFacing.getOpposite() );
+				}
+			}
+
+			if( capability != null )
+			{
+				neighbors.put( updateFromFacing, capability );
+			}
+			else
+			{
+				neighbors.remove( updateFromFacing );
+			}
+		}
+	}
+
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table, final EnumFacing where )
 	{
@@ -143,7 +276,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 	private void updateSleepiness()
 	{
 		final boolean wasEnabled = this.isAwake;
-		this.isAwake = this.myPlan != null && this.hasMats() || this.canPush();
+		this.isAwake = this.canPush() || this.myPlan != null && this.hasMats();
 		if( wasEnabled != this.isAwake )
 		{
 			try
@@ -179,9 +312,13 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 		for( int x = 0; x < this.craftingInv.getSizeInventory(); x++ )
 		{
 			this.craftingInv.setInventorySlotContents( x, this.gridInv.getStackInSlot( x ) );
+			if( !myPlan.isValidItemForSlot( x, craftingInv.getStackInSlot( x ), world ) )
+			{
+				return false;
+			}
 		}
 
-		return !this.myPlan.getOutput( this.craftingInv, this.getWorld() ).isEmpty();
+		return this.myPlan.getOutputs().length > 0;
 	}
 
 	@Override
@@ -425,7 +562,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 
 		this.reboot = false;
 		int speed = 10;
-		switch( this.upgrades.getInstalledUpgrades( Upgrades.SPEED ) )
+		switch ( this.upgrades.getInstalledUpgrades( Upgrades.SPEED ) )
 		{
 			case 0:
 				this.progress += this.userPower( ticksSinceLastCall, speed = 10, 1.0 );
@@ -458,7 +595,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 			final ItemStack output = this.myPlan.getOutput( this.craftingInv, this.getWorld() );
 			if( !output.isEmpty() )
 			{
-				this.pushOut( output.copy() );
+				this.pushOut( output );
 
 				for( int x = 0; x < this.craftingInv.getSizeInventory(); x++ )
 				{
@@ -519,10 +656,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 	{
 		try
 		{
-			return (int) ( this.getProxy()
+			return (int) ( this.getProxy().getEnergy().extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE, PowerMultiplier.CONFIG ) / acceleratorTax );
-					.getEnergy()
-					.extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE,
-							PowerMultiplier.CONFIG ) / acceleratorTax );
 		}
 		catch( final GridAccessException e )
 		{
@@ -534,9 +668,13 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 	{
 		if( this.pushDirection == AEPartLocation.INTERNAL )
 		{
-			for( final EnumFacing d : EnumFacing.VALUES )
+			for( final Map.Entry<EnumFacing, Object> d : neighbors.entrySet() )
 			{
-				output = this.pushTo( output, d );
+				output = this.pushTo( output, d.getKey() );
+				if( output.isEmpty() )
+				{
+					break;
+				}
 			}
 		}
 		else
@@ -560,27 +698,42 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 			return output;
 		}
 
-		final TileEntity te = this.getWorld().getTileEntity( this.pos.offset( d ) );
+		Object capability = neighbors.get( d );
-
+		if( capability instanceof IStorageMonitorable )
-		if( te == null )
 		{
-			return output;
+			// Prioritize a handler to directly link to another ME network
+			IStorageMonitorable inventory = (IStorageMonitorable) capability;
+			IAEItemStack toInsert = AEItemStack.fromItemStack( output );
+			IMEMonitor<IAEItemStack> inv = inventory.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+			IAEItemStack remainder = inv.injectItems( toInsert, Actionable.SIMULATE, this.mySrc );
+			if( remainder == null )
+			{
+				inv.injectItems( toInsert, Actionable.MODULATE, this.mySrc );
+				return ItemStack.EMPTY;
+			}
+			else
+			{
+				if( remainder.getStackSize() == toInsert.getStackSize() )
+				{
+					return output;
+				}
+				inv.injectItems( toInsert.setStackSize( toInsert.getStackSize() - remainder.getStackSize() ), Actionable.MODULATE, this.mySrc );
+				this.saveChanges();
+				return remainder.createItemStack();
+			}
 		}
-
+		else if( capability instanceof InventoryAdaptor )
-		final InventoryAdaptor adaptor = InventoryAdaptor.getAdaptor( te, d.getOpposite() );
-
-		if( adaptor == null )
 		{
-			return output;
+			InventoryAdaptor adaptor = (InventoryAdaptor) capability;
-		}
 
-		final int size = output.getCount();
+			final int size = output.getCount();
-		output = adaptor.addItems( output );
+			output = adaptor.addItems( output );
-		final int newSize = output.isEmpty() ? 0 : output.getCount();
+			final int newSize = output.isEmpty() ? 0 : output.getCount();
 
-		if( size != newSize )
+			if( size != newSize )
-		{
+			{
-			this.saveChanges();
+				this.saveChanges();
+			}
 		}
 
 		return output;

src/main/java/appeng/tile/inventory/AppEngInternalInventory.java

@@ -77,6 +77,10 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl
 	@Override
 	public void setStackInSlot( int slot, @Nonnull ItemStack stack )
 	{
+		if( stack == this.getStackInSlot( slot ) )
+		{
+			return;
+		}
 		this.previousStack = this.getStackInSlot( slot ).copy();
 		super.setStackInSlot( slot, stack );
 	}
@@ -119,14 +123,15 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl
 		if( this.getTileEntity() != null && this.eventsEnabled() && !this.dirtyFlag )
 		{
 			this.dirtyFlag = true;
-			ItemStack newStack = this.getStackInSlot( slot ).copy();
+			ItemStack newStack = this.getStackInSlot( slot );
 			ItemStack oldStack = this.previousStack;
 			InvOperation op = InvOperation.SET;
 
-			if( newStack.isEmpty() || oldStack.isEmpty() || ( oldStack.getCount() < oldStack.getMaxStackSize() && oldStack.getCount() < this.getSlotLimit( slot ) && ItemStack.areItemsEqual( newStack, oldStack ) ) )
+			if( newStack.isEmpty() || oldStack.isEmpty() || oldStack.getCount() != newStack.getCount() && ItemStack.areItemsEqual( newStack, oldStack ) )
 			{
 				if( newStack.getCount() > oldStack.getCount() )
 				{
+					newStack = newStack.copy();
 					newStack.shrink( oldStack.getCount() );
 					oldStack = ItemStack.EMPTY;
 					op = InvOperation.INSERT;

src/main/java/appeng/tile/networking/TileEnergyAcceptor.java

@@ -57,10 +57,16 @@ public class TileEnergyAcceptor extends AENetworkPowerTile
 		}
 		catch( final GridAccessException e )
 		{
-			return this.getInternalMaxPower();
+			return 0;
 		}
 	}
 
+	@Override
+	public double getInternalMaxPower()
+	{
+		return getFunnelPowerDemand( Long.MAX_VALUE );
+	}
+
 	@Override
 	protected double funnelPowerIntoStorage( final double power, final Actionable mode )
 	{

src/main/java/appeng/tile/powersink/AEBasePoweredTile.java

@@ -53,7 +53,7 @@ public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowe
 	private EnumSet<EnumFacing> internalPowerSides = EnumSet.allOf( EnumFacing.class );
 	private final IEnergyStorage forgeEnergyAdapter;
 	private Object teslaEnergyAdapter;
-
+	private GTCEEnergyAdapter gtceEnergyAdapter = null;
 	private IC2PowerSink ic2Sink;
 
 	public AEBasePoweredTile()
@@ -63,6 +63,11 @@ public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowe
 		{
 			this.teslaEnergyAdapter = new TeslaEnergyAdapter( this );
 		}
+		if( Capabilities.GTCE_ENERGY != null )
+		{
+			this.gtceEnergyAdapter = new GTCEEnergyAdapter( this );
+		}
+
 		this.ic2Sink = Integrations.ic2().createPowerSink( this, this );
 		this.ic2Sink.setValidFaces( this.internalPowerSides );
 	}
@@ -284,6 +289,13 @@ public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowe
 				return true;
 			}
 		}
+		else if( capability == Capabilities.GTCE_ENERGY )
+		{
+			if( this.getPowerSides().contains( facing ) )
+			{
+				return true;
+			}
+		}
 
 		return super.hasCapability( capability, facing );
 	}
@@ -306,7 +318,14 @@ public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowe
 				return (T) this.teslaEnergyAdapter;
 			}
 		}
-
+		else if( capability == Capabilities.GTCE_ENERGY )
+		{
+			if( this.getPowerSides().contains( facing ) )
+			{
+				return (T) this.gtceEnergyAdapter;
+			}
+		}
+		
 		return super.getCapability( capability, facing );
 	}
 

src/main/java/appeng/tile/powersink/GTCEEnergyAdapter.java

@@ -0,0 +1,89 @@
+package appeng.tile.powersink;
+
+import appeng.api.config.Actionable;
+import appeng.api.config.PowerUnits;
+import gregtech.api.capability.IEnergyContainer;
+import net.minecraft.util.EnumFacing;
+
+
+public class GTCEEnergyAdapter implements IEnergyContainer
+{
+	private final IExternalPowerSink sink;
+
+	double EUBuffer;
+
+	GTCEEnergyAdapter( IExternalPowerSink sink )
+	{
+		this.sink = sink;
+	}
+
+	@Override
+	public long acceptEnergyFromNetwork( EnumFacing enumFacing, long voltage, long amperage )
+	{
+		final double power = voltage * amperage;
+		final double oldBuffer = EUBuffer;
+
+		EUBuffer = this.sink.injectExternalPower( PowerUnits.GTEU, power + EUBuffer, Actionable.MODULATE );
+
+		// if the overflow went down, all inputs were consumed
+		if( EUBuffer <= oldBuffer )
+		{
+			return amperage;
+		}
+		// if overflow is greater than the inputs, nothing was consumed
+		if( EUBuffer >= power )
+		{
+			EUBuffer -= power;
+			return 0;
+		}
+		// determine how many amps are being used
+		final double usedEU = power + oldBuffer - EUBuffer;
+		final long ampsUsed = (long) Math.ceil( usedEU / ( (double) voltage ) );
+		// adjust the overflow
+		EUBuffer += usedEU % voltage;
+
+		return ampsUsed;
+	}
+
+	@Override
+	public boolean inputsEnergy( EnumFacing enumFacing )
+	{
+		return true;
+	}
+
+	@Override
+	public long changeEnergy( long l )
+	{
+		return 0;
+	}
+
+	@Override
+	public long getEnergyStored()
+	{
+		return (long) Math.floor( PowerUnits.AE.convertTo( PowerUnits.GTEU, this.sink.getAECurrentPower() ) );
+	}
+
+	@Override
+	public long getEnergyCapacity()
+	{
+		return (long) Math.floor( PowerUnits.AE.convertTo( PowerUnits.GTEU, this.sink.getAEMaxPower() ) );
+	}
+
+	@Override
+	public long getInputAmperage()
+	{
+		return 0;
+	}
+
+	@Override
+	public long getInputVoltage()
+	{
+		return 0;
+	}
+
+	@Override
+	public long getEnergyCanBeInserted()
+	{
+		return this.getEnergyCapacity() - this.getEnergyStored();
+	}
+}

src/main/java/appeng/tile/storage/TileChest.java

@@ -495,12 +495,12 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 
 			try
 			{
-				this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
 				if( this.getProxy().isActive() )
 				{
 					final IStorageGrid gs = this.getProxy().getStorage();
 					Platform.postChanges( gs, removed, added, this.mySrc );
 				}
+				this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
 			}
 			catch( final GridAccessException ignored )
 			{

src/main/java/appeng/tile/storage/TileDrive.java

@@ -263,12 +263,12 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 
 		try
 		{
-			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
 			if( this.getProxy().isActive() )
 			{
 				final IStorageGrid gs = this.getProxy().getStorage();
 				Platform.postChanges( gs, removed, added, this.mySrc );
 			}
+			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
 		}
 		catch( final GridAccessException ignored )
 		{

src/main/java/appeng/util/Platform.java

@@ -1226,7 +1226,7 @@ public class Platform
 		Preconditions.checkNotNull( src );
 		Preconditions.checkNotNull( mode );
 
-		final T possible = cell.injectItems( input.copy(), Actionable.SIMULATE, src );
+		final T possible = cell.injectItems( input, Actionable.SIMULATE, src );
 
 		long stored = input.getStackSize();
 		if( possible != null )

src/main/java/appeng/util/inv/AdaptorItemHandler.java

@@ -223,26 +223,28 @@ public class AdaptorItemHandler extends InventoryAdaptor
 		return this.addItems( toBeSimulated, true );
 	}
 
-	protected ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate )
+	protected ItemStack addItems( ItemStack itemsToAdd, final boolean simulate )
 	{
 		if( itemsToAdd.isEmpty() )
 		{
 			return ItemStack.EMPTY;
 		}
 
-		ItemStack left = itemsToAdd.copy();
-
 		for( int slot = 0; slot < this.itemHandler.getSlots(); slot++ )
 		{
-			left = this.itemHandler.insertItem( slot, left, simulate );
+			if( !simulate )
+			{
+				itemsToAdd = itemsToAdd.copy();
+			}
+			itemsToAdd = this.itemHandler.insertItem( slot, itemsToAdd, simulate );
 
-			if( left.isEmpty() )
+			if( itemsToAdd.isEmpty() )
 			{
 				return ItemStack.EMPTY;
 			}
 		}
 
-		return left;
+		return itemsToAdd;
 	}
 
 	@Override

src/main/java/appeng/util/inv/AdaptorItemRepository.java

@@ -12,198 +12,201 @@ import java.util.Iterator;
 
 public class AdaptorItemRepository extends InventoryAdaptor
 {
-    protected final IItemRepository itemRepository;
+	protected final IItemRepository itemRepository;
 
-    public AdaptorItemRepository( IItemRepository itemRepository )
+	public AdaptorItemRepository( IItemRepository itemRepository )
-    {
+	{
-        this.itemRepository = itemRepository;
+		this.itemRepository = itemRepository;
-    }
+	}
 
-    @Override
+	@Override
-    public ItemStack removeItems( int amount, ItemStack filter, IInventoryDestination destination )
+	public ItemStack removeItems( int amount, ItemStack filter, IInventoryDestination destination )
-    {
+	{
-        ItemStack rv = ItemStack.EMPTY;
+		ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
+		ItemStack extracted = ItemStack.EMPTY;
 
-        if( !filter.isEmpty() )
+		if( !filter.isEmpty() )
-        {
+		{
-            extracted = this.itemRepository.extractItem( filter, amount, true );
+			extracted = this.itemRepository.extractItem( filter, amount, true );
-        }
+		}
-        else
+		else
-        {
+		{
-            for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
+			for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-            {
+			{
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
+				extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-                if( !extracted.isEmpty() )
+				if( !extracted.isEmpty() )
-                {
+				{
-                    break;
+					break;
-                }
+				}
-            }
+			}
-        }
+		}
 
-        if( destination != null )
+		if( destination != null )
-        {
+		{
 
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
+			if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
+			{
-                return rv;
+				return rv;
-            }
+			}
 
-        }
+		}
 
-        extracted = this.itemRepository.extractItem( filter, amount, false );
+		extracted = this.itemRepository.extractItem( filter.isEmpty() ? extracted : filter, amount, false );
 
-        return extracted;
+		return extracted;
-    }
+	}
 
-    @Override
+	@Override
-    public ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination )
+	public ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination )
-    {
+	{
-        ItemStack rv = ItemStack.EMPTY;
+		ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
+		ItemStack extracted = ItemStack.EMPTY;
 
-        if( !filter.isEmpty() )
+		if( !filter.isEmpty() )
-        {
+		{
-            extracted = this.itemRepository.extractItem( filter, amount, true );
+			extracted = this.itemRepository.extractItem( filter, amount, true );
-        }
+		}
-        else
+		else
-        {
+		{
-            for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
+			for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-            {
+			{
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
+				extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-                if( !extracted.isEmpty() )
+				if( !extracted.isEmpty() )
-                {
+				{
-                    break;
+					break;
-                }
+				}
-            }
+			}
-        }
+		}
 
-        if( destination != null )
+		if( destination != null )
-        {
+		{
 
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
+			if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
+			{
-                return rv;
+				return rv;
-            }
+			}
 
-        }
+		}
 
-        return extracted;
+		return extracted;
-    }
+	}
 
-    @Override
+	@Override
-    public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
+	public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
-    {
+	{
-        ItemStack rv = ItemStack.EMPTY;
+		ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
+		ItemStack extracted = ItemStack.EMPTY;
 
-        for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
+		for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-        {
+		{
-            if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) )
+			if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) )
-            {
+			{
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
+				extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-            }
+			}
 
-            if( !extracted.isEmpty() )
+			if( !extracted.isEmpty() )
-            {
+			{
-                break;
+				break;
-            }
+			}
-        }
+		}
 
-        if( destination != null )
+		if( destination != null )
-        {
+		{
 
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
+			if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
+			{
-                return rv;
+				return rv;
-            }
+			}
 
-        }
+		}
 
-        extracted = this.itemRepository.extractItem( extracted, amount, false );
+		extracted = this.itemRepository.extractItem( extracted, amount, false );
 
-        return extracted;
+		return extracted;
-    }
+	}
 
-    @Override
+	@Override
-    public ItemStack simulateSimilarRemove( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
+	public ItemStack simulateSimilarRemove( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
-    {
+	{
-        ItemStack rv = ItemStack.EMPTY;
+		ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
+		ItemStack extracted = ItemStack.EMPTY;
 
-        for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
+		for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-        {
+		{
-            if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) )
+			if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) )
-            {
+			{
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
+				extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-            }
+			}
 
-            if( !extracted.isEmpty() )
+			if( !extracted.isEmpty() )
-            {
+			{
-                break;
+				break;
-            }
+			}
-        }
+		}
 
-        if( destination != null )
+		if( destination != null )
-        {
+		{
 
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
+			if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
+			{
-                return rv;
+				return rv;
-            }
+			}
 
-        }
+		}
 
-        return extracted;
+		return extracted;
-    }
+	}
 
-    @Override
+	@Override
-    public ItemStack addItems( ItemStack toBeAdded )
+	public ItemStack addItems( ItemStack toBeAdded )
-    {
+	{
-        return this.addItems( toBeAdded, false );
+		return this.addItems( toBeAdded, false );
-    }
+	}
 
-    protected ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate )
+	protected ItemStack addItems( ItemStack itemsToAdd, final boolean simulate )
-    {
+	{
-        if( itemsToAdd.isEmpty() )
+		if( itemsToAdd.isEmpty() )
-        {
+		{
-            return ItemStack.EMPTY;
+			return ItemStack.EMPTY;
-        }
+		}
 
-        ItemStack left = itemsToAdd.copy();
+		if( !simulate )
+		{
+			itemsToAdd = itemsToAdd.copy();
+		}
 
-        left = this.itemRepository.insertItem( left, simulate );
+		itemsToAdd = this.itemRepository.insertItem( itemsToAdd, simulate );
 
-        if( left.isEmpty() )
+		if( itemsToAdd.isEmpty() )
-        {
+		{
-            return ItemStack.EMPTY;
+			return ItemStack.EMPTY;
-        }
+		}
 
-        return left;
+		return itemsToAdd;
-    }
+	}
 
-    @Override
+	@Override
-    public ItemStack simulateAdd( ItemStack toBeSimulated )
+	public ItemStack simulateAdd( ItemStack toBeSimulated )
-    {
+	{
-        return this.addItems( toBeSimulated, true );
+		return this.addItems( toBeSimulated, true );
-    }
+	}
 
-    @Override
+	@Override
-    public boolean containsItems()
+	public boolean containsItems()
-    {
+	{
-        return !this.itemRepository.getAllItems().isEmpty();
+		return !this.itemRepository.getAllItems().isEmpty();
-    }
+	}
 
-    @Override
+	@Override
-    public boolean hasSlots()
+	public boolean hasSlots()
-    {
+	{
-        return true;
+		return true;
-    }
+	}
 
-    @Override
+	@Override
-    public Iterator<ItemSlot> iterator()
+	public Iterator<ItemSlot> iterator()
-    {
+	{
-        return null;
+		return null;
-    }
+	}
 }
 

src/main/java/appeng/util/inv/BlockingInventoryAdaptor.java

@@ -0,0 +1,26 @@
+package appeng.util.inv;
+
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+
+
+public abstract class BlockingInventoryAdaptor implements Iterable<ItemSlot>
+{
+	public static BlockingInventoryAdaptor getAdaptor( final TileEntity te, final EnumFacing d )
+	{
+		if( te != null && te.hasCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d ) )
+		{
+			// Attempt getting an IItemHandler for the given side via caps
+			IItemHandler itemHandler = te.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d );
+			if( itemHandler != null )
+			{
+				return new BlockingItemHandler( itemHandler, te.getBlockType().getRegistryName().getResourceDomain() );
+			}
+		}
+		return null;
+	}
+
+	public abstract boolean containsBlockingItems();
+}

src/main/java/appeng/util/inv/BlockingItemHandler.java

@@ -0,0 +1,62 @@
+package appeng.util.inv;
+
+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IItemList;
+import appeng.helpers.NonBlockingItems;
+import appeng.util.Platform;
+import appeng.util.item.AEItemStack;
+import gregtech.common.items.MetaTool;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+
+public class BlockingItemHandler extends BlockingInventoryAdaptor
+{
+	protected final IItemHandler itemHandler;
+	private final String domain;
+
+	public BlockingItemHandler( IItemHandler itemHandler, String domain )
+	{
+		this.itemHandler = itemHandler;
+		this.domain = domain;
+	}
+
+	boolean isBlockableItem( ItemStack stack )
+	{
+		Object2ObjectOpenHashMap<Item, IntSet> map = NonBlockingItems.INSTANCE.getMap().get( domain );
+		if( map.get( stack.getItem() ) != null )
+		{
+			return !map.get( stack.getItem() ).contains( stack.getItemDamage() );
+		}
+		return true;
+	}
+
+	@Override
+	public boolean containsBlockingItems()
+	{
+		int slots = this.itemHandler.getSlots();
+		for( int slot = 0; slot < slots; slot++ )
+		{
+			ItemStack is = this.itemHandler.getStackInSlot( slot );
+			if( !is.isEmpty() && isBlockableItem( is ) )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public Iterator<ItemSlot> iterator()
+	{
+		return new ItemHandlerIterator( this.itemHandler );
+	}
+}

src/main/java/appeng/util/item/AEItemStack.java

@@ -18,6 +18,7 @@
 
 package appeng.util.item;
 
+import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -25,6 +26,7 @@ import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.google.common.primitives.Ints;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -41,279 +43,352 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.core.Api;
 import appeng.util.Platform;
 
-public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack {
-    private static final String NBT_STACKSIZE = "Cnt";
-    private static final String NBT_REQUESTABLE = "Req";
-    private static final String NBT_CRAFTABLE = "Craft";
 
-    private final AESharedItemStack sharedStack;
+public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack
-    private Optional<OreReference> oreReference;
+{
+	private static final String NBT_STACKSIZE = "Cnt";
+	private static final String NBT_REQUESTABLE = "Req";
+	private static final String NBT_CRAFTABLE = "Craft";
 
-    @SideOnly(Side.CLIENT)
+	private final AESharedItemStack sharedStack;
-    private String displayName;
+	private Optional<OreReference> oreReference;
-    @SideOnly(Side.CLIENT)
-    private List<String> tooltip;
 
-    private AEItemStack(final AEItemStack is) {
+	@SideOnly( Side.CLIENT )
-        this.setStackSize(is.getStackSize());
+	private String displayName;
-        this.setCraftable(is.isCraftable());
+	@SideOnly( Side.CLIENT )
-        this.setCountRequestable(is.getCountRequestable());
+	private List<String> tooltip;
-        this.sharedStack = is.sharedStack;
+	private ItemStack cachedItemStack;
-        this.oreReference = is.oreReference;
-    }
 
-    private AEItemStack(final AESharedItemStack is, long size) {
+	private AEItemStack( final AEItemStack is )
-        this.sharedStack = is;
+	{
-        this.setStackSize(size);
+		this.setStackSize( is.getStackSize() );
-        this.setCraftable(false);
+		this.setCraftable( is.isCraftable() );
-        this.setCountRequestable(0);
+		this.setCountRequestable( is.getCountRequestable() );
-        this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
+		this.sharedStack = is.sharedStack;
-    }
+		this.oreReference = is.oreReference;
+		this.cachedItemStack = is.cachedItemStack;
+	}
 
-    @Nullable
+	private AEItemStack( final AESharedItemStack is, long size )
-    public static AEItemStack fromItemStack(@Nonnull final ItemStack stack) {
+	{
-        if (stack.isEmpty()) {
+		this.sharedStack = is;
-            return null;
+		this.setStackSize( size );
-        }
+		this.setCraftable( false );
+		this.setCountRequestable( 0 );
+		this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
+	}
 
-        return new AEItemStack(AEItemStackRegistry.getRegisteredStack(stack), stack.getCount());
+	@Nullable
-    }
+	public static AEItemStack fromItemStack( @Nonnull final ItemStack stack )
+	{
+		if( stack.isEmpty() )
+		{
+			return null;
+		}
 
-    public static IAEItemStack fromNBT( final NBTTagCompound i )
+		return new AEItemStack( AEItemStackRegistry.getRegisteredStack( stack ), stack.getCount() );
-    {
+	}
-        if( i == null )
-        {
-            return null;
-        }
 
-        final ItemStack itemstack = new ItemStack( i );
+	public static IAEItemStack fromNBT( final NBTTagCompound i )
-        if( itemstack.isEmpty() )
+	{
-        {
+		if( i == null )
-            return null;
+		{
-        }
+			return null;
+		}
 
-        final AEItemStack item = AEItemStack.fromItemStack( itemstack );
+		final ItemStack itemstack = new ItemStack( i );
+		if( itemstack.isEmpty() )
+		{
+			return null;
+		}
 
-        item.setStackSize(i.getLong(NBT_STACKSIZE));
+		final AEItemStack item = AEItemStack.fromItemStack( itemstack );
-        item.setCountRequestable(i.getLong(NBT_REQUESTABLE));
-        item.setCraftable(i.getBoolean(NBT_CRAFTABLE));
-        return item;
-    }
 
-    @Override
+		item.setStackSize( i.getLong( NBT_STACKSIZE ) );
-    public void writeToNBT(final NBTTagCompound i) {
+		item.setCountRequestable( i.getLong( NBT_REQUESTABLE ) );
-        this.getDefinition().writeToNBT( i );
+		item.setCraftable( i.getBoolean( NBT_CRAFTABLE ) );
+		return item;
+	}
 
-        i.setLong(NBT_STACKSIZE, this.getStackSize());
+	@Override
-        i.setLong(NBT_REQUESTABLE, this.getCountRequestable());
+	public void writeToNBT( final NBTTagCompound i )
-        i.setBoolean(NBT_CRAFTABLE, this.isCraftable());
+	{
-    }
+		this.getDefinition().writeToNBT( i );
 
-    public static AEItemStack fromPacket( final ByteBuf data )
+		i.setLong( NBT_STACKSIZE, this.getStackSize() );
-    {
+		i.setLong( NBT_REQUESTABLE, this.getCountRequestable() );
-        final byte mask = data.readByte();
+		i.setBoolean( NBT_CRAFTABLE, this.isCraftable() );
-        final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
+	}
-        final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
-        final boolean isCraftable = ( mask & 0x40 ) > 0;
 
-        final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
+	public static AEItemStack fromPacket( final ByteBuf data )
-        final long stackSize = getPacketValue( stackType, data );
+	{
-        final long countRequestable = getPacketValue( countReqType, data );
+		final byte mask = data.readByte();
+		final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
+		final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
+		final boolean isCraftable = ( mask & 0x40 ) > 0;
 
-        if( itemstack.isEmpty() )
+		final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
-        {
+		final long stackSize = getPacketValue( stackType, data );
-            return null;
+		final long countRequestable = getPacketValue( countReqType, data );
-        }
 
-        final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
+		if( itemstack.isEmpty() )
-        item.setCountRequestable( countRequestable );
+		{
-        item.setCraftable( isCraftable );
+			return null;
-        return item;
+		}
-    }
 
-    @Override
+		final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
-    public void writeToPacket( final ByteBuf i )
+		item.setCountRequestable( countRequestable );
-    {
+		item.setCraftable( isCraftable );
-        final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
+		return item;
-                .getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
+	}
 
-        i.writeByte( mask );
+	@Override
-        ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
+	public void writeToPacket( final ByteBuf i )
-        this.putPacketValue( i, this.getStackSize() );
+	{
-        this.putPacketValue( i, this.getCountRequestable() );
+		final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this.getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
-    }
 
-    @Override
+		i.writeByte( mask );
-    public void add(final IAEItemStack option) {
+		ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
-        if (option == null) {
+		this.putPacketValue( i, this.getStackSize() );
-            return;
+		this.putPacketValue( i, this.getCountRequestable() );
-        }
+	}
 
-        this.incStackSize(option.getStackSize());
+	@Override
-        this.setCountRequestable(this.getCountRequestable() + option.getCountRequestable());
+	public void add( final IAEItemStack option )
-        this.setCraftable(this.isCraftable() || option.isCraftable());
+	{
-    }
+		if( option == null )
+		{
+			return;
+		}
 
-    @Override
+		this.incStackSize( option.getStackSize() );
-    public boolean fuzzyComparison(final IAEItemStack other, final FuzzyMode mode) {
+		this.setCountRequestable( this.getCountRequestable() + option.getCountRequestable() );
-        final ItemStack itemStack = this.getDefinition();
+		this.setCraftable( this.isCraftable() || option.isCraftable() );
-        final ItemStack otherStack = other.getDefinition();
+	}
 
-        return this.fuzzyItemStackComparison(itemStack, otherStack, mode);
+	@Override
-    }
+	public boolean fuzzyComparison( final IAEItemStack other, final FuzzyMode mode )
+	{
+		final ItemStack itemStack = this.getDefinition();
+		final ItemStack otherStack = other.getDefinition();
 
-    @Override
+		return this.fuzzyItemStackComparison( itemStack, otherStack, mode );
-    public IAEItemStack copy() {
+	}
-        return new AEItemStack(this);
-    }
 
-    @Override
+	@Override
-    public boolean isItem()
+	public IAEItemStack copy()
-    {
+	{
-        return true;
+		return new AEItemStack( this );
-    }
+	}
 
-    @Override
+	@Override
-    public boolean isFluid()
+	public boolean isItem()
-    {
+	{
-        return false;
+		return true;
-    }
+	}
 
-    @Override
+	@Override
-    public IStorageChannel<IAEItemStack> getChannel() {
+	public boolean isFluid()
-        return Api.INSTANCE.storage().getStorageChannel(IItemStorageChannel.class);
+	{
-    }
+		return false;
+	}
 
-    @Override
+	@Override
-    public ItemStack createItemStack() {
+	public IStorageChannel<IAEItemStack> getChannel()
-        return ItemHandlerHelper.copyStackWithSize(this.getDefinition(),
+	{
-                (int) Math.min(Integer.MAX_VALUE, this.getStackSize()));
+		return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class );
-    }
+	}
 
-    @Override
+	@Override
-    public Item getItem() {
+	public ItemStack createItemStack()
-        return this.getDefinition().getItem();
+	{
-    }
+		return ItemHandlerHelper.copyStackWithSize( this.getDefinition(), (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ) );
+	}
 
-    @Override
+	@Override
-    public int getItemDamage() {
+	public Item getItem()
-        return this.sharedStack.getItemDamage();
+	{
-    }
+		return this.getDefinition().getItem();
+	}
 
-    @Override
+	@Override
-    public boolean sameOre( final IAEItemStack is )
+	public int getItemDamage()
-    {
+	{
-        return OreHelper.INSTANCE.sameOre( this, is );
+		return this.sharedStack.getItemDamage();
-    }
+	}
 
-    @Override
+	@Override
-    public boolean isSameType(final IAEItemStack otherStack) {
+	public boolean sameOre( final IAEItemStack is )
-        if (otherStack == null) {
+	{
-            return false;
+		return OreHelper.INSTANCE.sameOre( this, is );
-        }
+	}
 
-        return Objects.equals(this.sharedStack, ((AEItemStack) otherStack).sharedStack);
+	@Override
-    }
+	public boolean isSameType( final IAEItemStack otherStack )
+	{
+		if( otherStack == null )
+		{
+			return false;
+		}
 
-    @Override
+		return Objects.equals( this.sharedStack, ( (AEItemStack) otherStack ).sharedStack );
-    public boolean isSameType(final ItemStack otherStack) {
+	}
-        if (otherStack.isEmpty()) {
-            return false;
-        }
-        int oldSize = otherStack.getCount();
 
-        otherStack.setCount(1);
+	@Override
-        boolean ret = ItemStack.areItemStacksEqual(this.getDefinition(), otherStack);
+	public boolean isSameType( final ItemStack otherStack )
-        otherStack.setCount(oldSize);
+	{
+		if( otherStack.isEmpty() )
+		{
+			return false;
+		}
+		int oldSize = otherStack.getCount();
 
-        return ret;
+		otherStack.setCount( 1 );
-    }
+		boolean ret = ItemStack.areItemStacksEqual( this.getDefinition(), otherStack );
+		otherStack.setCount( oldSize );
 
-    @Override
+		return ret;
-    public int hashCode() {
+	}
-        return this.sharedStack.hashCode();
-    }
 
-    @Override
+	@Override
-    public boolean equals(final Object ia) {
+	public int hashCode()
-        if (ia instanceof AEItemStack) {
+	{
-            return this.isSameType((AEItemStack) ia);
+		return this.sharedStack.hashCode();
-        } else if (ia instanceof ItemStack) {
+	}
-            // this actually breaks the equals contract (being equals to unrelated classes)
-            return equals((ItemStack) ia);
-        }
-        return false;
-    }
 
-    @Override
+	@Override
-    public boolean equals(final ItemStack is) {
+	public boolean equals( final Object ia )
-        return this.isSameType(is);
+	{
-    }
+		if( ia instanceof AEItemStack )
+		{
+			return this.isSameType( (AEItemStack) ia );
+		}
+		else if( ia instanceof ItemStack )
+		{
+			// this actually breaks the equals contract (being equals to unrelated classes)
+			return equals( (ItemStack) ia );
+		}
+		return false;
+	}
 
-    @Override
+	@Override
-    public String toString() {
+	public boolean equals( final ItemStack is )
-        return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName();
+	{
-    }
+		return this.isSameType( is );
+	}
 
-    @SideOnly(Side.CLIENT)
+	@Override
-    public List<String> getToolTip() {
+	public ItemStack getCachedItemStack( long stackSize )
-        if (this.tooltip == null) {
+	{
-            this.tooltip = Platform.getTooltip(this.asItemStackRepresentation());
+		ItemStack currentCached = null;
-        }
+		if( this.cachedItemStack != null )
-        return this.tooltip;
+		{
-    }
+			currentCached = this.cachedItemStack;
+		}
 
-    @SideOnly(Side.CLIENT)
+		ItemStack itemStack;
-    public String getDisplayName() {
-        if (this.displayName == null) {
-            this.displayName = Platform.getItemDisplayName(this.asItemStackRepresentation());
-        }
-        return this.displayName;
-    }
 
-    @SideOnly(Side.CLIENT)
+		if( currentCached != null )
-    public String getModID() {
+		{
-        return this.getDefinition().getItem().getRegistryName().getResourceDomain();
+			// Cache is suitable, just update the count
-    }
+			itemStack = currentCached;
+			currentCached.setCount( Ints.saturatedCast( stackSize ) );
+		}
+		else
+		{
+			// We need a new stack :-(
+			itemStack = this.createItemStack();
+		}
+		return itemStack;
+	}
 
-    public Optional<OreReference> getOre()
+	@Override
-    {
+	public void setCachedItemStack( ItemStack itemStack )
-        return this.oreReference;
+	{
-    }
+		this.cachedItemStack = itemStack;
+	}
 
-    @Override
+	@Override
-    public boolean hasTagCompound() {
+	public String toString()
-        return this.getDefinition().hasTagCompound();
+	{
-    }
+		return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName();
+	}
 
-    @Override
+	@SideOnly( Side.CLIENT )
-    public ItemStack asItemStackRepresentation() {
+	public List<String> getToolTip()
-        return this.getDefinition().copy();
+	{
-    }
+		if( this.tooltip == null )
+		{
+			this.tooltip = Platform.getTooltip( this.asItemStackRepresentation() );
+		}
+		return this.tooltip;
+	}
 
-    @Override
+	@SideOnly( Side.CLIENT )
-    public ItemStack getDefinition() {
+	public String getDisplayName()
-        return this.sharedStack.getDefinition();
+	{
-    }
+		if( this.displayName == null )
+		{
+			this.displayName = Platform.getItemDisplayName( this.asItemStackRepresentation() );
+		}
+		return this.displayName;
+	}
 
-    AESharedItemStack getSharedStack() {
+	@SideOnly( Side.CLIENT )
-        return this.sharedStack;
+	public String getModID()
-    }
+	{
+		return this.getDefinition().getItem().getRegistryName().getResourceDomain();
+	}
 
-    private boolean fuzzyItemStackComparison(ItemStack a, ItemStack b, FuzzyMode mode) {
+	public Optional<OreReference> getOre()
-        if (a.getItem() == b.getItem() && a.getItem().isDamageable()) {
+	{
-            if (mode == FuzzyMode.IGNORE_ALL) {
+		return this.oreReference;
-                return true;
+	}
-            } else if (mode == FuzzyMode.PERCENT_99) {
-                return a.getItemDamage() > 1 == b.getItemDamage() > 1;
-            } else {
-                final float percentDamageOfA = (float) a.getItemDamage() / a.getMaxDamage();
-                final float percentDamageOfB = (float) b.getItemDamage() / b.getMaxDamage();
 
-                return percentDamageOfA > mode.breakPoint == percentDamageOfB > mode.breakPoint;
+	@Override
-            }
+	public boolean hasTagCompound()
-        }
+	{
+		return this.getDefinition().hasTagCompound();
+	}
 
-        return false;
+	@Override
-    }
+	public ItemStack asItemStackRepresentation()
+	{
+		return this.getDefinition().copy();
+	}
+
+	@Override
+	public ItemStack getDefinition()
+	{
+		return this.sharedStack.getDefinition();
+	}
+
+	AESharedItemStack getSharedStack()
+	{
+		return this.sharedStack;
+	}
+
+	private boolean fuzzyItemStackComparison( ItemStack a, ItemStack b, FuzzyMode mode )
+	{
+		if( a.getItem() == b.getItem() && a.getItem().isDamageable() )
+		{
+			if( mode == FuzzyMode.IGNORE_ALL )
+			{
+				return true;
+			}
+			else if( mode == FuzzyMode.PERCENT_99 )
+			{
+				return a.getItemDamage() > 1 == b.getItemDamage() > 1;
+			}
+			else
+			{
+				final float percentDamageOfA = (float) a.getItemDamage() / a.getMaxDamage();
+				final float percentDamageOfB = (float) b.getItemDamage() / b.getMaxDamage();
+
+				return percentDamageOfA > mode.breakPoint == percentDamageOfB > mode.breakPoint;
+			}
+		}
+
+		return false;
+	}
 }

src/main/java/appeng/util/item/AESharedItemStack.java

@@ -22,72 +22,78 @@ import java.util.Objects;
 
 import com.google.common.base.Preconditions;
 
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-final class AESharedItemStack {
 
-    private final ItemStack itemStack;
+final class AESharedItemStack
-    private final int itemId;
+{
-    private final int itemDamage;
-    private final int hashCode;
 
-    public AESharedItemStack(final ItemStack itemStack) {
+	private final ItemStack itemStack;
-        this(itemStack, itemStack.getItemDamage());
+	private final int itemDamage;
-    }
+	private final int hashCode;
 
-    /**
+	public AESharedItemStack( final ItemStack itemStack )
-     * A constructor to explicitly set the damage value and not fetch it from the {@link ItemStack}
+	{
-     *
+		this( itemStack, itemStack.getItemDamage() );
-     * @param itemStack The {@link ItemStack} to filter
+	}
-     * @param damage    The damage of the item
-     */
-    private AESharedItemStack(ItemStack itemStack, int damage) {
-        this.itemStack = itemStack;
-        this.itemId = Item.getIdFromItem(itemStack.getItem());
-        this.itemDamage = damage;
 
-        // Ensure this is always called last.
+	/**
-        this.hashCode = this.makeHashCode();
+	 * A constructor to explicitly set the damage value and not fetch it from the {@link ItemStack}
-    }
+	 *
+	 * @param itemStack The {@link ItemStack} to filter
+	 * @param damage    The damage of the item
+	 */
+	private AESharedItemStack( ItemStack itemStack, int damage )
+	{
+		this.itemStack = itemStack;
+		this.itemDamage = damage;
 
-    ItemStack getDefinition() {
+		// Ensure this is always called last.
-        return this.itemStack;
+		this.hashCode = this.makeHashCode();
-    }
+	}
 
-    int getItemDamage() {
+	ItemStack getDefinition()
-        return this.itemDamage;
+	{
-    }
+		return this.itemStack;
+	}
 
-    @Override
+	int getItemDamage()
-    public int hashCode() {
+	{
-        return this.hashCode;
+		return this.itemDamage;
-    }
+	}
 
-    @Override
+	@Override
-    public boolean equals(final Object obj) {
+	public int hashCode()
-        if (this == obj) {
+	{
-            return true;
+		return this.hashCode;
-        }
+	}
-        if (!(obj instanceof AESharedItemStack)) {
-            return false;
-        }
 
-        final AESharedItemStack other = (AESharedItemStack) obj;
+	@Override
-        Preconditions.checkState(this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1");
+	public boolean equals( final Object obj )
-        Preconditions.checkArgument(other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1");
+	{
+		if( this == obj )
+		{
+			return true;
+		}
+		if( !( obj instanceof AESharedItemStack ) )
+		{
+			return false;
+		}
 
-        if (this.itemStack == other.itemStack) {
+		final AESharedItemStack other = (AESharedItemStack) obj;
-            return true;
+		Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
-        }
+		Preconditions.checkArgument( other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
-        return ItemStack.areItemStacksEqual(this.itemStack, other.itemStack);
-    }
 
-    private int makeHashCode() {
+		if( this.itemStack == other.itemStack )
-        return Objects.hash(
+		{
-                this.itemId,
+			return true;
-                this.itemDamage,
+		}
-                this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0);
+		return ItemStack.areItemStacksEqual( this.itemStack, other.itemStack );
-    }
+	}
+
+	private int makeHashCode()
+	{
+		return Objects.hash( this.itemStack.getItem(), this.itemDamage, this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0 );
+	}
 
 }

src/main/java/appeng/util/item/OreDictFilterMatcher.java

@@ -0,0 +1,383 @@
+package appeng.util.item;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author brachy84
+ * @butcherer PrototypeTrousers
+ */
+public class OreDictFilterMatcher
+{
+
+    /**
+     * Parses the given expression and creates a List.
+     *
+     * @param expression expr to parse
+     * @return match rule list
+     */
+    public static List<MatchRule> parseExpression( String expression )
+    {
+        List<MatchRule> rules = new ArrayList<>();
+        parseExpression( rules, expression );
+        return rules;
+    }
+
+    /**
+     * Parses the given expression and puts them into the given list.
+     *
+     * @param rules      list to fill
+     * @param expression expr to parse
+     * @return the position of the expr. Is only relevant for sub rules
+     */
+    public static int parseExpression( List<MatchRule> rules, String expression )
+    {
+        rules.clear();
+
+        StringBuilder builder = new StringBuilder();
+        for( int i = 0; i < expression.length(); i++ )
+        {
+            char c = expression.charAt( i );
+            if( c == ' ' )
+            {
+                continue;
+            }
+            if( c == '(' )
+            {
+                List<MatchRule> subRules = new ArrayList<>();
+                i = parseExpression( subRules, expression.substring( i + 1 ) ) + i + 1;
+                rules.add( MatchRule.group( subRules, builder.toString() ) );
+                builder = new StringBuilder();
+            }
+            else
+            {
+                switch ( c )
+                {
+                    case '&':
+                        rules.add( new MatchRule( builder.toString() ) );
+                        rules.add( new MatchRule( MatchLogic.AND ) );
+                        builder = new StringBuilder();
+                        break;
+                    case '|':
+                        rules.add( new MatchRule( builder.toString() ) );
+                        rules.add( new MatchRule( MatchLogic.OR ) );
+                        builder = new StringBuilder();
+                        break;
+                    case '^':
+                        rules.add( new MatchRule( builder.toString() ) );
+                        rules.add( new MatchRule( MatchLogic.XOR ) );
+                        builder = new StringBuilder();
+                        break;
+                    case ')':
+                        rules.add( new MatchRule( builder.toString() ) );
+                        return i + 1;
+                    default:
+                        builder.append( c );
+                }
+            }
+        }
+        if( builder.length() > 0 )
+        {
+            rules.add( new MatchRule( builder.toString() ) );
+        }
+        return expression.length();
+    }
+
+    /**
+     * Matches the given string against a list of rules.
+     * The string does not have to be an oreDict.
+     *
+     * @param rules   to check against
+     * @param oreDict string to check
+     * @return if the string matches the rules
+     */
+    public static boolean matches( List<MatchRule> rules, String oreDict )
+    {
+        boolean first = true;
+        boolean lastResult = false;
+        MatchLogic lastLogic = null;
+        for( MatchRule rule : rules )
+        {
+            if( lastLogic == null )
+            {
+                if( rule.logic == MatchLogic.AND || rule.logic == MatchLogic.OR || rule.logic == MatchLogic.XOR )
+                {
+                    lastLogic = rule.logic;
+                    continue;
+                }
+            }
+            if( lastLogic != null || first )
+            {
+                if( lastLogic != null )
+                {
+                    switch ( lastLogic )
+                    {
+                        case AND:
+                        {
+                            if( !lastResult )
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+                        case OR:
+                        {
+                            if( lastResult )
+                            {
+                                return true;
+                            }
+                            break;
+                        }
+                    }
+                }
+
+                boolean newResult;
+                if( rule.isGroup() )
+                {
+                    newResult = rule.logic == MatchLogic.NOT ^ matches( rule.subRules, oreDict );
+                }
+                else
+                {
+                    newResult = matches( rule, oreDict );
+                }
+
+                if( lastLogic == MatchLogic.XOR )
+                {
+                    if( lastResult == newResult )
+                    {
+                        return false;
+                    }
+                }
+
+                lastLogic = null;
+                lastResult = newResult;
+                first = false;
+            }
+
+        }
+
+        return lastResult;
+    }
+
+    private static boolean matches( MatchRule rule, String oreDict )
+    {
+        String filter = rule.expression;
+
+        if( filter.equals( "*" ) )
+        {
+            return true;
+        }
+
+        boolean startWild = filter.startsWith( "*" ), endWild = filter.endsWith( "*" );
+        if( startWild )
+        {
+            filter = filter.substring( 1 );
+        }
+
+        String[] parts = filter.split( "\\*+" );
+
+        return ( rule.logic == MatchLogic.NOT ) ^ matches( parts, oreDict, startWild, endWild );
+    }
+
+    private static boolean matches( String[] filter, String oreDict, boolean startWild, boolean endWild )
+    {
+        String lastlastPart = filter[0];
+        String lastPart = filter[0];
+        int index = oreDict.indexOf( lastPart );
+        if( ( !startWild && index != 0 ) || index < 0 )
+        {
+            return false;
+        }
+        boolean didGoBack = false;
+
+        for( int i = 1; i < filter.length; i++ )
+        {
+            String part = filter[i];
+            int newIndex = oreDict.indexOf( part, index + lastPart.length() );
+            if( newIndex < 0 )
+            {
+                if( i > 1 && !didGoBack )
+                {
+                    i -= 2;
+                    lastPart = lastlastPart;
+                    didGoBack = true;
+                    continue;
+                }
+                return false;
+            }
+            lastlastPart = lastPart;
+            lastPart = part;
+            index = newIndex;
+            if( didGoBack )
+            {
+                didGoBack = false;
+            }
+        }
+
+        if( endWild || lastPart.length() + index == oreDict.length() )
+        {
+            return true;
+        }
+
+        for( int i = filter.length - 1; i < filter.length; i++ )
+        {
+            String part = filter[i];
+            int newIndex = oreDict.indexOf( part, index + lastPart.length() );
+            if( newIndex < 0 )
+            {
+                if( i > 1 && !didGoBack )
+                {
+                    i -= 2;
+                    lastPart = lastlastPart;
+                    didGoBack = true;
+                    continue;
+                }
+                return false;
+            }
+            lastlastPart = lastPart;
+            lastPart = part;
+            index = newIndex;
+            if( didGoBack )
+            {
+                didGoBack = false;
+            }
+        }
+        return lastPart.length() + index == oreDict.length();
+    }
+
+    public static String validateExp( String input )
+    {
+        // remove all operators that are double
+        input = input.replaceAll( "\\*{2,}", "*" );
+        input = input.replaceAll( "&{2,}", "&" );
+        input = input.replaceAll( "\\|{2,}", "|" );
+        input = input.replaceAll( "!{2,}", "!" );
+        input = input.replaceAll( "\\^{2,}", "^" );
+        input = input.replaceAll( " {2,}", " " );
+        // move ( and ) so it doesn't create invalid expressions f.e. xxx (& yyy) => xxx & (yyy)
+        // append or prepend ( and ) if the amount is not equal
+        StringBuilder builder = new StringBuilder();
+        int unclosed = 0;
+        char last = ' ';
+        for( int i = 0; i < input.length(); i++ )
+        {
+            char c = input.charAt( i );
+            if( c == ' ' )
+            {
+                if( last != '(' )
+                {
+                    builder.append( " " );
+                }
+                continue;
+            }
+            if( c == '(' )
+            {
+                unclosed++;
+            }
+            else if( c == ')' )
+            {
+                unclosed--;
+                if( last == '&' || last == '|' || last == '^' )
+                {
+                    int l = builder.lastIndexOf( " " + last );
+                    int l2 = builder.lastIndexOf( "" + last );
+                    builder.insert( l == l2 - 1 ? l : l2, ")" );
+                    continue;
+                }
+                if( i > 0 && builder.charAt( builder.length() - 1 ) == ' ' )
+                {
+                    builder.deleteCharAt( builder.length() - 1 );
+                }
+            }
+            else if( ( c == '&' || c == '|' || c == '^' ) && last == '(' )
+            {
+                builder.deleteCharAt( builder.lastIndexOf( "(" ) );
+                builder.append( c ).append( " (" );
+                continue;
+            }
+
+            builder.append( c );
+            last = c;
+        }
+        if( unclosed > 0 )
+        {
+            for( int i = 0; i < unclosed; i++ )
+            {
+                builder.append( ")" );
+            }
+        }
+        else if( unclosed < 0 )
+        {
+            unclosed = -unclosed;
+            for( int i = 0; i < unclosed; i++ )
+            {
+                builder.insert( 0, "(" );
+            }
+        }
+        input = builder.toString();
+        input = input.replaceAll( " {2,}", " " );
+        return input;
+    }
+
+
+    public static class MatchRule
+    {
+        public final MatchLogic logic;
+        public final String expression;
+        private final List<MatchRule> subRules;
+
+        private MatchRule( MatchLogic logic, String expression, List<MatchRule> subRules )
+        {
+            if( expression.startsWith( "!" ) )
+            {
+                logic = MatchLogic.NOT;
+                expression = expression.substring( 1 );
+            }
+            this.logic = logic;
+            this.expression = expression;
+            this.subRules = subRules;
+        }
+
+        public MatchRule( MatchLogic logic, String expression )
+        {
+            this( logic, expression, null );
+        }
+
+        public MatchRule( MatchLogic logic )
+        {
+            this( logic, "" );
+        }
+
+        public MatchRule( String expression )
+        {
+            this( MatchLogic.ANY, expression );
+        }
+
+        public static MatchRule not( String expression, boolean not )
+        {
+            return new MatchRule( not ? MatchLogic.NOT : MatchLogic.ANY, expression );
+        }
+
+        public static MatchRule group( List<MatchRule> subRules, String expression )
+        {
+            MatchLogic logic = expression.startsWith( "!" ) ? MatchLogic.NOT : MatchLogic.ANY;
+            return new MatchRule( logic, "", subRules );
+        }
+
+        public boolean isGroup()
+        {
+            return subRules != null;
+        }
+    }
+
+
+    public enum MatchLogic
+    {
+        OR,
+        AND,
+        XOR,
+        NOT,
+        ANY
+    }
+}

src/main/java/appeng/util/item/OreHelper.java

@@ -19,204 +19,208 @@
 package appeng.util.item;
 
 
-import java.util.Collection;
+import appeng.api.storage.data.IAEItemStack;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import appeng.api.storage.data.IAEItemStack;
+import java.util.*;
 
 
 public class OreHelper
 {
 
-	public static final OreHelper INSTANCE = new OreHelper();
+    public static final OreHelper INSTANCE = new OreHelper();
 
-	/**
+    /**
-	 * A local cache to speed up OreDictionary lookups.
+     * A local cache to speed up OreDictionary lookups.
-	 */
+     */
-	private final LoadingCache<String, List<ItemStack>> oreDictCache = CacheBuilder.newBuilder().build( new CacheLoader<String, List<ItemStack>>()
+    private final LoadingCache<String, List<ItemStack>> oreDictCache = CacheBuilder.newBuilder().build( new CacheLoader<String, List<ItemStack>>()
-	{
+    {
-		@Override
+        @Override
-		public List<ItemStack> load( final String oreName )
+        public List<ItemStack> load( final String oreName )
-		{
+        {
-			return OreDictionary.getOres( oreName );
+            return OreDictionary.getOres( oreName );
-		}
+        }
-	} );
+    } );
 
-	private final Map<ItemRef, OreReference> references = new HashMap<>();
+    private final Map<ItemRef, OreReference> references = new HashMap<>();
 
-	/**
+    /**
-	 * Test if the passed {@link ItemStack} is an ore.
+     * Test if the passed {@link ItemStack} is an ore.
-	 *
+     *
-	 * @param itemStack the itemstack to test
+     * @param itemStack the itemstack to test
-	 *
+     * @return true if an ore entry exists, false otherwise
-	 * @return true if an ore entry exists, false otherwise
+     */
-	 */
+    public Optional<OreReference> getOre( final ItemStack itemStack )
-	public Optional<OreReference> getOre( final ItemStack itemStack )
+    {
-	{
+        final ItemRef ir = new ItemRef( itemStack );
-		final ItemRef ir = new ItemRef( itemStack );
 
-		if( !this.references.containsKey( ir ) )
+        if( !this.references.containsKey( ir ) )
-		{
+        {
-			final OreReference ref = new OreReference();
+            final OreReference ref = new OreReference();
-			final Collection<Integer> ores = ref.getOres();
+            final Collection<Integer> ores = ref.getOres();
-			final Collection<String> set = ref.getEquivalents();
+            final Collection<String> set = ref.getEquivalents();
 
-			final Set<String> toAdd = new HashSet<>();
+            final Set<String> toAdd = new HashSet<>();
 
-			for( final String ore : OreDictionary.getOreNames() )
+            for( final String ore : OreDictionary.getOreNames() )
-			{
+            {
-				// skip ore if it is a match already or null.
+                // skip ore if it is a match already or null.
-				if( ore == null || toAdd.contains( ore ) )
+                if( ore == null || toAdd.contains( ore ) )
-				{
+                {
-					continue;
+                    continue;
-				}
+                }
 
-				for( final ItemStack oreItem : this.oreDictCache.getUnchecked( ore ) )
+                for( final ItemStack oreItem : this.oreDictCache.getUnchecked( ore ) )
-				{
+                {
-					if( OreDictionary.itemMatches( oreItem, itemStack, false ) )
+                    if( OreDictionary.itemMatches( oreItem, itemStack, false ) )
-					{
+                    {
-						toAdd.add( ore );
+                        toAdd.add( ore );
-						break;
+                        break;
-					}
+                    }
-				}
+                }
-			}
+            }
 
-			for( final String ore : toAdd )
+            for( final String ore : toAdd )
-			{
+            {
-				set.add( ore );
+                set.add( ore );
-				ores.add( OreDictionary.getOreID( ore ) );
+                ores.add( OreDictionary.getOreID( ore ) );
-			}
+            }
 
-			if( !set.isEmpty() )
+            if( !set.isEmpty() )
-			{
+            {
-				this.references.put( ir, ref );
+                this.references.put( ir, ref );
-			}
+            }
-			else
+            else
-			{
+            {
-				this.references.put( ir, null );
+                this.references.put( ir, null );
-			}
+            }
-		}
+        }
 
-		return Optional.ofNullable( this.references.get( ir ) );
+        return Optional.ofNullable( this.references.get( ir ) );
-	}
+    }
 
-	boolean sameOre( final AEItemStack aeItemStack, final IAEItemStack is )
+    boolean sameOre( final AEItemStack aeItemStack, final IAEItemStack is )
-	{
+    {
-		final OreReference a = aeItemStack.getOre().orElse( null );
+        final OreReference a = aeItemStack.getOre().orElse( null );
-		final OreReference b = aeItemStack.getOre().orElse( null );
+        final OreReference b = ( (AEItemStack) is ).getOre().orElse( null );
 
-		return this.sameOre( a, b );
+        return this.sameOre( a, b );
-	}
+    }
 
-	public boolean sameOre( final OreReference a, final OreReference b )
+    public boolean sameOre( final OreReference a, final OreReference b )
-	{
+    {
-		if( a == null || b == null )
+        if( a == null || b == null )
-		{
+        {
-			return false;
+            return false;
-		}
+        }
 
-		if( a == b )
+        if( a == b )
-		{
+        {
-			return true;
+            return true;
-		}
+        }
 
-		final Collection<Integer> bOres = b.getOres();
+        final Collection<Integer> bOres = b.getOres();
-		for( final Integer ore : a.getOres() )
+        for( final Integer ore : a.getOres() )
-		{
+        {
-			if( bOres.contains( ore ) )
+            if( bOres.contains( ore ) )
-			{
+            {
-				return true;
+                return true;
-			}
+            }
-		}
+        }
 
-		return false;
+        return false;
-	}
+    }
 
-	boolean sameOre( final AEItemStack aeItemStack, final ItemStack o )
+    boolean sameOre( final AEItemStack aeItemStack, final ItemStack o )
-	{
+    {
-		return aeItemStack.getOre().map( a ->
+        return aeItemStack.getOre().map( a -> {
-		{
+            for( final String oreName : a.getEquivalents() )
-			for( final String oreName : a.getEquivalents() )
+            {
-			{
+                for( final ItemStack oreItem : this.oreDictCache.getUnchecked( oreName ) )
-				for( final ItemStack oreItem : this.oreDictCache.getUnchecked( oreName ) )
+                {
-				{
+                    if( OreDictionary.itemMatches( oreItem, o, false ) )
-					if( OreDictionary.itemMatches( oreItem, o, false ) )
+                    {
-					{
+                        return true;
-						return true;
+                    }
-					}
+                }
-				}
+            }
-			}
+            return false;
-			return false;
+        } ).orElse( false );
-		} )
+    }
-				.orElse( false );
-	}
 
-	List<ItemStack> getCachedOres( final String oreName )
+    public Set<Integer> getMatchingOre( String oreExp )
-	{
+    {
-		return this.oreDictCache.getUnchecked( oreName );
+        Set<Integer> matchingIds = new HashSet<>();
-	}
 
-	private static class ItemRef
+        List<OreDictFilterMatcher.MatchRule> rulesList = OreDictFilterMatcher.parseExpression( oreExp );
-	{
+        for( String ore : OreDictionary.getOreNames() )
+        {
+            if( OreDictFilterMatcher.matches( rulesList, ore ) )
+            {
+                matchingIds.add( OreDictionary.getOreID( ore ) );
+            }
+        }
+        return matchingIds;
+    }
 
-		private final Item ref;
+    public List<ItemStack> getCachedOres( final String oreName )
-		private final int damage;
+    {
-		private final int hash;
+        return this.oreDictCache.getUnchecked( oreName );
+    }
 
-		ItemRef( final ItemStack stack )
+    private static class ItemRef
-		{
+    {
-			this.ref = stack.getItem();
 
-			if( stack.getItem().isDamageable() )
+        private final Item ref;
-			{
+        private final int damage;
-				this.damage = 0; // IGNORED
+        private final int hash;
-			}
-			else
-			{
-				this.damage = stack.getItemDamage(); // might be important...
-			}
 
-			this.hash = this.ref.hashCode() ^ this.damage;
+        ItemRef( final ItemStack stack )
-		}
+        {
+            this.ref = stack.getItem();
 
-		@Override
+            if( stack.getItem().isDamageable() )
-		public int hashCode()
+            {
-		{
+                this.damage = 0; // IGNORED
-			return this.hash;
+            }
-		}
+            else
+            {
+                this.damage = stack.getItemDamage(); // might be important...
+            }
 
-		@Override
+            this.hash = this.ref.hashCode() ^ this.damage;
-		public boolean equals( final Object obj )
+        }
-		{
-			if( obj == null )
-			{
-				return false;
-			}
-			if( this.getClass() != obj.getClass() )
-			{
-				return false;
-			}
-			final ItemRef other = (ItemRef) obj;
-			return this.damage == other.damage && this.ref == other.ref;
-		}
 
-		@Override
+        @Override
-		public String toString()
+        public int hashCode()
-		{
+        {
-			return "ItemRef [ref=" + this.ref.getUnlocalizedName() + ", damage=" + this.damage + ", hash=" + this.hash + ']';
+            return this.hash;
-		}
+        }
-	}
+
+        @Override
+        public boolean equals( final Object obj )
+        {
+            if( obj == null )
+            {
+                return false;
+            }
+            if( this.getClass() != obj.getClass() )
+            {
+                return false;
+            }
+            final ItemRef other = (ItemRef) obj;
+            return this.damage == other.damage && this.ref == other.ref;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "ItemRef [ref=" + this.ref.getUnlocalizedName() + ", damage=" + this.damage + ", hash=" + this.hash + ']';
+        }
+    }
 }

src/main/java/appeng/util/item/OreReference.java

@@ -65,8 +65,8 @@ public class OreReference
 		return this.aeOtherOptions;
 	}
 
-	Collection<Integer> getOres()
+	public Collection<Integer> getOres()
-	{
+    {
-		return this.ores;
+        return this.ores;
-	}
+    }
 }

src/main/java/appeng/util/prioritylist/OreDictPriorityList.java

@@ -0,0 +1,51 @@
+package appeng.util.prioritylist;
+
+import appeng.api.storage.data.IAEStack;
+import appeng.util.item.AEItemStack;
+import appeng.util.item.OreReference;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+
+public class OreDictPriorityList<T extends IAEStack<T>> implements IPartitionList<T>
+{
+    private final Set<Integer> oreIDs;
+    private final String oreMatch;
+
+    public OreDictPriorityList( Set<Integer> oreIDs, String oreMatch )
+    {
+        this.oreIDs = oreIDs;
+        this.oreMatch = oreMatch;
+    }
+
+    @Override
+    public boolean isListed( final T input )
+    {
+        OreReference or = ( (AEItemStack) input ).getOre().orElse( null );
+        if( or != null )
+        {
+            for( Integer oreID : or.getOres() )
+            {
+                if( this.oreIDs.contains( oreID ) )
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isEmpty()
+    {
+        return oreMatch.equals( "" );
+    }
+
+    @Override
+    public Iterable<T> getItems()
+    {
+        return new ArrayList<>();
+    }
+
+}

src/main/resources/assets/appliedenergistics2/lang/en_us.lang

@@ -102,6 +102,7 @@ gui.appliedenergistics2.FluidTunnel=Fluid
 gui.appliedenergistics2.RedstoneTunnel=Redstone
 gui.appliedenergistics2.EUTunnel=EU
 gui.appliedenergistics2.FETunnel=FE
+gui.appliedenergistics2.GTEUTunnel=GTEU
 gui.appliedenergistics2.LightTunnel=Light
 gui.appliedenergistics2.OCTunnel=OpenComputers
 gui.appliedenergistics2.PressureTunnel=Pressure
@@ -133,6 +134,7 @@ gui.appliedenergistics2.SecurityCardEditor=Biometric Card Editor
 gui.appliedenergistics2.Encoded=Encoded
 gui.appliedenergistics2.Priority=Priority
 gui.appliedenergistics2.StorageBus=Storage Bus
+gui.appliedenergistics2.OreDictStorageBus=Ore Dictionary Storage Bus
 gui.appliedenergistics2.StorageBusFluids=Fluid Storage Bus
 gui.appliedenergistics2.EnergyDrain=Passive Drain
 gui.appliedenergistics2.Installed=Installed
@@ -374,6 +376,7 @@ gui.tooltips.appliedenergistics2.HighlightInterface=Highlight interface
 gui.appliedenergistics2.units.appliedenergstics=AE
 gui.appliedenergistics2.units.ic2=Energy Units
 gui.appliedenergistics2.units.rf=Redstone Flux
+gui.appliedenergistics2.units.gteu=GTEU
 
 // Colors
 gui.appliedenergistics2.White=White
@@ -535,8 +538,10 @@ item.appliedenergistics2.multi_part.level_emitter.name=ME Level Emitter
 item.appliedenergistics2.multi_part.fluid_level_emitter.name=ME Fluid Level Emitter
 item.appliedenergistics2.multi_part.p2p_tunnel.name=P2P Tunnel
 item.appliedenergistics2.multi_part.pattern_terminal.name=ME Pattern Terminal
+item.appliedenergistics2.multi_part.expanded_processing_pattern_terminal.name=ME Extended Processing Pattern Terminal
 item.appliedenergistics2.multi_part.quartz_fiber.name=Quartz Fiber
 item.appliedenergistics2.multi_part.storage_bus.name=ME Storage Bus
+item.appliedenergistics2.multi_part.oredict_storage_bus.name=ME OreDict Storage Bus
 item.appliedenergistics2.multi_part.fluid_storage_bus.name=ME Fluid Storage Bus
 item.appliedenergistics2.multi_part.terminal.name=ME Terminal
 item.appliedenergistics2.multi_part.inverted_toggle_bus.name=ME Inverted Toggle Bus

src/main/resources/assets/appliedenergistics2/models/item/part/expanded_processing_pattern_terminal.json

@@ -0,0 +1,9 @@
+{
+    "parent": "appliedenergistics2:item/part/display",
+    "textures": {
+        "front": "appliedenergistics2:items/part/expanded_processing_pattern_terminal",
+        "front_bright": "appliedenergistics2:parts/expanded_processing_pattern_terminal_bright",
+        "front_medium": "appliedenergistics2:parts/expanded_processing_pattern_terminal_medium",
+        "front_dark": "appliedenergistics2:parts/pattern_terminal_dark"
+    }
+}

src/main/resources/assets/appliedenergistics2/models/item/part/oredict_storage_bus.json

@@ -0,0 +1,106 @@
+{
+    "parent": "appliedenergistics2:item/part/part",
+    "textures": {
+        "sides": "appliedenergistics2:parts/storage_bus_sides",
+        "back": "appliedenergistics2:parts/storage_bus_back",
+        "front": "appliedenergistics2:items/part/oredict_storage_bus"
+    },
+    "elements": [
+        {
+            "from": [
+                3,
+                3,
+                6
+            ],
+            "to": [
+                13,
+                13,
+                7
+            ],
+            "faces": {
+                "north": {
+                    "texture": "#front"
+                },
+                "south": {
+                    "texture": "#back"
+                },
+                "east": {
+                    "texture": "#sides"
+                },
+                "west": {
+                    "texture": "#sides"
+                },
+                "up": {
+                    "texture": "#sides"
+                },
+                "down": {
+                    "texture": "#sides"
+                }
+            }
+        },
+        {
+            "from": [
+                2,
+                2,
+                7
+            ],
+            "to": [
+                14,
+                14,
+                8
+            ],
+            "faces": {
+                "north": {
+                    "texture": "#front"
+                },
+                "south": {
+                    "texture": "#back"
+                },
+                "east": {
+                    "texture": "#sides"
+                },
+                "west": {
+                    "texture": "#sides"
+                },
+                "up": {
+                    "texture": "#sides"
+                },
+                "down": {
+                    "texture": "#sides"
+                }
+            }
+        },
+        {
+            "from": [
+                5,
+                5,
+                8
+            ],
+            "to": [
+                11,
+                11,
+                10
+            ],
+            "faces": {
+                "north": {
+                    "texture": "#front"
+                },
+                "south": {
+                    "texture": "#back"
+                },
+                "east": {
+                    "texture": "#sides"
+                },
+                "west": {
+                    "texture": "#sides"
+                },
+                "up": {
+                    "texture": "#sides"
+                },
+                "down": {
+                    "texture": "#sides"
+                }
+            }
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel_gteu.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:item/part/p2p_tunnel",
+  "textures": {
+    "type": "appliedenergistics2:parts/p2p/power_gteu"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/part/expanded_processing_pattern_terminal_off.json

@@ -0,0 +1,8 @@
+{
+    "parent": "appliedenergistics2:part/display_off",
+    "textures": {
+        "lightsBright": "appliedenergistics2:parts/expanded_processing_pattern_terminal_bright",
+        "lightsMedium": "appliedenergistics2:parts/expanded_processing_pattern_terminal_medium",
+        "lightsDark": "appliedenergistics2:parts/pattern_terminal_dark"
+    }
+}

src/main/resources/assets/appliedenergistics2/models/part/expanded_processing_pattern_terminal_on.json

@@ -0,0 +1,76 @@
+{
+    "ae2_uvl_marker": true,
+    "textures": {
+        "lightsBright": "appliedenergistics2:parts/expanded_processing_pattern_terminal_bright",
+        "lightsMedium": "appliedenergistics2:parts/expanded_processing_pattern_terminal_medium",
+        "lightsDark": "appliedenergistics2:parts/pattern_terminal_dark"
+    },
+    "elements": [
+        {
+            "from": [
+                2,
+                2,
+                0
+            ],
+            "to": [
+                14,
+                14,
+                2
+            ],
+            "faces": {
+                "north": {
+                    "texture": "#lightsBright",
+                    "tintindex": 3,
+                    "uvlightmap": {
+                        "sky": 0.007,
+                        "block": 0.007
+                    }
+                }
+            }
+        },
+        {
+            "from": [
+                2,
+                2,
+                0
+            ],
+            "to": [
+                14,
+                14,
+                2
+            ],
+            "faces": {
+                "north": {
+                    "texture": "#lightsMedium",
+                    "tintindex": 2,
+                    "uvlightmap": {
+                        "sky": 0.007,
+                        "block": 0.007
+                    }
+                }
+            }
+        },
+        {
+            "from": [
+                2,
+                2,
+                0
+            ],
+            "to": [
+                14,
+                14,
+                2
+            ],
+            "faces": {
+                "north": {
+                    "texture": "#lightsDark",
+                    "tintindex": 1,
+                    "uvlightmap": {
+                        "sky": 0.007,
+                        "block": 0.007
+                    }
+                }
+            }
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/models/part/oredict_storage_bus_base.json

@@ -0,0 +1,130 @@
+{
+    "textures": {
+        "sides": "appliedenergistics2:parts/storage_bus_sides",
+        "sidesStatus": "appliedenergistics2:parts/monitor_sides_status",
+        "back": "appliedenergistics2:parts/storage_bus_back",
+        "front": "appliedenergistics2:items/part/oredict_storage_bus",
+        "particle": "appliedenergistics2:parts/storage_bus_back"
+    },
+    "elements": [
+        {
+            "from": [
+                3,
+                3,
+                0
+            ],
+            "to": [
+                13,
+                13,
+                1
+            ],
+            "faces": {
+                "down": {
+                    "texture": "#sides"
+                },
+                "up": {
+                    "texture": "#sides"
+                },
+                "south": {
+                    "texture": "#back"
+                },
+                "east": {
+                    "texture": "#sides"
+                },
+                "north": {
+                    "texture": "#front"
+                },
+                "west": {
+                    "texture": "#sides"
+                }
+            }
+        },
+        {
+            "from": [
+                2,
+                2,
+                1
+            ],
+            "to": [
+                14,
+                14,
+                2
+            ],
+            "faces": {
+                "down": {
+                    "texture": "#sides"
+                },
+                "up": {
+                    "texture": "#sides"
+                },
+                "south": {
+                    "texture": "#back"
+                },
+                "east": {
+                    "texture": "#sides"
+                },
+                "north": {
+                    "texture": "#front"
+                },
+                "west": {
+                    "texture": "#sides"
+                }
+            }
+        },
+        {
+            "from": [
+                5,
+                5,
+                3
+            ],
+            "to": [
+                11,
+                11,
+                4
+            ],
+            "faces": {
+                "down": {
+                    "texture": "#sides"
+                },
+                "up": {
+                    "texture": "#sides"
+                },
+                "south": {
+                    "texture": "#back"
+                },
+                "east": {
+                    "texture": "#sides"
+                },
+                "west": {
+                    "texture": "#sides"
+                }
+            }
+        },
+        {
+            "from": [
+                5,
+                5,
+                2
+            ],
+            "to": [
+                11,
+                11,
+                3
+            ],
+            "faces": {
+                "down": {
+                    "texture": "#sides"
+                },
+                "up": {
+                    "texture": "#sides"
+                },
+                "east": {
+                    "texture": "#sides"
+                },
+                "west": {
+                    "texture": "#sides"
+                }
+            }
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_gteu.json

@@ -0,0 +1,6 @@
+{
+  "parent": "appliedenergistics2:part/p2p/p2p_tunnel_base",
+  "textures": {
+    "type": "appliedenergistics2:parts/p2p/power_gteu"
+  }
+}

src/main/resources/assets/appliedenergistics2/recipes/network/parts/oredict_storage_bus.json

@@ -0,0 +1,36 @@
+{
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "appliedenergistics2:part_exists",
+                    "part": "part.storage_bus"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:interface"
+                }
+            ]
+        }
+    ],
+    "result": {
+        "type": "appliedenergistics2:part",
+        "part": "part.oredict_storage_bus"
+    },
+    "type": "appliedenergistics2:part_shapeless",
+    "ingredients": [
+        {
+            "item": "minecraft:sticky_piston"
+        },
+        {
+            "item": "#appliedenergistics2:interface"
+        },
+        {
+            "item": "minecraft:piston"
+        },
+        {
+            "item": "minecraft:book"
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/recipes/network/parts/oredict_storage_bus_alt.json

@@ -0,0 +1,31 @@
+{
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "appliedenergistics2:part_exists",
+                    "part": "part.storage_bus"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:interface"
+                }
+            ]
+        }
+    ],
+    "result": {
+        "type": "appliedenergistics2:part",
+        "part": "part.oredict_storage_bus"
+    },
+    "type": "appliedenergistics2:part_shapeless",
+    "ingredients": [
+        {
+            "type": "appliedenergistics2:part",
+            "part": "part.storage_bus"
+        },
+        {
+            "item": "minecraft:book"
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminal_expanded_processing.json

@@ -0,0 +1,41 @@
+{
+  "conditions": [
+    {
+      "type": "forge:and",
+      "values": [
+        {
+          "type": "appliedenergistics2:part_exists",
+          "part": "part.pattern_terminal"
+        },
+        {
+          "type": "appliedenergistics2:material_exists",
+          "material": "material.calculation_processor"
+        }
+      ]
+    }
+  ],
+  "result": {
+    "type": "appliedenergistics2:part",
+    "part": "part.expanded_processing_pattern_terminal"
+  },
+  "type": "appliedenergistics2:part_shaped",
+  "pattern": [
+    "c c",
+    "tft",
+    "c c"
+  ],
+  "key": {
+    "f": {
+      "type": "appliedenergistics2:part",
+      "part": "cable_glass.fluix"
+    },
+    "t": {
+      "type": "appliedenergistics2:part",
+      "part": "part.pattern_terminal"
+    },
+    "c": {
+      "type": "appliedenergistics2:part",
+      "part": "material.calculation_processor"
+    }
+  }
+}