item cost review

fix job byte size to 8 per crafting + 1 per item used/stored

CHANGES.md

@@ -15,10 +15,6 @@ Fixes:
  - Exclusive Blocking mode for GTCE ( shapes, molds and configured circuits do not block GTCE machines )
  - Blocking modes default to block on any item in the iventory the entity exposes
  - Fuzzy includes items that report that they're damageable, but report a maxDamage of 0 ( auto-crafting of basic capacitors -> resonant capacitors is now possible ) <- Broken item implementation.
- - Fix CME exceptions on the energy grid
- - Fix AE going offline even with enough power by extracting from the local buffer always last
- - Fix IO-Port copying craftable flag into items
- - Fix NBT of old items not clearing on drives that reached 64 types once
 
 Performance:
 
@@ -28,9 +24,6 @@ Performance:
  - Count items set in interfaces before queuing crafting for them needlessly
  - Backported b7ca98d ( Avoid copying items on simulated item extraction )
  - Cache some level emitters functions
- - Reduced import bus insert simulation to 1 before real insertion (if possible)
- - Backported itemlist re-implementation along with pattern changes to avoid CraftingManager fallback issues
- - Instead of recalculating all the content of the network on every change, track the changes properly and apply them to the cached list of items
 
 QOL:
 
@@ -38,7 +31,7 @@ QOL:
  - Added bar on the interface terminal that search by inputs ( The one on the LEFT, also searchs by interface name )
  - Shortcut to molecular assemblers with free slots on the terminal interface by @Theisyat
  - Toggle button on interface terminal to hide full interfaces
- - JEI "U", "R" and "A" (Usages/Recipes/Bookmark) now work on the Crafting Status GUI. ( the one that shows the total items to craft, and whats missing)
+ - JEI "U""R" and "A" (Usages/Recipes/Bookmark) now work on the Crafting Status GUI. ( the one that shows the total items to craft, and whats missing)
  - Patterns can now be made with items currently showing on JEI. ( This is overriden by Just Enough Energistics. )
  - Added multiplier buttons to processing pattern gui
  - Switched crafting terminal JEI search to fuzzy mode. If the recipe uses a damageable item, AE will try to grab it ( damaged tools )
@@ -46,11 +39,7 @@ QOL:
  - Encoded patterns can be draggred on the interface terminal.
  - Storage Monitor and Conversion Monitor now also ccepts fluids
  - Draggable JEI ghost items (also works on bookmarked items. SHIFT + Click will move the hovered item into the first free target slot)
- - JEI auto switches between crafting and processing patterns
+  -JEI auto switches between crafting and processing patterns
- - GTCE Blocking mode work through phantom itemfaces
- - Shift-clicking blank patterns into the pattern terminal will try to fill the blank pattern slots first
- - Mismached simulated/real item count ( most often due to compacting drawers ) will now tell the player wich item cause the failure when trying to start a craft
- - Added 'pattern expansion' cards that adds an extra row of patterns to interfaces. up to 3 card on an interface. (each card will increase the interface idle power draw by 4 times)
 
 HOTKEYS:
 

build.gradle

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

gradle.properties

@@ -3,8 +3,8 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=trousers_edition
+trousers=omni-fixes-v47i
-trousersversion=v49t
+
 #########################################################
 # Versions                                              #
 #########################################################

gradle/scripts/dependencies.gradle

@@ -31,7 +31,7 @@ repositories {
 
     maven {
         name = "Tesla repo"
-        url "https://maven.mcmoddev.com"
+        url "http://maven.mcmoddev.com"
     }
 
     maven {

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

@@ -58,8 +58,6 @@ public interface IParts
 
 	IItemDefinition storageBus();
 
-	IItemDefinition oreDictStorageBus();
-
 	IItemDefinition importBus();
 
 	IItemDefinition exportBus();
@@ -104,8 +102,6 @@ public interface IParts
 
 	IItemDefinition patternTerminal();
 
-	IItemDefinition expandedProcessingPatternTerminal();
-
 	IItemDefinition craftingTerminal();
 
 	IItemDefinition terminal();

src/api/java/appeng/api/networking/storage/IStackWatcherHost.java

@@ -44,7 +44,10 @@ public interface IStackWatcherHost
 	/**
 	 * Called when a watched item changes amounts.
 	 *
+	 * @param o changed item list
+	 * @param fullStack old stack
 	 * @param diffStack new stack
+	 * @param src action source
 	 * @param chan storage channel
 	 */
 	void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan );

src/api/java/appeng/api/networking/storage/IStorageGrid.java

@@ -51,7 +51,6 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable
 	 * @param input injected items
 	 */
 	void postAlterationOfStoredItems( IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src );
-	void postCraftablesChanges( IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src);
 
 	/**
 	 * Used to add a cell provider to the storage system

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

@@ -121,8 +121,4 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 */
 	boolean equals(ItemStack is);
 
-	ItemStack getCachedItemStack();
-
-	void setCachedItemStack(ItemStack is);
-
 }

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 || gui instanceof GuiExpandedProcessingPatternTerm )
+            if( gui instanceof GuiUpgradeable || gui instanceof GuiPatternTerm )
             {
                 IJEIGhostIngredients ghostGui = ( (IJEIGhostIngredients) gui );
                 for( Target<I> target : targets )

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

@@ -21,7 +21,6 @@ package appeng.client.gui.implementations;
 
 import java.io.IOException;
 
-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -124,12 +123,6 @@ public class GuiCraftAmount extends AEBaseGui
 			this.originalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}
 
-		if( target instanceof PartExpandedProcessingPatternTerminal )
-		{
-			myIcon = parts.expandedProcessingPatternTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY );
-			this.originalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
-
 		if( this.originalGui != null && !myIcon.isEmpty() )
 		{
 			this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) );

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

@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import com.google.common.base.Joiner;
 
 import org.lwjgl.input.Mouse;
@@ -105,11 +104,6 @@ public class GuiCraftConfirm extends AEBaseGui
 		{
 			this.OriginalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}
-
-		if( te instanceof PartExpandedProcessingPatternTerminal )
-		{
-			this.OriginalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
 	}
 
 	boolean isAutoStart()

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

@@ -25,7 +25,6 @@ package appeng.client.gui.implementations;
 
 import java.io.IOException;
 
-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
@@ -96,12 +95,6 @@ public class GuiCraftingStatus extends GuiCraftingCPU
 
 			this.originalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}
-
-		if( target instanceof PartExpandedProcessingPatternTerminal )
-		{
-			myIcon = parts.expandedProcessingPatternTerminal().maybeStack( 1 ).orElse( ItemStack.EMPTY );
-			this.originalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
 	}
 
 	@Override

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

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

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

@@ -1,144 +0,0 @@
-package appeng.client.gui.implementations;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-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.ContainerPartOreDictStorageBus;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.GuiBridge;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketSwitchGuis;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.parts.misc.PartOreDicStorageBus;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import java.io.IOException;
-import java.util.regex.Pattern;
-
-
-public class GuiPartOreDictStorageBus extends AEBaseGui
-{
-    PartOreDicStorageBus part;
-    private GuiTabButton priority;
-    private GuiImgButton partition;
-
-    private static final Pattern ORE_DICTIONARY_FILTER = Pattern.compile( "\\*?[a-zA-Z0-9_|\\\\+(){,}?!=\\-\\[:\\]&^$]*\\*?" );
-    private MEGuiTextField searchFieldInputs;
-
-    public GuiPartOreDictStorageBus( final InventoryPlayer inventoryPlayer, final PartOreDicStorageBus te )
-    {
-        super( new ContainerPartOreDictStorageBus( inventoryPlayer, te ) );
-        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 ) );
-
-        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 );
-        if( btn == this.priority )
-        {
-            NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) );
-        }
-        if( btn == this.partition )
-        {
-            NetworkHandler.instance().sendToServer( new PacketValueConfig( "StorageBus.Action", "Partition" ) );
-            try
-            {
-                NetworkHandler.instance().sendToServer( new PacketValueConfig( "OreDictStorageBus.getRegex", "1" ) );
-            }
-            catch( IOException e )
-            {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @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 )
-        {
-            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(), 8, 36, 4210752 );
-        this.fontRenderer.drawSplitString( "Supports regex. Or use * as a wildcard", 6, 48, 174, 4210752 );
-    }
-
-    @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/render/model/DriveBakedModel.java

@@ -19,9 +19,14 @@
 package appeng.client.render.model;
 
 
-import appeng.block.storage.BlockDrive;
+import java.util.ArrayList;
-import appeng.block.storage.DriveSlotState;
+import java.util.List;
-import appeng.block.storage.DriveSlotsState;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.vecmath.Matrix4f;
+import javax.vecmath.Vector3f;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -32,12 +37,9 @@ import net.minecraft.util.EnumFacing;
 import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
 import net.minecraftforge.common.property.IExtendedBlockState;
 
-import javax.annotation.Nullable;
+import appeng.block.storage.BlockDrive;
-import javax.vecmath.Matrix4f;
+import appeng.block.storage.DriveSlotState;
-import javax.vecmath.Vector3f;
+import appeng.block.storage.DriveSlotsState;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 
 public class DriveBakedModel implements IBakedModel
@@ -55,17 +57,13 @@ public class DriveBakedModel implements IBakedModel
 	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
 	{
 
-		List<BakedQuad> result = new ArrayList<>( this.bakedBase.getQuads( state, side, rand ) );
+		List<BakedQuad> result = new ArrayList<>();
+
+		result.addAll( this.bakedBase.getQuads( state, side, rand ) );
 
 		if( side == null && state instanceof IExtendedBlockState )
 		{
 			IExtendedBlockState extState = (IExtendedBlockState) state;
-
-			if (!extState.getUnlistedNames().contains( BlockDrive.SLOTS_STATE ))
-			{
-				return result;
-			}
-
 			DriveSlotsState slotsState = extState.getValue( BlockDrive.SLOTS_STATE );
 
 			for( int row = 0; row < 5; row++ )

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

@@ -26,7 +26,6 @@ import java.util.concurrent.Future;
 
 import javax.annotation.Nonnull;
 
-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import com.google.common.collect.ImmutableSet;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -346,15 +345,11 @@ public class ContainerCraftConfirm extends AEBaseContainer
 			originalGui = GuiBridge.GUI_PATTERN_TERMINAL;
 		}
 
-		if( ah instanceof PartExpandedProcessingPatternTerminal )
-		{
-			originalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL;
-		}
-
 		if( this.result != null && !this.isSimulation() )
 		{
 			final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
-			final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() );
+			final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true,
+					this.getActionSrc() );
 			this.setAutoStart( false );
 			if( g != null && originalGui != null && this.getOpenContext() != null )
 			{

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

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

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

@@ -1,113 +0,0 @@
-package appeng.container.implementations;
-
-import appeng.api.AEApi;
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.container.AEBaseContainer;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.parts.misc.PartOreDicStorageBus;
-import appeng.util.Platform;
-import appeng.util.helpers.ItemHandlerUtil;
-import appeng.util.item.AEItemStack;
-import appeng.util.item.OreReference;
-import appeng.util.iterators.NullIterator;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-
-public class ContainerPartOreDictStorageBus extends AEBaseContainer
-{
-    private final PartOreDicStorageBus part;
-
-    public ContainerPartOreDictStorageBus( 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()
-    {
-        if( Platform.isClient() )
-        {
-            return;
-        }
-
-        super.detectAndSendChanges();
-    }
-
-    public void partition()
-    {
-        final IMEInventory<IAEItemStack> cellInv = this.part.getInternalHandler();
-
-        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.getOreMatch() ), (EntityPlayerMP) getInventoryPlayer().player );
-        }
-        catch( IOException e )
-        {
-            e.printStackTrace();
-        }
-    }
-}

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

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

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

@@ -52,7 +52,6 @@ public final class ApiParts implements IParts
 	private final IItemDefinition toggleBus;
 	private final IItemDefinition invertedToggleBus;
 	private final IItemDefinition storageBus;
-	private final IItemDefinition oreDictStorageBus;
 	private final IItemDefinition importBus;
 	private final IItemDefinition exportBus;
 	private final IItemDefinition iface;
@@ -78,7 +77,6 @@ public final class ApiParts implements IParts
 	private final IItemDefinition darkMonitor;
 	private final IItemDefinition interfaceTerminal;
 	private final IItemDefinition patternTerminal;
-	private final IItemDefinition expandedProcessingPatternTerminal;
 	private final IItemDefinition craftingTerminal;
 	private final IItemDefinition terminal;
 	private final IItemDefinition storageMonitor;
@@ -114,7 +112,6 @@ public final class ApiParts implements IParts
 		this.toggleBus = new DamagedItemDefinition( "part.toggle_bus", itemPart.createPart( PartType.TOGGLE_BUS ) );
 		this.invertedToggleBus = new DamagedItemDefinition( "part.toggle_bus.inverted", itemPart.createPart( PartType.INVERTED_TOGGLE_BUS ) );
 		this.storageBus = new DamagedItemDefinition( "part.bus.storage", itemPart.createPart( PartType.STORAGE_BUS ) );
-		this.oreDictStorageBus = new DamagedItemDefinition( "part.bus.oredict_storage", itemPart.createPart( PartType.OREDICT_STORAGE_BUS ) );
 		this.importBus = new DamagedItemDefinition( "part.bus.import", itemPart.createPart( PartType.IMPORT_BUS ) );
 		this.exportBus = new DamagedItemDefinition( "part.bus.export", itemPart.createPart( PartType.EXPORT_BUS ) );
 		this.iface = new DamagedItemDefinition( "part.interface", itemPart.createPart( PartType.INTERFACE ) );
@@ -142,7 +139,6 @@ public final class ApiParts implements IParts
 		this.darkMonitor = new DamagedItemDefinition( "part.monitor.dark", itemPart.createPart( PartType.DARK_MONITOR ) );
 		this.interfaceTerminal = new DamagedItemDefinition( "part.terminal.interface", itemPart.createPart( PartType.INTERFACE_TERMINAL ) );
 		this.patternTerminal = new DamagedItemDefinition( "part.terminal.pattern", itemPart.createPart( PartType.PATTERN_TERMINAL ) );
-		this.expandedProcessingPatternTerminal = new DamagedItemDefinition( "part.terminal.expanded_processing_pattern", itemPart.createPart( PartType.EXPANDED_PROCESSING_PATTERN_TERMINAL ) );
 		this.craftingTerminal = new DamagedItemDefinition( "part.terminal.crafting", itemPart.createPart( PartType.CRAFTING_TERMINAL ) );
 		this.terminal = new DamagedItemDefinition( "part.terminal", itemPart.createPart( PartType.TERMINAL ) );
 		this.storageMonitor = new DamagedItemDefinition( "part.monitor.storage", itemPart.createPart( PartType.STORAGE_MONITOR ) );
@@ -249,12 +245,6 @@ public final class ApiParts implements IParts
 		return this.storageBus;
 	}
 
-	@Override
-	public IItemDefinition oreDictStorageBus()
-	{
-		return this.oreDictStorageBus;
-	}
-
 	@Override
 	public IItemDefinition importBus()
 	{
@@ -389,12 +379,6 @@ 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/localization/GuiText.java

@@ -70,7 +70,6 @@ public enum GuiText
 	EnergyDrain,
 
 	StorageBus,
-	OreDictStorageBus,
 	StorageBusFluids,
 	Priority,
 	Security,

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

@@ -31,10 +31,8 @@ public enum WailaText
 	DeviceMissingChannel,
 
 	P2PUnlinked,
-	P2P_INPUT_ONE_OUTPUT,
+	P2PInputOneOutput,
-	P2P_INPUT_MANY_OUTPUTS,
+	P2PInputManyOutputs,
-	P2P_OUTPUT_ONE_INPUT,
-	P2P_OUTPUT_MANY_INPUTS,
 	P2POutput,
 
 	Locked,

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

@@ -21,9 +21,6 @@ package appeng.core.sync;
 
 import java.lang.reflect.Constructor;
 
-import appeng.container.implementations.*;
-import appeng.parts.misc.PartOreDicStorageBus;
-import appeng.parts.reporting.PartExpandedProcessingPatternTerminal;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -56,6 +53,39 @@ import appeng.client.gui.GuiNull;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerNull;
 import appeng.container.ContainerOpenContext;
+import appeng.container.implementations.ContainerCellWorkbench;
+import appeng.container.implementations.ContainerChest;
+import appeng.container.implementations.ContainerCondenser;
+import appeng.container.implementations.ContainerCraftAmount;
+import appeng.container.implementations.ContainerCraftConfirm;
+import appeng.container.implementations.ContainerCraftingCPU;
+import appeng.container.implementations.ContainerCraftingStatus;
+import appeng.container.implementations.ContainerCraftingTerm;
+import appeng.container.implementations.ContainerDrive;
+import appeng.container.implementations.ContainerFormationPlane;
+import appeng.container.implementations.ContainerGrinder;
+import appeng.container.implementations.ContainerIOPort;
+import appeng.container.implementations.ContainerInscriber;
+import appeng.container.implementations.ContainerInterface;
+import appeng.container.implementations.ContainerInterfaceTerminal;
+import appeng.container.implementations.ContainerLevelEmitter;
+import appeng.container.implementations.ContainerMAC;
+import appeng.container.implementations.ContainerMEMonitorable;
+import appeng.container.implementations.ContainerMEPortableCell;
+import appeng.container.implementations.ContainerNetworkStatus;
+import appeng.container.implementations.ContainerNetworkTool;
+import appeng.container.implementations.ContainerPatternTerm;
+import appeng.container.implementations.ContainerPriority;
+import appeng.container.implementations.ContainerQNB;
+import appeng.container.implementations.ContainerQuartzKnife;
+import appeng.container.implementations.ContainerSecurityStation;
+import appeng.container.implementations.ContainerSkyChest;
+import appeng.container.implementations.ContainerSpatialIOPort;
+import appeng.container.implementations.ContainerStorageBus;
+import appeng.container.implementations.ContainerUpgradeable;
+import appeng.container.implementations.ContainerVibrationChamber;
+import appeng.container.implementations.ContainerWireless;
+import appeng.container.implementations.ContainerWirelessTerm;
 import appeng.fluids.container.ContainerFluidFormationPlane;
 import appeng.fluids.container.ContainerFluidIO;
 import appeng.fluids.container.ContainerFluidInterface;
@@ -141,8 +171,6 @@ public enum GuiBridge implements IGuiHandler
 
 	GUI_STORAGEBUS( ContainerStorageBus.class, PartStorageBus.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
 
-	GUI_OREDICTSTORAGEBUS( ContainerPartOreDictStorageBus.class, PartOreDicStorageBus.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
-
 	GUI_STORAGEBUS_FLUID( ContainerFluidStorageBus.class, PartFluidStorageBus.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
 
 	GUI_FORMATION_PLANE( ContainerFormationPlane.class, PartFormationPlane.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
@@ -157,8 +185,6 @@ public enum GuiBridge implements IGuiHandler
 
 	GUI_PATTERN_TERMINAL( ContainerPatternTerm.class, PartPatternTerminal.class, GuiHostType.WORLD, SecurityPermissions.CRAFT ),
 
-	GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL( ContainerExpandedProcessingPatternTerm.class, PartExpandedProcessingPatternTerminal.class, GuiHostType.WORLD, SecurityPermissions.CRAFT ),
-
 	GUI_FLUID_TERMINAL( ContainerFluidTerminal.class, ITerminalHost.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
 
 	// extends (Container/Gui) + Bus

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

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

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

@@ -24,8 +24,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import appeng.client.gui.implementations.GuiPartOreDictStorageBus;
-import appeng.container.implementations.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -42,6 +40,17 @@ import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;
 import appeng.client.gui.implementations.GuiCraftingCPU;
 import appeng.container.AEBaseContainer;
+import appeng.container.implementations.ContainerCellWorkbench;
+import appeng.container.implementations.ContainerCraftConfirm;
+import appeng.container.implementations.ContainerCraftingCPU;
+import appeng.container.implementations.ContainerCraftingStatus;
+import appeng.container.implementations.ContainerLevelEmitter;
+import appeng.container.implementations.ContainerNetworkTool;
+import appeng.container.implementations.ContainerPatternTerm;
+import appeng.container.implementations.ContainerPriority;
+import appeng.container.implementations.ContainerQuartzKnife;
+import appeng.container.implementations.ContainerSecurityStation;
+import appeng.container.implementations.ContainerStorageBus;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.fluids.container.ContainerFluidLevelEmitter;
@@ -157,109 +166,58 @@ public class PacketValueConfig extends AppEngPacket
 			final ContainerFluidLevelEmitter lvc = (ContainerFluidLevelEmitter) c;
 			lvc.setLevel( Long.parseLong( this.Value ), player );
 		}
-		else if( this.Name.startsWith( "PatternTerminal." ) )
+		else if( this.Name.startsWith( "PatternTerminal." ) && c instanceof ContainerPatternTerm )
 		{
-			if( c instanceof ContainerPatternTerm )
+			final ContainerPatternTerm cpt = (ContainerPatternTerm) c;
+			if( this.Name.equals( "PatternTerminal.CraftMode" ) )
 			{
-				final ContainerPatternTerm cpt = (ContainerPatternTerm) c;
+				cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) );
-				if( this.Name.equals( "PatternTerminal.CraftMode" ) )
+			}
-				{
+			else if( this.Name.equals( "PatternTerminal.Encode" ) )
-					cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) );
+			{
+				if (this.Value.equals( "2" )) {
+					cpt.encodeAndMoveToInventory();
 				}
-				else if( this.Name.equals( "PatternTerminal.Encode" ) )
+				else
 				{
-					if( this.Value.equals( "2" ) )
+					cpt.encode();
-					{
-						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( c instanceof ContainerExpandedProcessingPatternTerm )
+			else if( this.Name.equals( "PatternTerminal.Clear" ) )
 			{
-				final ContainerExpandedProcessingPatternTerm cept = (ContainerExpandedProcessingPatternTerm) c;
+				cpt.clear();
-				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" ) )
-				}
+			{
-				else if( this.Name.equals( "PatternTerminal.Clear" ) )
+				cpt.divide(2);
-				{
+			}
-					cept.clear();
+			else if( this.Name.equals( "PatternTerminal.DivideByThree" ) )
-				}
+			{
-				else if( this.Name.equals( "PatternTerminal.MultiplyByTwo" ) )
+				cpt.divide(3);
-				{
+			}
-					cept.multiply( 2 );
+			else if( this.Name.equals( "PatternTerminal.IncreaseByOne" ) )
-				}
+			{
-				else if( this.Name.equals( "PatternTerminal.MultiplyByThree" ) )
+				cpt.increase(1);
-				{
+			}
-					cept.multiply( 3 );
+			else if( this.Name.equals( "PatternTerminal.DecreaseByOne" ) )
-				}
+			{
-				else if( this.Name.equals( "PatternTerminal.DivideByTwo" ) )
+				cpt.decrease(1);
-				{
+			}
-					cept.divide( 2 );
+			else if( this.Name.equals( "PatternTerminal.MaximizeCount" ) )
-				}
+			{
-				else if( this.Name.equals( "PatternTerminal.DivideByThree" ) )
+				cpt.maximizeCount();
-				{
+			}
-					cept.divide( 3 );
+			else if( this.Name.equals( "PatternTerminal.Substitute" ) )
-				}
+			{
-				else if( this.Name.equals( "PatternTerminal.IncreaseByOne" ) )
+				cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) );
-				{
-					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." ) )
@@ -276,10 +234,6 @@ public class PacketValueConfig extends AppEngPacket
 					{
 						( (ContainerFluidStorageBus) c ).partition();
 					}
-					else if( c instanceof ContainerPartOreDictStorageBus )
-					{
-						( (ContainerPartOreDictStorageBus) c ).partition();
-					}
 				}
 				else if( this.Value.equals( "Clear" ) )
 				{
@@ -294,20 +248,6 @@ public class PacketValueConfig extends AppEngPacket
 				}
 			}
 		}
-		else if( this.Name.startsWith( "OreDictStorageBus" ) )
-		{
-			if( c instanceof ContainerPartOreDictStorageBus )
-			{
-				if( this.Name.equals( "OreDictStorageBus.save" ) )
-				{
-					( (ContainerPartOreDictStorageBus) c ).saveOreMatch( this.Value );
-				}
-				if( this.Name.equals( "OreDictStorageBus.getRegex" ) )
-				{
-					( (ContainerPartOreDictStorageBus) c ).sendRegex();
-				}
-			}
-		}
 		else if( this.Name.startsWith( "CellWorkbench." ) && c instanceof ContainerCellWorkbench )
 		{
 			final ContainerCellWorkbench ccw = (ContainerCellWorkbench) c;
@@ -384,14 +324,6 @@ public class PacketValueConfig extends AppEngPacket
 				( (GuiCraftingCPU) gs ).clearItems();
 			}
 		}
-		else if( this.Name.equals( "OreDictStorageBus.sendRegex" ) )
-		{
-			final GuiScreen gs = Minecraft.getMinecraft().currentScreen;
-			if( gs instanceof GuiPartOreDictStorageBus )
-			{
-				( (GuiPartOreDictStorageBus) gs ).fillRegex( this.Value );
-			}
-		}
 		else if( c instanceof IConfigurableObject )
 		{
 			final IConfigManager cm = ( (IConfigurableObject) c ).getConfigManager();

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

@@ -325,9 +325,25 @@ public class CraftingJob implements Runnable, ICraftingJob
 			{
 				this.watch.reset();
 				this.watch.start();
+				this.running = true;
+
+				AELog.craftingDebug( "main thread is now going to sleep" );
+
 				this.monitor.notify();
+
+				while ( this.running )
+				{
+					try
+					{
+						this.monitor.wait();
+					}
+					catch( final InterruptedException ignored )
+					{
+					}
+				}
+
+				AELog.craftingDebug( "main thread is now active" );
 			}
-			this.running = true;
 		}
 
 		return true;

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

@@ -91,10 +91,12 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 	private int isWorking = -1;
 	private int priority;
 
-	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance()
-	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
+			.storage()
-	private boolean resetConfigCache = true;
+			.getStorageChannel( IItemStorageChannel.class ) );
-	private IMEMonitor<IAEFluidStack> configCachedHandler;
+	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
+			.storage()
+			.getStorageChannel( IFluidStorageChannel.class ) );
 
 	public DualityFluidInterface( final AENetworkProxy networkProxy, final IFluidInterfaceHost ih )
 	{
@@ -117,7 +119,15 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 
 	public IUpgradeableHost getHost()
 	{
-		return this.iHost;
+		if( this.iHost instanceof IUpgradeableHost )
+		{
+			return this.iHost;
+		}
+		if( this.iHost instanceof IUpgradeableHost )
+		{
+			return this.iHost;
+		}
+		return null;
 	}
 
 	@Override
@@ -136,12 +146,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
+				return (IMEMonitor<T>) new InterfaceInventory( this );
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
 			}
 
 			return (IMEMonitor<T>) this.fluids;
@@ -378,7 +383,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 				{
 					changed = true;
 				}
-				else if( this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ).getStorageList().findPrecise( work ) != null )
+				else
 				{
 					final IAEFluidStack acquired = Platform.poweredExtraction( src, dest, work, this.interfaceRequestSource );
 					if( acquired != null )
@@ -445,13 +450,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 
 		if( inventory == this.config )
 		{
-			boolean cfg = hasConfig();
 			this.readConfig();
-			if( cfg != hasConfig )
-			{
-				resetConfigCache = true;
-				this.notifyNeighbors();
-			}
 		}
 		else if( inventory == this.tanks )
 		{
@@ -556,6 +555,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		InterfaceInventory( final DualityFluidInterface tileInterface )
 		{
 			super( tileInterface.tanks );
+			this.setActionSource( new MachineSource( tileInterface.iHost ) );
 		}
 
 		@Override

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

@@ -19,15 +19,16 @@
 package appeng.fluids.parts;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
-import appeng.api.config.AccessRestriction;
 import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
-import appeng.api.storage.data.IAEItemStack;
+import appeng.parts.misc.PartStorageBus;
-import appeng.me.GridAccessException;
-import appeng.util.inv.ItemSlot;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -44,6 +45,7 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.fluids.util.AEFluidStack;
+import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 
@@ -63,20 +65,17 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 	private final IGridProxyable proxyable;
 	private final FluidHandlerAdapter.InventoryCache cache;
 	private StorageFilter mode;
-	private AccessRestriction access;
 
 	FluidHandlerAdapter( IFluidHandler fluidHandler, IGridProxyable proxy )
 	{
 		this.fluidHandler = fluidHandler;
 		this.proxyable = proxy;
-		if( this.proxyable instanceof PartFluidStorageBus )
+		if( this.proxyable instanceof PartStorageBus )
 		{
-			PartFluidStorageBus partFluidStorageBus = (PartFluidStorageBus) this.proxyable;
+			PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
-			this.mode = ( (StorageFilter) partFluidStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
+			this.mode = ( (StorageFilter) partStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
-			this.access = ( (AccessRestriction) partFluidStorageBus.getConfigManager().getSetting( Settings.ACCESS ) );
 		}
-		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler, this.mode );
+		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler, this.mode);
-		this.cache.update();
 	}
 
 	@Override
@@ -95,14 +94,11 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 
 		if( type == Actionable.MODULATE )
 		{
-			IAEFluidStack added = input.copy().setStackSize( input.getStackSize() - remaining );
-			this.cache.currentlyCached.add( added );
-			this.postDifference( Collections.singletonList( added ) );
 			try
 			{
 				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
 			}
-			catch( GridAccessException ex )
+			catch( GridAccessException ignore )
 			{
 				// meh
 			}
@@ -127,32 +123,25 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 			return null;
 		}
 
-		IAEFluidStack gatheredAEFluidstack = AEFluidStack.fromFluidStack( gathered );
 		if( mode == Actionable.MODULATE )
 		{
-			IAEFluidStack cachedStack = this.cache.currentlyCached.findPrecise( request );
-			if( cachedStack != null )
-			{
-				cachedStack.decStackSize( gatheredAEFluidstack.getStackSize() );
-				this.postDifference( Collections.singletonList( gatheredAEFluidstack.copy().setStackSize( -gatheredAEFluidstack.getStackSize() ) ) );
-			}
 			try
 			{
 				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
 			}
-			catch( GridAccessException ex )
+			catch( GridAccessException ignore )
 			{
 				// meh
 			}
 		}
-		return gatheredAEFluidstack;
+		return AEFluidStack.fromFluidStack( gathered );
 	}
 
 	@Override
 	public TickRateModulation onTick()
 	{
 		List<IAEFluidStack> changes = this.cache.update();
-		if( !changes.isEmpty() && access.hasPermission( AccessRestriction.READ ) )
+		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
 			return TickRateModulation.URGENT;
@@ -213,9 +202,9 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 
 	private static class InventoryCache
 	{
+		private IAEFluidStack[] cachedAeStacks = new IAEFluidStack[0];
 		private final IFluidHandler fluidHandler;
 		private final StorageFilter mode;
-		IItemList<IAEFluidStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
 
 		public InventoryCache( IFluidHandler fluidHandler, StorageFilter mode )
 		{
@@ -227,46 +216,102 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 		{
 			final List<IAEFluidStack> changes = new ArrayList<>();
 			final IFluidTankProperties[] tankProperties = this.fluidHandler.getTankProperties();
+			final int slots = tankProperties.length;
 
-			IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+			// Make room for new slots
-
+			if( slots > this.cachedAeStacks.length )
-			for( IFluidTankProperties tankProperty : tankProperties )
 			{
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && this.fluidHandler.drain( 1, false ) == null )
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
+			}
+
+			for( int slot = 0; slot < slots; slot++ )
+			{
+				// Save the old stuff
+				final IAEFluidStack oldAEFS = this.cachedAeStacks[slot];
+				FluidStack newFS = tankProperties[slot].getContents();
+				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && newFS != null )
 				{
-					continue;
+					if( this.fluidHandler.drain( 1, false ) == null )
+					{
+						newFS = null;
+					}
 				}
-				currentlyOnStorage.add( AEFluidStack.fromFluidStack( tankProperty.getContents() ) );
+				this.handlePossibleSlotChanges( slot, oldAEFS, newFS, changes );
 			}
 
-			for ( final IAEFluidStack is : currentlyCached )
+			// Handle cases where the number of slots actually is lower now than before
+			if( slots < this.cachedAeStacks.length )
 			{
-				is.setStackSize( -is.getStackSize() );
+				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
-			}
-
-			for ( final IAEFluidStack is : currentlyOnStorage )
-			{
-				currentlyCached.add( is );
-			}
-
-			for ( final IAEFluidStack is : currentlyCached )
-			{
-				if( is.getStackSize() != 0 )
 				{
-					changes.add( is );
+					final IAEFluidStack aeStack = this.cachedAeStacks[slot];
+
+					if( aeStack != null )
+					{
+						final IAEFluidStack a = aeStack.copy();
+						a.setStackSize( -a.getStackSize() );
+						changes.add( a );
+					}
 				}
+
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
-
-			currentlyCached = currentlyOnStorage;
-
 			return changes;
 		}
 
 		public IItemList<IAEFluidStack> getAvailableItems( IItemList<IAEFluidStack> out )
 		{
-			currentlyCached.iterator().forEachRemaining( out::add );
+			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
 			return out;
 		}
 
+		private void handlePossibleSlotChanges( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			if( oldAeFS != null && oldAeFS.getFluidStack().isFluidEqual( newFS ) )
+			{
+				this.handleStackSizeChanged( slot, oldAeFS, newFS, changes );
+			}
+			else
+			{
+				this.handleFluidChanged( slot, oldAeFS, newFS, changes );
+			}
+		}
+
+		private void handleStackSizeChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			// Still the same fluid, but amount might have changed
+			final long diff = newFS.amount - oldAeFS.getStackSize();
+
+			if( diff != 0 )
+			{
+				final IAEFluidStack stack = oldAeFS.copy();
+				stack.setStackSize( newFS.amount );
+
+				this.cachedAeStacks[slot] = stack;
+
+				final IAEFluidStack a = stack.copy();
+				a.setStackSize( diff );
+				changes.add( a );
+			}
+		}
+
+		private void handleFluidChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			// Completely different fluid
+			this.cachedAeStacks[slot] = AEFluidStack.fromFluidStack( newFS );
+
+			// If we had a stack previously in this slot, notify the network about its disappearance
+			if( oldAeFS != null )
+			{
+				oldAeFS.setStackSize( -oldAeFS.getStackSize() );
+				changes.add( oldAeFS );
+			}
+
+			// Notify the network about the new stack. Note that this is null if newFS was null
+			if( this.cachedAeStacks[slot] != null )
+			{
+				changes.add( this.cachedAeStacks[slot] );
+			}
+		}
 	}
 }

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

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

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

@@ -90,16 +90,14 @@ public class PartFluidInterface extends PartBasicState implements IGridTickable,
 		return this.duality;
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void stateChange( final MENetworkChannelsChanged c )
 	{
 		this.duality.notifyNeighbors();
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange c )
+	public void stateChange( final MENetworkPowerStatusChange c )
 	{
 		this.duality.notifyNeighbors();
 	}

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

@@ -4,9 +4,7 @@ package appeng.fluids.parts;
 
 import java.util.Random;
 
-import appeng.api.storage.data.IItemList;
 import appeng.fluids.helper.IConfigurableFluidInventory;
-import appeng.me.cache.NetworkMonitor;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -36,6 +34,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IItemList;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
@@ -128,25 +127,15 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		this.configureWatchers();
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange powerEvent )
+	public void channelChanged( final MENetworkChannelsChanged c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void powerChanged( final MENetworkPowerStatusChange c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}
 
@@ -258,9 +247,10 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 
 		if( myStack == null )
 		{
-			if( monitor instanceof NetworkMonitor )
+			this.lastReportedValue = 0;
+			for( final IAEFluidStack st : monitor.getStorageList() )
 			{
-				this.lastReportedValue = ( (NetworkMonitor<IAEFluidStack>) monitor ).getGridCurrentCount();
+				this.lastReportedValue += st.getStackSize();
 			}
 		}
 		else

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

@@ -23,6 +23,7 @@ import java.util.*;
 
 import javax.annotation.Nullable;
 
+import appeng.api.definitions.IItemDefinition;
 import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
 import appeng.util.*;
 import appeng.util.inv.*;
@@ -34,6 +35,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -140,17 +142,15 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private int isWorking = -1;
 	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 EnumMap<EnumFacing,List<ItemStack>> waitingToSendFacing = new EnumMap<>(EnumFacing.class);
 	private GTCEInventoryAdaptor GTad;
-	private boolean resetConfigCache = true;
-	private IMEMonitor<IAEItemStack> configCachedHandler;
 
 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
 	{
 		this.gridProxy = networkProxy;
 		this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
 
-		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4 );
+		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4);
 		this.cm.registerSetting( Settings.BLOCK, YesNo.NO );
 		this.cm.registerSetting( Settings.INTERFACE_TERMINAL, YesNo.YES );
 
@@ -178,15 +178,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			return;
 		}
-		if( inv == this.config && ( !removed.isEmpty() || !added.isEmpty() ) )
+		if( inv == this.config )
 		{
-			boolean cfg = hasConfig();
 			this.readConfig();
-			if( cfg != hasConfig )
-			{
-				resetConfigCache = true;
-				this.notifyNeighbors();
-			}
 		}
 		else if( inv == this.patterns && ( !removed.isEmpty() || !added.isEmpty() ) )
 		{
@@ -857,27 +851,20 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					throw new GridAccessException();
 				}
 
-				IAEItemStack storedStack = this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findPrecise( itemStack );
+				final IAEItemStack acquired = Platform.poweredExtraction( src, this.destination, itemStack, this.interfaceRequestSource );
-				if( storedStack != null )
+				if( acquired != null )
 				{
-					if( storedStack.getStackSize() > 0 )
+					changed = true;
+					final ItemStack issue = adaptor.addItems( acquired.createItemStack() );
+					if( !issue.isEmpty() )
 					{
-						final IAEItemStack acquired = Platform.poweredExtraction( src, this.destination, itemStack, this.interfaceRequestSource );
+						throw new IllegalStateException( "bad attempt at managing inventory. ( addItems )" );
-						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
+				{
+					changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
+				}
 			}
 			else if( itemStack.getStackSize() < 0 )
 			{
@@ -988,12 +975,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
+				return (IMEMonitor<T>) new InterfaceInventory( this );
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
 			}
 
 			return (IMEMonitor<T>) this.items;
@@ -1601,6 +1583,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		public InterfaceInventory( final DualityInterface tileInterface )
 		{
 			super( new AdaptorItemHandler( tileInterface.storage ) );
+			this.setActionSource( new MachineSource( DualityInterface.this.iHost ) );
 		}
 
 		@Override

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

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

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

@@ -26,7 +26,6 @@ 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;
 
@@ -91,13 +90,16 @@ public class JEIPlugin implements IModPlugin
 		this.registerDescriptions( definitions, registry );
 
 		// Allow recipe transfer from JEI to crafting and pattern terminal
-		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ), VanillaRecipeCategoryUid.CRAFTING );
+		registry.getRecipeTransferRegistry()
-		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ), Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
+				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ),
-		registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerExpandedProcessingPatternTerm.class ), Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
+						VanillaRecipeCategoryUid.CRAFTING );
+		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/integration/modules/theoneprobe/TheOneProbeText.java

@@ -35,8 +35,6 @@ public enum TheOneProbeText
 	P2P_UNLINKED,
 	P2P_INPUT_ONE_OUTPUT,
 	P2P_INPUT_MANY_OUTPUTS,
-	P2P_OUTPUT_ONE_INPUT,
-	P2P_OUTPUT_MANY_INPUTS,
 	P2P_OUTPUT,
 	P2P_FREQUENCY,
 

src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java

@@ -57,11 +57,11 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 
 			// The default state
 			int state = STATE_UNLINKED;
-			int outputCount = getOutputCount( tunnel );
+			int outputCount = 0;
-			int inputCount = getInputCount( tunnel );
 
 			if( !tunnel.isOutput() )
 			{
+				outputCount = getOutputCount( tunnel );
 				if( outputCount > 0 )
 				{
 					// Only set it to INPUT if we know there are any outputs
@@ -70,7 +70,8 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 			}
 			else
 			{
-				if( inputCount > 0 )
+				final PartP2PTunnel input = tunnel.getInput();
+				if( input != null )
 				{
 					state = STATE_OUTPUT;
 				}
@@ -82,7 +83,7 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 					probeInfo.text( TheOneProbeText.P2P_UNLINKED.getLocal() );
 					break;
 				case STATE_OUTPUT:
-					probeInfo.text( getInputText( inputCount ) );
+					probeInfo.text( TheOneProbeText.P2P_OUTPUT.getLocal() );
 					break;
 				case STATE_INPUT:
 					probeInfo.text( getOutputText( outputCount ) );
@@ -109,19 +110,6 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 		}
 	}
 
-	private static int getInputCount( PartP2PTunnel tunnel )
-	{
-		try
-		{
-			return Iterators.size( tunnel.getInputs().iterator() );
-		}
-		catch( GridAccessException e )
-		{
-			// Well... unknown size it is!
-			return 0;
-		}
-	}
-
 	private static String getOutputText( int outputs )
 	{
 		if( outputs <= 1 )
@@ -134,16 +122,4 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 		}
 	}
 
-	private static String getInputText( int inputs )
-	{
-		if( inputs <= 1 )
-		{
-			return TheOneProbeText.P2P_OUTPUT_ONE_INPUT.getLocal();
-		}
-		else
-		{
-			return String.format( TheOneProbeText.P2P_OUTPUT_MANY_INPUTS.getLocal(), inputs );
-		}
-	}
-
 }

src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java

@@ -21,7 +21,6 @@ package appeng.integration.modules.waila.part;
 
 import java.util.List;
 
-import appeng.integration.modules.theoneprobe.TheOneProbeText;
 import com.google.common.collect.Iterators;
 
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -118,11 +117,11 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider
 
 			// The default state
 			int state = STATE_UNLINKED;
-			int outputCount = getOutputCount( tunnel );
+			int outputCount = 0;
-			int inputCount = getInputCount( tunnel );
 
 			if( !tunnel.isOutput() )
 			{
+				outputCount = getOutputCount( tunnel );
 				if( outputCount > 0 )
 				{
 					// Only set it to INPUT if we know there are any outputs
@@ -131,7 +130,8 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider
 			}
 			else
 			{
-				if( inputCount > 0 )
+				PartP2PTunnel input = tunnel.getInput();
+				if( input != null )
 				{
 					state = STATE_OUTPUT;
 				}
@@ -160,40 +160,15 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider
 		}
 	}
 
-	private static int getInputCount( PartP2PTunnel tunnel )
-	{
-		try
-		{
-			return Iterators.size( tunnel.getInputs().iterator() );
-		}
-		catch( GridAccessException e )
-		{
-			// Well... unknown size it is!
-			return 0;
-		}
-	}
-
 	private static String getOutputText( int outputs )
 	{
 		if( outputs <= 1 )
 		{
-			return WailaText.P2P_INPUT_ONE_OUTPUT.getLocal();
+			return WailaText.P2PInputOneOutput.getLocal();
 		}
 		else
 		{
-			return String.format( WailaText.P2P_INPUT_MANY_OUTPUTS.getLocal(), outputs );
+			return String.format( WailaText.P2PInputManyOutputs.getLocal(), outputs );
-		}
-	}
-
-	private static String getInputText( int inputs )
-	{
-		if( inputs <= 1 )
-		{
-			return WailaText.P2P_OUTPUT_ONE_INPUT.getLocal();
-		}
-		else
-		{
-			return String.format( WailaText.P2P_OUTPUT_MANY_INPUTS.getLocal(), inputs );
 		}
 	}
 

src/main/java/appeng/items/contents/PortableCellViewer.java

@@ -19,7 +19,6 @@
 package appeng.items.contents;
 
 
-import appeng.api.networking.security.IActionSource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -43,8 +42,6 @@ import appeng.me.helpers.MEMonitorHandler;
 import appeng.util.ConfigManager;
 import appeng.util.Platform;
 
-import java.util.Collections;
-
 
 public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implements IPortableCell, IInventorySlotAware
 {
@@ -86,34 +83,6 @@ public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implement
 		return usePowerMultiplier.divide( this.ips.extractAEPower( this.target, amt, Actionable.MODULATE ) );
 	}
 
-	@Override
-	public IAEItemStack injectItems( IAEItemStack input, Actionable mode, IActionSource src )
-	{
-		final long size = input.getStackSize();
-
-		final IAEItemStack injected = super.injectItems( input, mode, src );
-
-		if( mode == Actionable.MODULATE && ( injected == null || injected.getStackSize() != size ) )
-		{
-			this.notifyListenersOfChange( Collections.singletonList( input.copy().setStackSize( input.getStackSize() - ( injected == null ? 0 : injected.getStackSize() ) ) ), null);
-		}
-
-		return injected;
-	}
-
-	@Override
-	public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
-	{
-		final IAEItemStack extractable = super.extractItems( request, mode, src );
-
-		if( mode == Actionable.MODULATE && extractable != null )
-		{
-			this.notifyListenersOfChange( Collections.singletonList( request.copy().setStackSize( -extractable.getStackSize() ) ), null );
-		}
-
-		return extractable;
-	}
-
 	@Override
 	public <T extends IAEStack<T>> IMEMonitor<T> getInventory( IStorageChannel<T> channel )
 	{

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

@@ -28,8 +28,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import appeng.parts.misc.*;
-import appeng.parts.reporting.*;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -59,6 +57,11 @@ 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;
@@ -72,6 +75,15 @@ 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;
 
 
@@ -181,13 +193,14 @@ 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.noneOf( IntegrationType.class ), PartSemiDarkPanel.class, "itemIlluminatedPanel" ),
+	SEMI_DARK_MONITOR( 180, "semi_dark_monitor", EnumSet.of( AEFeature.PANELS ), EnumSet
+			.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.noneOf( IntegrationType.class ), PartFluidStorageBus.class ),
+	FLUID_STORAGE_BUS( 221, "fluid_storage_bus", EnumSet.of( AEFeature.FLUID_STORAGE_BUS ), EnumSet
-	OREDICT_STORAGE_BUS( 222, "oredict_storage_bus", EnumSet.of( AEFeature.STORAGE_BUS ), EnumSet.noneOf( IntegrationType.class ), PartOreDicStorageBus.class ),
+			.noneOf( IntegrationType.class ), PartFluidStorageBus.class ),
 
 	IMPORT_BUS( 240, "import_bus", EnumSet.of( AEFeature.IMPORT_BUS ), EnumSet.noneOf( IntegrationType.class ), PartImportBus.class ),
 
@@ -198,83 +211,94 @@ 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.noneOf( IntegrationType.class ), PartFluidLevelEmitter.class ),
+	FLUID_LEVEL_EMITTER( 281, "fluid_level_emitter", EnumSet.of( AEFeature.FLUID_LEVEL_EMITTER ), EnumSet
+			.noneOf( IntegrationType.class ), PartFluidLevelEmitter.class ),
 
-	ANNIHILATION_PLANE( 300, "annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ),
+	ANNIHILATION_PLANE( 300, "annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE ), EnumSet
+			.noneOf( IntegrationType.class ), PartAnnihilationPlane.class ),
 
-	IDENTITY_ANNIHILATION_PLANE( 301, "identity_annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ),
+	IDENTITY_ANNIHILATION_PLANE( 301, "identity_annihilation_plane", EnumSet.of( AEFeature.ANNIHILATION_PLANE, AEFeature.IDENTITY_ANNIHILATION_PLANE ), EnumSet
+			.noneOf( IntegrationType.class ), PartIdentityAnnihilationPlane.class ),
 
-	FLUID_ANNIHILATION_PLANE( 302, "fluid_annihilation_plane", EnumSet.of( AEFeature.FLUID_ANNIHILATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFluidAnnihilationPlane.class ),
+	FLUID_ANNIHILATION_PLANE( 302, "fluid_annihilation_plane", EnumSet.of( AEFeature.FLUID_ANNIHILATION_PLANE ), EnumSet
+			.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.noneOf( IntegrationType.class ), PartFluidFormationPlane.class ),
+	FLUID_FORMATION_PLANE( 321, "fluid_formation_plane", EnumSet.of( AEFeature.FLUID_FORMATION_PLANE ), EnumSet
+			.noneOf( IntegrationType.class ), PartFluidFormationPlane.class ),
 
 	PATTERN_TERMINAL( 340, "pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ),
 
-	EXPANDED_PROCESSING_PATTERN_TERMINAL( 341, "expanded_processing_pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartExpandedProcessingPatternTerminal.class ),
+	CRAFTING_TERMINAL( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet
-
+			.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.noneOf( IntegrationType.class ), PartConversionMonitor.class ),
+	CONVERSION_MONITOR( 420, "conversion_monitor", EnumSet.of( AEFeature.PART_CONVERSION_MONITOR ), EnumSet
+			.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.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel )
+	P2P_TUNNEL_ME( 460, "p2p_tunnel_me", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ME ), EnumSet
-			{
+			.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel )
-				@Override
+	{
-				String getUnlocalizedName()
+		@Override
-				{
+		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.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel )
+	P2P_TUNNEL_REDSTONE( 461, "p2p_tunnel_redstone", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_REDSTONE ), EnumSet
-			{
+			.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel )
-				@Override
+	{
-				String getUnlocalizedName()
+		@Override
-				{
+		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.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel )
+	P2P_TUNNEL_ITEMS( 462, "p2p_tunnel_items", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_ITEMS ), EnumSet
-			{
+			.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel )
-				@Override
+	{
-				String getUnlocalizedName()
+		@Override
-				{
+		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.noneOf( IntegrationType.class ), PartP2PFluids.class, GuiText.FluidTunnel )
+	P2P_TUNNEL_FLUIDS( 463, "p2p_tunnel_fluids", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FLUIDS ), EnumSet
-			{
+			.noneOf( IntegrationType.class ), PartP2PFluids.class, GuiText.FluidTunnel )
-				@Override
+	{
-				String getUnlocalizedName()
+		@Override
-				{
+		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.of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel )
+	P2P_TUNNEL_IC2( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet
-			{
+			.of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel )
-				@Override
+	{
-				String getUnlocalizedName()
+		@Override
-				{
+		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.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel )
+	P2P_TUNNEL_LIGHT( 467, "p2p_tunnel_light", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_LIGHT ), EnumSet
-			{
+			.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel )
-				@Override
+	{
-				String getUnlocalizedName()
+		@Override
-				{
+		String getUnlocalizedName()
+		{
 			return "p2p_tunnel";
 		}
 	},

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

@@ -59,7 +59,6 @@ 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
@@ -334,11 +333,7 @@ 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" );
@@ -350,9 +345,7 @@ public class GridNode implements IGridNode, IPathItem
 		}
 		else
 		{
-			this.playerID = -1; // Unknown owner
+			throw new IllegalStateException( "Loading data after part of a grid, this is invalid." );
-			setLastSecurityKey( -1 );
-			setGridStorage( null );
 		}
 	}
 

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

@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -41,7 +42,10 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 
-import it.unimi.dsi.fastutil.objects.*;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
+import it.unimi.dsi.fastutil.objects.ObjectSet;
 import net.minecraft.world.World;
 
 import appeng.api.AEApi;
@@ -270,14 +274,17 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			return;
 		}
 
-		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>(this.craftableItems);
+		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = this.craftableItems;
-		final Set<IAEItemStack> oldEmitableItems = new HashSet<>(this.emitableItems);
 
 		// erase list.
 		this.craftingMethods.clear();
 		this.craftableItems.clear();
 		this.emitableItems.clear();
 
+		// update the stuff that was in the list...
+		this.storageGrid.postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), oldItems.keySet(),
+				new BaseActionSource() );
+
 		// re-create list..
 		for( final ICraftingProvider provider : this.craftingProviders )
 		{
@@ -312,51 +319,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			this.craftableItems.put( e.getKey(), ImmutableList.copyOf( e.getValue() ) );
 		}
 
-		Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftablesChanged = new Object2ObjectArrayMap<>();
+		this.storageGrid.postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), this.craftableItems.keySet(),
-
-		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> i = oldItems.entrySet();
-		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : i) {
-			if (!this.craftableItems.containsKey( ais.getKey() )) {
-				IAEItemStack changedStack = ais.getKey().copy();
-				changedStack.reset();
-				changedStack.setCraftable( false );
-				craftablesChanged.put( changedStack, ais.getValue() );
-			}
-		}
-
-		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> j = this.craftableItems.entrySet();
-		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : j) {
-			if (!oldItems.containsKey( ais )){
-				IAEItemStack changedStack = ais.getKey().copy();
-				changedStack.reset();
-				changedStack.setCraftable( true );
-				craftablesChanged.put( changedStack, ais.getValue() );
-			}
-		}
-
-		for( final IAEItemStack st : oldEmitableItems )
-		{
-			if( !emitableItems.contains( st ) )
-			{
-				IAEItemStack changedStack = st.copy();
-				changedStack.reset();
-				changedStack.setCraftable( false );
-				craftablesChanged.put( changedStack, null );
-			}
-		}
-
-		for( final IAEItemStack st : this.emitableItems )
-		{
-			if( !oldEmitableItems.contains( st ) )
-			{
-				IAEItemStack changedStack = st.copy();
-				changedStack.reset();
-				changedStack.setCraftable( true );
-				craftablesChanged.put( changedStack, null );
-			}
-		}
-
-		this.storageGrid.postCraftablesChanges( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), craftablesChanged.keySet(),
 				new BaseActionSource() );
 	}
 

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

@@ -170,14 +170,15 @@ public class GridStorageCache implements IStorageGrid
 
 	private CellChangeTracker addCellProvider( final ICellProvider cc, final CellChangeTracker tracker )
 	{
-		if( this.inactiveCellProviders.contains( cc ) )
+		if( this.inactiveCellProviders.contains( cc ) && !this.activeCellProviders.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 );
@@ -246,9 +247,10 @@ public class GridStorageCache implements IStorageGrid
 				this.removeCellProvider( cc, tracker );
 			}
 		}
-		tracker.applyChanges();
 
-		this.storageMonitors.forEach( ( channel, monitor ) -> monitor.setForceUpdate( true ) );
+		this.storageMonitors.forEach( ( channel, monitor ) -> monitor.forceUpdate() );
+
+		tracker.applyChanges();
 	}
 
 	private <T extends IAEStack<T>, C extends IStorageChannel<T>> void postChangesToNetwork( final C chan, final int upOrDown, final IItemList<T> availableItems, final IActionSource src )
@@ -279,12 +281,6 @@ public class GridStorageCache implements IStorageGrid
 		this.storageMonitors.get( chan ).postChange( true, (Iterable) input, src );
 	}
 
-	@Override
-	public void postCraftablesChanges( IStorageChannel<?> chan, Iterable<? extends IAEStack<?>> input, IActionSource src )
-	{
-		this.storageMonitors.get( chan ).updateCraftables( (Iterable) input, src );
-	}
-
 	@Override
 	public void registerCellProvider( final ICellProvider provider )
 	{
@@ -328,10 +324,7 @@ public class GridStorageCache implements IStorageGrid
 
 		public void applyChanges()
 		{
-			if( !this.list.isEmpty() )
+			GridStorageCache.this.postChangesToNetwork( this.channel, this.up_or_down, this.list, this.src );
-			{
-				GridStorageCache.this.postChangesToNetwork( this.channel, this.up_or_down, this.list, this.src );
-			}
 		}
 	}
 

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

@@ -19,9 +19,20 @@
 package appeng.me.cache;
 
 
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import appeng.api.AEApi;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Queues;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.networking.events.MENetworkStorageEvent;
@@ -30,26 +41,17 @@ import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.IMEMonitorHandlerReceiver;
 import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.channels.IFluidStorageChannel;
-import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.me.storage.ItemWatcher;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 
-import java.util.*;
-import java.util.Map.Entry;
-
 
 public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 {
 	@Nonnull
-	private static final HashMap<IActionSource, LinkedList<NetworkMonitor<?>>> src2MonitorsMap = new HashMap<>();
+	private static final Deque<NetworkMonitor<?>> GLOBAL_DEPTH = Queues.newArrayDeque();
-	private static final Set<IActionSource> nestingSources = new HashSet<>();
-
-	protected boolean wasNested = false;
-	protected boolean isNested = false;
 
 	@Nonnull
 	private final GridStorageCache myGridCache;
@@ -61,9 +63,9 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	private final Object2ObjectMap<IMEMonitorHandlerReceiver<T>, Object> listeners;
 
 	private boolean sendEvent = false;
-	private long gridItemCount;
+	private boolean hasChanged = false;
-	private long gridFluidCount;
+	@Nonnegative
-	public boolean forceUpdate;
+	private int localDepthSemaphore = 0;
 
 	public NetworkMonitor( final GridStorageCache cache, final IStorageChannel<T> chan )
 	{
@@ -88,7 +90,21 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Override
 	public T extractItems( final T request, final Actionable mode, final IActionSource src )
 	{
-		return this.getHandler().extractItems( request, mode, src );
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().extractItems( request, mode, src );
+		}
+
+		this.localDepthSemaphore++;
+		final T leftover = this.getHandler().extractItems( request, mode, src );
+		this.localDepthSemaphore--;
+
+		if( this.localDepthSemaphore == 0 )
+		{
+			this.monitorDifference( request.copy(), leftover, true, src );
+		}
+
+		return leftover;
 	}
 
 	@Override
@@ -121,42 +137,38 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		return this.getHandler().getSlot();
 	}
 
-	public long getGridCurrentCount()
-	{
-		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-		{
-			return gridItemCount;
-		}
-		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-		{
-			return gridFluidCount;
-		}
-		return 0;
-	}
-
-	public void incGridCurrentCount( long count )
-	{
-		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-		{
-			gridItemCount += count;
-		}
-		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-		{
-			gridFluidCount += count;
-		}
-	}
-
 	@Nonnull
 	@Override
 	public IItemList<T> getStorageList()
 	{
+		if( hasChanged )
+		{
+			hasChanged = false;
+			this.cachedList.resetStatus();
+			return this.getAvailableItems( this.cachedList );
+		}
+
 		return this.cachedList;
 	}
 
 	@Override
 	public T injectItems( final T input, final Actionable mode, final IActionSource src )
 	{
-		return this.getHandler().injectItems( input, mode, src );
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().injectItems( input, mode, src );
+		}
+
+		this.localDepthSemaphore++;
+		final T leftover = this.getHandler().injectItems( input, mode, src );
+		this.localDepthSemaphore--;
+
+		if( this.localDepthSemaphore == 0 )
+		{
+			this.monitorDifference( input.copy(), leftover, false, src );
+		}
+
+		return leftover;
 	}
 
 	@Override
@@ -188,15 +200,36 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		return this.listeners.entrySet().iterator();
 	}
 
+	private T monitorDifference( final IAEStack<T> original, final T leftOvers, final boolean extraction, final IActionSource src )
+	{
+		final T diff = original.copy();
+
+		if( extraction )
+		{
+			diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() );
+		}
+		else if( leftOvers != null )
+		{
+			diff.decStackSize( leftOvers.getStackSize() );
+		}
+
+		if( diff.getStackSize() != 0 )
+		{
+			this.postChangesToListeners( ImmutableList.of( diff ), src );
+		}
+
+		return leftOvers;
+	}
+
 	private void notifyListenersOfChange( final Iterable<T> diff, final IActionSource src )
 	{
+		this.hasChanged = true;
 		final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
 
 		while( i.hasNext() )
 		{
 			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
 			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
-
 			if( receiver.isValid( o.getValue() ) )
 			{
 				receiver.postChange( this, diff, src );
@@ -208,57 +241,46 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		}
 	}
 
-	protected void updateCraftables( Iterable<T> input, IActionSource src )
+	private void postChangesToListeners( final Iterable<T> changes, final IActionSource src )
 	{
-		for( final T changedItem : input )
+		this.postChange( true, changes, src );
-		{
-			if (changedItem.isCraftable()) {
-				this.cachedList.add( changedItem );
-			}
-			else
-			{
-				T i = this.cachedList.findPrecise( changedItem );
-				if (i != null)
-				i.setCraftable( false );
-			}
-		}
 	}
 
 	protected void postChange( final boolean add, final Iterable<T> changes, final IActionSource src )
 	{
-		src2MonitorsMap.putIfAbsent( src, new LinkedList<>() );
+		if( this.localDepthSemaphore > 0 || GLOBAL_DEPTH.contains( this ) )
-		if( src2MonitorsMap.get( src ).contains( this ) )
 		{
-			nestingSources.add( src );
 			return;
 		}
-		src2MonitorsMap.get( src ).add( this );
+
+		GLOBAL_DEPTH.push( this );
+		this.localDepthSemaphore++;
 
 		this.sendEvent = true;
 
-		for( final T change : changes )
+		this.notifyListenersOfChange( changes, src );
+
+		for( final T changedItem : changes )
 		{
-			//T change = changed;
+			T difference = changedItem;
-			if( !add && change != null )
+
+			if( !add && changedItem != null )
 			{
-				//change = changed.copy();
+				difference = changedItem.copy();
-				change.setStackSize( -change.getStackSize() );
+				difference.setStackSize( -changedItem.getStackSize() );
 			}
 
-			incGridCurrentCount( change.getStackSize() );
+			if( this.myGridCache.getInterestManager().containsKey( changedItem ) )
-			this.cachedList.addStorage( change );
-
-			if( this.myGridCache.getInterestManager().containsKey( change ) )
 			{
-				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( change );
+				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( changedItem );
 
 				if( !list.isEmpty() )
 				{
-					IAEStack<T> fullStack = this.getStorageList().findPrecise( change );
+					IAEStack<T> fullStack = this.getStorageList().findPrecise( changedItem );
 
 					if( fullStack == null )
 					{
-						fullStack = change.copy();
+						fullStack = changedItem.copy();
 						fullStack.setStackSize( 0 );
 					}
 
@@ -266,7 +288,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 					for( final ItemWatcher iw : list )
 					{
-						iw.getHost().onStackChange( this.getStorageList(), fullStack, change, src, this.getChannel() );
+						iw.getHost().onStackChange( this.getStorageList(), fullStack, difference, src, this.getChannel() );
 					}
 
 					this.myGridCache.getInterestManager().disableTransactions();
@@ -274,78 +296,21 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 			}
 		}
 
-		this.notifyListenersOfChange( changes, src );
+		final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
+		this.localDepthSemaphore--;
 
-		if( src2MonitorsMap.get( src ).getFirst() == this )
+		if( last != this )
 		{
-			boolean nested = nestingSources.contains( src );
+			throw new IllegalStateException( "Invalid Access to Networked Storage API detected." );
-			src2MonitorsMap.get( src ).forEach( networkMonitor -> networkMonitor.isNested = nested );
-
-			src2MonitorsMap.get( src ).forEach( networkMonitor -> {
-				if( networkMonitor.isNested != networkMonitor.wasNested )
-				{
-					networkMonitor.wasNested = networkMonitor.isNested;
-					networkMonitor.setForceUpdate( true );
-				}
-			} );
-			src2MonitorsMap.remove( src );
-			nestingSources.remove( src );
 		}
 	}
 
-	public void setForceUpdate( boolean forceUpdate )
-	{
-		this.forceUpdate = forceUpdate;
-	}
-
 	void forceUpdate()
 	{
-		forceUpdate = false;
+		this.hasChanged = true;
-		this.cachedList.resetStatus();
-		this.getAvailableItems( this.cachedList );
-
-		long count = 0;
-		for( T stack : this.cachedList )
-		{
-			count += stack.getStackSize();
-
-			if( this.myGridCache.getInterestManager().containsKey( stack ) )
-			{
-				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( stack );
-
-				if( !list.isEmpty() )
-				{
-					IAEStack<T> fullStack = this.getStorageList().findPrecise( stack );
-
-					if( fullStack == null )
-					{
-						fullStack = stack.copy();
-						fullStack.setStackSize( 0 );
-					}
-
-					this.myGridCache.getInterestManager().enableTransactions();
-
-					for ( final ItemWatcher iw : list )
-					{
-						iw.getHost().onStackChange( this.getStorageList(), fullStack, stack, null, this.getChannel() );
-					}
-
-					this.myGridCache.getInterestManager().disableTransactions();
-				}
-			}
-		}
-
-		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-		{
-			gridItemCount = count;
-		}
-		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-		{
-			gridFluidCount = count;
-		}
 
 		final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
-		while ( i.hasNext() )
+		while( i.hasNext() )
 		{
 			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
 			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
@@ -363,10 +328,6 @@ 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/cache/P2PCache.java

@@ -19,7 +19,7 @@
 package appeng.me.cache;
 
 
-import java.util.Collection;
+import java.util.HashMap;
 import java.util.Random;
 
 import com.google.common.collect.LinkedHashMultimap;
@@ -46,7 +46,7 @@ public class P2PCache implements IGridCache
 	private static final TunnelCollection<PartP2PTunnel> NULL_COLLECTION = new TunnelCollection<PartP2PTunnel>( null, null );
 
 	private final IGrid myGrid;
-	private final Multimap<Short, PartP2PTunnel> inputs = LinkedHashMultimap.create();
+	private final HashMap<Short, PartP2PTunnel> inputs = new HashMap<>();
 	private final Multimap<Short, PartP2PTunnel> outputs = LinkedHashMultimap.create();
 	private final Random frequencyGenerator;
 
@@ -110,19 +110,10 @@ public class P2PCache implements IGridCache
 			}
 			else
 			{
-				this.inputs.remove( t.getFrequency(), t );
+				this.inputs.remove( t.getFrequency() );
 			}
 
-			if( this.inputs.get( t.getFrequency() ).isEmpty() )
+			this.updateTunnel( t.getFrequency(), !t.isOutput(), false );
-			{
-				this.inputs.removeAll( t.getFrequency() );
-			}
-			if( this.outputs.get( t.getFrequency() ).isEmpty() )
-			{
-				this.outputs.removeAll( t.getFrequency() );
-			}
-
-			this.updateTunnel( t.getFrequency(), t.isOutput(), false );
 		}
 	}
 
@@ -151,7 +142,7 @@ public class P2PCache implements IGridCache
 				this.inputs.put( t.getFrequency(), t );
 			}
 
-			this.updateTunnel( t.getFrequency(), t.isOutput(), false );
+			this.updateTunnel( t.getFrequency(), !t.isOutput(), false );
 		}
 	}
 
@@ -173,20 +164,6 @@ public class P2PCache implements IGridCache
 
 	}
 
-	public void removeTunnel( final PartP2PTunnel t, short freq )
-	{
-		this.outputs.remove( freq, t );
-		this.inputs.remove( freq, t );
-		if( this.inputs.get( t.getFrequency() ).isEmpty() )
-		{
-			this.inputs.removeAll( t.getFrequency() );
-		}
-		if( this.outputs.get( t.getFrequency() ).isEmpty() )
-		{
-			this.outputs.removeAll( t.getFrequency() );
-		}
-	}
-
 	private void updateTunnel( final short freq, final boolean updateOutputs, final boolean configChange )
 	{
 		for( final PartP2PTunnel p : this.outputs.get( freq ) )
@@ -198,7 +175,8 @@ public class P2PCache implements IGridCache
 			p.onTunnelNetworkChange();
 		}
 
-		for( final PartP2PTunnel in : this.inputs.get( freq ) )
+		final PartP2PTunnel in = this.inputs.get( freq );
+		if( in != null )
 		{
 			if( configChange )
 			{
@@ -217,7 +195,7 @@ public class P2PCache implements IGridCache
 
 		if( this.inputs.containsValue( t ) )
 		{
-			this.inputs.remove( t.getFrequency(), t );
+			this.inputs.remove( t.getFrequency() );
 		}
 
 		t.setFrequency( newFrequency );
@@ -233,6 +211,7 @@ public class P2PCache implements IGridCache
 
 		// AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq );
 		this.updateTunnel( t.getFrequency(), t.isOutput(), true );
+		this.updateTunnel( t.getFrequency(), !t.isOutput(), true );
 	}
 
 	public short newFrequency()
@@ -257,43 +236,25 @@ public class P2PCache implements IGridCache
 
 	public TunnelCollection<PartP2PTunnel> getOutputs( final short freq, final Class<? extends PartP2PTunnel> c )
 	{
-		Collection<PartP2PTunnel> in = this.inputs.get( freq );
+		final PartP2PTunnel in = this.inputs.get( freq );
 
 		if( in == null )
 		{
 			return NULL_COLLECTION;
 		}
 
-		TunnelCollection<PartP2PTunnel> out;
+		final TunnelCollection<PartP2PTunnel> out = this.inputs.get( freq ).getCollection( this.outputs.get( freq ), c );
-		for( PartP2PTunnel part : this.inputs.get( freq ) )
-		{
-			out = part.getCollection( this.outputs.get( freq ), c );
-			if( out != null )
-			{
-				return out;
-			}
-		}
-		return NULL_COLLECTION;
-	}
-
-	public TunnelCollection<PartP2PTunnel> getInputs( final short freq, final Class<? extends PartP2PTunnel> c )
-	{
-		Collection<PartP2PTunnel> out = this.outputs.get( freq );
 
 		if( out == null )
 		{
 			return NULL_COLLECTION;
 		}
 
-		TunnelCollection<PartP2PTunnel> in;
+		return out;
-		for( PartP2PTunnel part : this.outputs.get( freq ) )
+	}
-		{
+
-			in = part.getCollection( this.inputs.get( freq ), c );
+	public PartP2PTunnel getInput( final short freq )
-			if( in != null )
+	{
-			{
+		return this.inputs.get( freq );
-				return in;
-			}
-		}
-		return NULL_COLLECTION;
 	}
 }

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

@@ -138,6 +138,7 @@ public class TickManagerCache implements ITickManager
 			tt.addEntityCrashInfo( crashreportcategory );
 			throw new ReportedException( crashreport );
 		}
+		PartLevelEmitter.wipeCache();
 	}
 
 	private void addToQueue( final TickTracker tt )

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

@@ -25,7 +25,6 @@ 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;
 
@@ -743,35 +742,24 @@ 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);
-											final List<IAEItemStack> substitutes = details.getSubstituteInputs( x );
+											itemList = new ArrayList<>(substitutes.size());
-											itemList = new ArrayList<>( substitutes.size() );
 
-											for( IAEItemStack stack : substitutes )
+											for (IAEItemStack stack : substitutes) {
-											{
+												itemList.addAll(this.inventory.getItemList().findFuzzy(stack,
-												itemList.addAll( this.inventory.getItemList().findFuzzy( stack, FuzzyMode.IGNORE_ALL ) );
+														FuzzyMode.IGNORE_ALL));
 											}
 										} else {
 											itemList = new ArrayList<>(1);

src/main/java/appeng/me/helpers/GenericInterestManager.java

@@ -123,4 +123,4 @@ public class GenericInterestManager<T>
 			this.iw = watcher;
 		}
 	}
-}
+}

src/main/java/appeng/me/helpers/MEMonitorHandler.java

@@ -28,6 +28,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
+import com.google.common.collect.ImmutableList;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.IActionSource;
@@ -83,7 +85,11 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Override
 	public T injectItems( final T input, final Actionable mode, final IActionSource src )
 	{
-		return this.getHandler().injectItems( input, mode, src );
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().injectItems( input, mode, src );
+		}
+		return this.monitorDifference( input.copy(), this.getHandler().injectItems( input, mode, src ), false, src );
 	}
 
 	protected IMEInventoryHandler<T> getHandler()
@@ -91,7 +97,28 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 		return this.internalHandler;
 	}
 
-	public void postChangesToListeners( final Iterable<T> changes, final IActionSource src )
+	private T monitorDifference( final T original, final T leftOvers, final boolean extraction, final IActionSource src )
+	{
+		final T diff = original.copy();
+
+		if( extraction )
+		{
+			diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() );
+		}
+		else if( leftOvers != null )
+		{
+			diff.decStackSize( leftOvers.getStackSize() );
+		}
+
+		if( diff.getStackSize() != 0 )
+		{
+			this.postChangesToListeners( ImmutableList.of( diff ), src );
+		}
+
+		return leftOvers;
+	}
+
+	protected void postChangesToListeners( final Iterable<T> changes, final IActionSource src )
 	{
 		this.notifyListenersOfChange( changes, src );
 	}
@@ -123,7 +150,11 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Override
 	public T extractItems( final T request, final Actionable mode, final IActionSource src )
 	{
-		return this.getHandler().extractItems( request, mode, src );
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().extractItems( request, mode, src );
+		}
+		return this.monitorDifference( request.copy(), this.getHandler().extractItems( request, mode, src ), true, src );
 	}
 
 	@Override

src/main/java/appeng/me/helpers/MachineSource.java

@@ -19,7 +19,6 @@
 package appeng.me.helpers;
 
 
-import java.util.Objects;
 import java.util.Optional;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -56,24 +55,4 @@ public class MachineSource implements IActionSource
 		return Optional.empty();
 	}
 
-	@Override
-	public boolean equals( Object o )
-	{
-		if( this == o )
-		{
-			return true;
-		}
-		if( o == null || getClass() != o.getClass() )
-		{
-			return false;
-		}
-		MachineSource that = (MachineSource) o;
-		return via.equals( that.via );
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return Objects.hash( via );
-	}
 }

src/main/java/appeng/me/storage/DriveWatcher.java

@@ -19,20 +19,15 @@
 package appeng.me.storage;
 
 
-import appeng.core.features.registries.cell.CreativeCellHandler;
-import appeng.me.GridAccessException;
-import appeng.me.helpers.MachineSource;
-import appeng.tile.storage.TileDrive;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.config.Actionable;
+import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.ICellInventoryHandler;
 import appeng.api.storage.data.IAEStack;
 
-import java.util.Collections;
-
 
 public class DriveWatcher<T extends IAEStack<T>> extends MEInventoryHandler<T>
 {
@@ -40,16 +35,14 @@ public class DriveWatcher<T extends IAEStack<T>> extends MEInventoryHandler<T>
 	private int oldStatus = 0;
 	private final ItemStack is;
 	private final ICellHandler handler;
-	private final TileDrive drive;
+	private final IChestOrDrive cord;
-	private IActionSource source;
 
-	public DriveWatcher( final ICellInventoryHandler<T> i, final ItemStack is, final ICellHandler han, final TileDrive drive )
+	public DriveWatcher( final ICellInventoryHandler<T> i, final ItemStack is, final ICellHandler han, final IChestOrDrive cod )
 	{
 		super( i, i.getChannel() );
 		this.is = is;
 		this.handler = han;
-		this.drive = drive;
+		this.cord = cod;
-		this.source = new MachineSource( drive );
 	}
 
 	public int getStatus()
@@ -62,58 +55,38 @@ public class DriveWatcher<T extends IAEStack<T>> extends MEInventoryHandler<T>
 	{
 		final long size = input.getStackSize();
 
-		final T remainder = super.injectItems( input, type, src );
+		final T a = super.injectItems( input, type, src );
 
-		if( type == Actionable.MODULATE && ( remainder == null || remainder.getStackSize() != size ) )
+		if( type == Actionable.MODULATE && ( a == null || a.getStackSize() != size ) )
 		{
 			final int newStatus = this.getStatus();
 
 			if( newStatus != this.oldStatus )
 			{
-				this.drive.blinkCell( this.getSlot() );
+				this.cord.blinkCell( this.getSlot() );
 				this.oldStatus = newStatus;
 			}
-			if (this.drive.getProxy().isActive() && !(handler instanceof CreativeCellHandler))
-			{
-				try
-				{
-					this.drive.getProxy().getStorage().postAlterationOfStoredItems( this.getChannel(), Collections.singletonList( input.copy().setStackSize( input.getStackSize() - ( remainder == null ? 0 : remainder.getStackSize() ) ) ), this.source );
-				} catch ( GridAccessException e )
-				{
-					e.printStackTrace();
-				}
-			}
 		}
 
-		return remainder;
+		return a;
 	}
 
 	@Override
 	public T extractItems( final T request, final Actionable type, final IActionSource src )
 	{
-		final T extractable = super.extractItems( request, type, src );
+		final T a = super.extractItems( request, type, src );
 
-		if( type == Actionable.MODULATE && extractable != null )
+		if( type == Actionable.MODULATE && a != null )
 		{
 			final int newStatus = this.getStatus();
 
 			if( newStatus != this.oldStatus )
 			{
-				this.drive.blinkCell( this.getSlot() );
+				this.cord.blinkCell( this.getSlot() );
 				this.oldStatus = newStatus;
 			}
-			if (this.drive.getProxy().isActive() && !(handler instanceof CreativeCellHandler ))
-			{
-				try
-				{
-					this.drive.getProxy().getStorage().postAlterationOfStoredItems( this.getChannel(), Collections.singletonList( request.copy().setStackSize( -extractable.getStackSize() ) ), this.source );
-				} catch ( GridAccessException e )
-				{
-					e.printStackTrace();
-				}
-			}
 		}
 
-		return extractable;
+		return a;
 	}
 }

src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java

@@ -19,11 +19,14 @@
 package appeng.me.storage;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.NavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
-import appeng.fluids.util.AEFluidStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -45,14 +48,16 @@ import appeng.api.storage.data.IItemList;
 public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITickingMonitor
 {
 	private final IFluidHandler handler;
-	private IItemList<IAEFluidStack> cache = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+	private final IItemList<IAEFluidStack> list = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
 	private final HashMap<IMEMonitorHandlerReceiver<IAEFluidStack>, Object> listeners = new HashMap<>();
+	private final NavigableMap<Integer, CachedFluidStack> memory;
 	private IActionSource mySource;
 	private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY;
 
 	public MEMonitorIFluidHandler( final IFluidHandler handler )
 	{
 		this.handler = handler;
+		this.memory = new ConcurrentSkipListMap<>();
 	}
 
 	@Override
@@ -77,6 +82,11 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 			return input.copy();
 		}
 
+		if( type == Actionable.MODULATE )
+		{
+			this.onTick();
+		}
+
 		if( filled == input.getStackSize() )
 		{
 			return null;
@@ -84,15 +94,6 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 
 		final IAEFluidStack o = input.copy();
 		o.setStackSize( input.getStackSize() - filled );
-
-		if( type == Actionable.MODULATE )
-		{
-			IAEFluidStack added = o.copy();
-			this.cache.add( added );
-			this.postDifference( Collections.singletonList( added ) );
-			this.onTick();
-		}
-
 		return o;
 	}
 
@@ -106,18 +107,13 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 			return null;
 		}
 
-		final IAEFluidStack o = request.copy();
-		o.setStackSize( removed.amount );
-
 		if( type == Actionable.MODULATE )
 		{
-			IAEFluidStack cachedStack = this.cache.findPrecise( request );
+			this.onTick();
-			if( cachedStack != null )
-			{
-				cachedStack.decStackSize( o.getStackSize() );
-				this.postDifference( Collections.singletonList( o.copy().setStackSize( -o.getStackSize() ) ) );
-			}
 		}
+
+		final IAEFluidStack o = request.copy();
+		o.setStackSize( removed.amount );
 		return o;
 	}
 
@@ -130,51 +126,111 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public TickRateModulation onTick()
 	{
+		final List<IAEFluidStack> changes = new ArrayList<>();
+
+		this.list.resetStatus();
+		int high = 0;
 		boolean changed = false;
 
-		final List<IAEFluidStack> changes = new ArrayList<>();
+		final IFluidTankProperties[] props = this.handler.getTankProperties();
-		final IFluidTankProperties[] tankProperties = this.handler.getTankProperties();
+		for( int slot = 0; slot < this.handler.getTankProperties().length; ++slot )
-
-		IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
-
-		for( IFluidTankProperties tankProperty : tankProperties )
 		{
-			if( this.mode == StorageFilter.EXTRACTABLE_ONLY && this.handler.drain( 1, false ) == null )
+			final CachedFluidStack old = this.memory.get( slot );
+			high = Math.max( high, slot );
+
+			final FluidStack newIS = !props[slot].canDrain() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? null : props[slot].getContents();
+			final FluidStack oldIS = old == null ? null : old.fluidStack;
+
+			if( isDifferent( newIS, oldIS ) )
 			{
-				continue;
+				final CachedFluidStack cis = new CachedFluidStack( newIS );
+				this.memory.put( slot, cis );
+
+				if( old != null && old.aeStack != null )
+				{
+					old.aeStack.setStackSize( -old.aeStack.getStackSize() );
+					changes.add( old.aeStack );
+				}
+
+				if( cis.aeStack != null )
+				{
+					changes.add( cis.aeStack );
+					this.list.add( cis.aeStack );
+				}
+
+				changed = true;
 			}
-			currentlyOnStorage.add( AEFluidStack.fromFluidStack( tankProperty.getContents() ) );
+			else
-		}
-
-		for( final IAEFluidStack is : cache )
-		{
-			is.setStackSize( -is.getStackSize() );
-		}
-
-		for( final IAEFluidStack is : currentlyOnStorage )
-		{
-			cache.add( is );
-		}
-
-		for( final IAEFluidStack is : cache )
-		{
-			if( is.getStackSize() != 0 )
 			{
-				changes.add( is );
+				final int newSize = newIS == null ? 0 : newIS.amount;
+				final int diff = newSize - ( oldIS == null ? 0 : oldIS.amount );
+
+				IAEFluidStack stack = null;
+
+				if( newIS != null )
+				{
+					stack = ( old == null || old.aeStack == null ? AEApi.instance()
+							.storage()
+							.getStorageChannel( IFluidStorageChannel.class )
+							.createStack( newIS ) : old.aeStack.copy() );
+				}
+				if( stack != null )
+				{
+					stack.setStackSize( newSize );
+					this.list.add( stack );
+				}
+
+				if( diff != 0 && stack != null )
+				{
+					final CachedFluidStack cis = new CachedFluidStack( newIS );
+					this.memory.put( slot, cis );
+
+					final IAEFluidStack a = stack.copy();
+					a.setStackSize( diff );
+					changes.add( a );
+					changed = true;
+				}
 			}
 		}
 
-		cache = currentlyOnStorage;
+		// detect dropped items; should fix non IISided Inventory Changes.
+		final NavigableMap<Integer, CachedFluidStack> end = this.memory.tailMap( high, false );
+		if( !end.isEmpty() )
+		{
+			for( final CachedFluidStack cis : end.values() )
+			{
+				if( cis != null && cis.aeStack != null )
+				{
+					final IAEFluidStack a = cis.aeStack.copy();
+					a.setStackSize( -a.getStackSize() );
+					changes.add( a );
+					changed = true;
+				}
+			}
+			end.clear();
+		}
 
 		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
-			changed = true;
 		}
 
 		return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER;
 	}
 
+	private static boolean isDifferent( FluidStack a, FluidStack b )
+	{
+		if( a == b )
+		{
+			return false;
+		}
+		if( a == null || b == null )
+		{
+			return true;
+		}
+		return !a.getFluid().equals( b.getFluid() );
+	}
+
 	private void postDifference( final Iterable<IAEFluidStack> a )
 	{
 		if( a != null )
@@ -235,9 +291,9 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public IItemList<IAEFluidStack> getAvailableItems( final IItemList out )
 	{
-		for( final IAEFluidStack fs : cache )
+		for( final CachedFluidStack is : this.memory.values() )
 		{
-			out.addStorage( fs );
+			out.addStorage( is.aeStack );
 		}
 
 		return out;
@@ -246,7 +302,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public IItemList<IAEFluidStack> getStorageList()
 	{
-		return this.cache;
+		return this.list;
 	}
 
 	private StorageFilter getMode()
@@ -270,4 +326,24 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 		this.mySource = mySource;
 	}
 
+	private static class CachedFluidStack
+	{
+
+		private final FluidStack fluidStack;
+		private final IAEFluidStack aeStack;
+
+		CachedFluidStack( final FluidStack is )
+		{
+			if( is == null )
+			{
+				this.fluidStack = null;
+				this.aeStack = null;
+			}
+			else
+			{
+				this.fluidStack = is.copy();
+				this.aeStack = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createStack( is );
+			}
+		}
+	}
 }

src/main/java/appeng/me/storage/MEMonitorIInventory.java

@@ -19,8 +19,12 @@
 package appeng.me.storage;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.NavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import net.minecraft.item.ItemStack;
@@ -46,15 +50,16 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 {
 
 	private final InventoryAdaptor adaptor;
-	private IItemList<IAEItemStack> cache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+	private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-
 	private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
+	private final NavigableMap<Integer, CachedItemStack> memory;
 	private IActionSource mySource;
 	private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY;
 
 	public MEMonitorIInventory( final InventoryAdaptor adaptor )
 	{
 		this.adaptor = adaptor;
+		this.memory = new ConcurrentSkipListMap<>();
 	}
 
 	@Override
@@ -83,6 +88,11 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 			out = this.adaptor.addItems( input.createItemStack() );
 		}
 
+		if( type == Actionable.MODULATE )
+		{
+			this.onTick();
+		}
+
 		if( out.isEmpty() )
 		{
 			return null;
@@ -91,15 +101,6 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 		// better then doing construction from scratch :3
 		final IAEItemStack o = input.copy();
 		o.setStackSize( out.getCount() );
-
-		if( type == Actionable.MODULATE )
-		{
-			IAEItemStack added = o.copy();
-			this.cache.add( added );
-			this.postDifference( Collections.singletonList( added ) );
-			this.onTick();
-		}
-
 		return o;
 	}
 
@@ -128,12 +129,6 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 
 		if( type == Actionable.MODULATE )
 		{
-			IAEItemStack cachedStack = this.cache.findPrecise( request );
-			if( cachedStack != null )
-			{
-				cachedStack.decStackSize( o.getStackSize() );
-				this.postDifference( Collections.singletonList( o.copy().setStackSize( -o.getStackSize() ) ) );
-			}
 			this.onTick();
 		}
 
@@ -149,52 +144,110 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public TickRateModulation onTick()
 	{
-		boolean changed = false;
 
 		final List<IAEItemStack> changes = new ArrayList<>();
 
-		IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+		this.list.resetStatus();
-
+		int high = 0;
-		for( final ItemSlot is : adaptor )
+		boolean changed = false;
+		for( final ItemSlot is : this.adaptor )
 		{
-			if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !is.isExtractable() )
+			final CachedItemStack old = this.memory.get( is.getSlot() );
+			high = Math.max( high, is.getSlot() );
+
+			final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
+			final ItemStack oldIS = old == null ? ItemStack.EMPTY : old.itemStack;
+
+			if( this.isDifferent( newIS, oldIS ) )
 			{
-				continue;
+				final CachedItemStack cis = new CachedItemStack( is.getItemStack() );
+				this.memory.put( is.getSlot(), cis );
+
+				if( old != null && old.aeStack != null )
+				{
+					old.aeStack.setStackSize( -old.aeStack.getStackSize() );
+					changes.add( old.aeStack );
+				}
+
+				if( cis.aeStack != null )
+				{
+					changes.add( cis.aeStack );
+					this.list.add( cis.aeStack );
+				}
+
+				changed = true;
 			}
-			currentlyOnStorage.add( is.getAEItemStack() );
+			else
-		}
-
-		for( final IAEItemStack is : cache )
-		{
-			is.setStackSize( -is.getStackSize() );
-		}
-
-		for( final IAEItemStack is : currentlyOnStorage )
-		{
-			cache.add( is );
-		}
-
-		for( final IAEItemStack is : cache )
-		{
-			if( is.getStackSize() != 0 )
 			{
-				changes.add( is );
+				final int newSize = ( newIS.isEmpty() ? 0 : newIS.getCount() );
+				final int diff = newSize - ( oldIS.isEmpty() ? 0 : oldIS.getCount() );
+
+				final IAEItemStack stack = ( old == null || old.aeStack == null ? AEApi.instance()
+						.storage()
+						.getStorageChannel( IItemStorageChannel.class )
+						.createStack( newIS ) : old.aeStack.copy() );
+				if( stack != null )
+				{
+					stack.setStackSize( newSize );
+					this.list.add( stack );
+				}
+
+				if( diff != 0 && stack != null )
+				{
+					final CachedItemStack cis = new CachedItemStack( is.getItemStack() );
+					this.memory.put( is.getSlot(), cis );
+
+					final IAEItemStack a = stack.copy();
+					a.setStackSize( diff );
+					changes.add( a );
+					changed = true;
+				}
 			}
 		}
 
-		cache = currentlyOnStorage;
+		// detect dropped items; should fix non IISided Inventory Changes.
+		final NavigableMap<Integer, CachedItemStack> end = this.memory.tailMap( high, false );
+		if( !end.isEmpty() )
+		{
+			for( final CachedItemStack cis : end.values() )
+			{
+				if( cis != null && cis.aeStack != null )
+				{
+					final IAEItemStack a = cis.aeStack.copy();
+					a.setStackSize( -a.getStackSize() );
+					changes.add( a );
+					changed = true;
+				}
+			}
+			end.clear();
+		}
 
 		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
-			changed = true;
 		}
 
 		return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER;
 	}
 
+	private boolean isDifferent( final ItemStack a, final ItemStack b )
+	{
+		if( a == b && b.isEmpty() )
+		{
+			return false;
+		}
+
+		if( ( a.isEmpty() && !b.isEmpty() ) || ( !a.isEmpty() && b.isEmpty() ) )
+		{
+			return true;
+		}
+
+		return !Platform.itemComparisons().isSameItem( a, b );
+	}
+
 	private void postDifference( final Iterable<IAEItemStack> a )
 	{
+		// AELog.info( a.getItemStack().getUnlocalizedName() + " @ " + a.getStackSize() );
 		if( a != null )
 		{
 			final Iterator<Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
@@ -253,9 +306,9 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public IItemList<IAEItemStack> getAvailableItems( final IItemList out )
 	{
-		for( IAEItemStack is : cache )
+		for( final CachedItemStack is : this.memory.values() )
 		{
-			out.addStorage( is );
+			out.addStorage( is.aeStack );
 		}
 
 		return out;
@@ -264,7 +317,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public IItemList<IAEItemStack> getStorageList()
 	{
-		return this.cache;
+		return this.list;
 	}
 
 	private StorageFilter getMode()
@@ -288,4 +341,24 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 		this.mySource = mySource;
 	}
 
+	private static class CachedItemStack
+	{
+
+		private final ItemStack itemStack;
+		private final IAEItemStack aeStack;
+
+		public CachedItemStack( final ItemStack is )
+		{
+			if( is.isEmpty() )
+			{
+				this.itemStack = ItemStack.EMPTY;
+				this.aeStack = null;
+			}
+			else
+			{
+				this.itemStack = is.copy();
+				this.aeStack = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is );
+			}
+		}
+	}
 }

src/main/java/appeng/me/storage/MEMonitorPassThrough.java

@@ -90,13 +90,6 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 	@Override
 	public void addListener( final IMEMonitorHandlerReceiver<T> l, final Object verificationToken )
 	{
-		if( this.listeners.size() == 0 )
-		{
-			if( this.monitor != null )
-			{
-				this.monitor.addListener( this, this.monitor );
-			}
-		}
 		this.listeners.put( l, verificationToken );
 	}
 
@@ -171,5 +164,4 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 	{
 		this.changeSource = changeSource;
 	}
-
 }

src/main/java/appeng/me/storage/MEPassThrough.java

@@ -41,7 +41,7 @@ public class MEPassThrough<T extends IAEStack<T>> implements IMEInventoryHandler
 		this.setInternal( i );
 	}
 
-	public IMEInventory<T> getInternal()
+	protected IMEInventory<T> getInternal()
 	{
 		return this.internal;
 	}

src/main/java/appeng/me/storage/SecurityStationInventory.java

@@ -19,8 +19,6 @@
 package appeng.me.storage;
 
 
-import appeng.me.helpers.MEMonitorHandler;
-import appeng.me.helpers.MachineSource;
 import com.mojang.authlib.GameProfile;
 
 import appeng.api.AEApi;
@@ -37,20 +35,16 @@ import appeng.api.storage.data.IItemList;
 import appeng.me.GridAccessException;
 import appeng.tile.misc.TileSecurityStation;
 
-import java.util.Collections;
-
 
 public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStack>
 {
 
 	private final IItemList<IAEItemStack> storedItems = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 	private final TileSecurityStation securityTile;
-	private final MachineSource src;
 
 	public SecurityStationInventory( final TileSecurityStation ts )
 	{
 		this.securityTile = ts;
-		this.src = new MachineSource( securityTile );
 	}
 
 	@Override
@@ -67,11 +61,6 @@ public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStac
 						return null;
 					}
 
-					if( securityTile.getProxy().isActive() )
-					{
-						( ( MEMonitorHandler<IAEItemStack> ) securityTile.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ).postChangesToListeners( Collections.singletonList( input.copy() ), this.src );
-					}
-
 					this.getStoredItems().add( input );
 					this.securityTile.inventoryChanged();
 					return null;
@@ -112,11 +101,6 @@ public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStac
 					return output;
 				}
 
-				if( securityTile.getProxy().isActive() )
-				{
-					( ( MEMonitorHandler<IAEItemStack> ) securityTile.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ).postChangesToListeners( Collections.singletonList( target.copy().setStackSize( -target.getStackSize() ) ), this.src );
-				}
-
 				target.setStackSize( 0 );
 				this.securityTile.inventoryChanged();
 				return output;

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

@@ -27,7 +27,6 @@ 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;
@@ -60,12 +59,6 @@ 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/PartFormationPlane.java

@@ -187,9 +187,8 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
 		this.stateChanged();
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged changedChannels )
+	public void updateChannels( final MENetworkChannelsChanged changedChannels )
 	{
 		this.stateChanged();
 	}
@@ -207,7 +206,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
 	@Override
 	public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
 	{
-		if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
+		if( this.getProxy().isActive() && channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
 			final List<IMEInventoryHandler> handler = new ArrayList<>( 1 );
 			handler.add( this.myHandler );

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

@@ -19,9 +19,40 @@
 package appeng.parts.automation;
 
 
+import java.util.Random;
+
+import appeng.me.Grid;
+import appeng.me.GridNode;
+import appeng.util.item.AEItemStack;
+import it.unimi.dsi.fastutil.objects.Object2LongMap;
+import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraftforge.items.IItemHandler;
+
 import appeng.api.AEApi;
-import appeng.api.config.*;
+import appeng.api.config.FuzzyMode;
-import appeng.api.networking.crafting.*;
+import appeng.api.config.LevelType;
+import appeng.api.config.RedstoneMode;
+import appeng.api.config.Settings;
+import appeng.api.config.Upgrades;
+import appeng.api.config.YesNo;
+import appeng.api.networking.crafting.ICraftingGrid;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.api.networking.crafting.ICraftingProvider;
+import appeng.api.networking.crafting.ICraftingProviderHelper;
+import appeng.api.networking.crafting.ICraftingWatcher;
+import appeng.api.networking.crafting.ICraftingWatcherHost;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.energy.IEnergyWatcher;
 import appeng.api.networking.energy.IEnergyWatcherHost;
@@ -50,28 +81,10 @@ import appeng.core.sync.GuiBridge;
 import appeng.helpers.Reflected;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
-import appeng.me.cache.NetworkMonitor;
 import appeng.parts.PartModel;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
-import appeng.util.item.OreHelper;
-import appeng.util.item.OreReference;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraftforge.items.IItemHandler;
-
-import java.util.Optional;
-import java.util.Random;
 
 
 public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider
@@ -110,6 +123,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	private double centerX;
 	private double centerY;
 	private double centerZ;
+	static Object2LongMap<Grid> gridItemCount = new Object2LongOpenHashMap<>();
+	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> fuzzyAEItemStackCount = new Object2ObjectOpenHashMap<>();
+	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> preciseAEItemStackCount = new Object2ObjectOpenHashMap<>();
 
 	@Reflected
 	public PartLevelEmitter( final ItemStack is )
@@ -140,6 +156,12 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
+	@MENetworkEventSubscribe
+	public void powerChanged( final MENetworkPowerStatusChange c )
+	{
+		this.updateState();
+	}
+
 	private void updateState()
 	{
 		final boolean isOn = this.isLevelEmitterOn();
@@ -184,25 +206,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		return flipState ? this.reportingValue >= this.lastReportedValue + 1 : this.reportingValue < this.lastReportedValue + 1;
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange powerEvent )
+	public void channelChanged( final MENetworkChannelsChanged c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
-		this.updateState();
-	}
-
-	@Override
-	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
-	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}
 
@@ -317,29 +323,90 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	}
 
 	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor )
+	{
+		updateReportingValue( monitor,null );
+	}
+
+	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor, Iterable<IAEItemStack> change )
 	{
 		final IAEItemStack myStack = this.config.getAEStackInSlot( 0 );
 
-		if( myStack == null )
+		GridNode node = (GridNode) (this.getGridNode());
+
+		if( node != null )
 		{
-			if( monitor instanceof NetworkMonitor )
+
+			final Grid g = node.getInternalGrid();
+
+			if( myStack == null )
 			{
-				this.lastReportedValue = ( (NetworkMonitor<IAEItemStack>) monitor ).getGridCurrentCount();
+				if( change != null )
+				{
+					if( gridItemCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					}
+				}
+				gridItemCount.computeIfAbsent( g, ( aLong ) -> {
+					this.lastReportedValue = 0;
+					monitor.getStorageList().forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					return ( lastReportedValue );
+				} );
+				this.lastReportedValue = gridItemCount.get( g );
 			}
-		}
 
-		else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+			else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-		{
+			{
-			final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
+				final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
+				if( change != null )
+				{
+					if( fuzzyAEItemStackCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> {
+							if( iaeItemStack.sameOre( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
+						} );
+					}
+				}
 
-			this.lastReportedValue = 0;
+				fuzzyAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
-			monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+				fuzzyAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
-		}
+					this.lastReportedValue = 0;
-		else
+					monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-		{
+					return ( lastReportedValue );
-			this.lastReportedValue = 0;
+				} ) );
-			IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
+
-			if( precise != null ) lastReportedValue = precise.getStackSize();
+				this.lastReportedValue = fuzzyAEItemStackCount.get( g ).get( myStack );
+				if( this.lastReportedValue == 0 )
+				{
+					fuzzyAEItemStackCount.get( g ).remove( myStack );
+					fuzzyAEItemStackCount.trim();
+				}
+			}
+			else
+			{
+				if( change != null )
+				{
+					if( preciseAEItemStackCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> {
+							if( iaeItemStack.isSameType( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
+						} );
+					}
+				}
+				preciseAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
+				preciseAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
+					this.lastReportedValue = 0;
+					IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
+					if( precise != null ) lastReportedValue = precise.getStackSize();
+					return ( lastReportedValue );
+				} ) );
+				this.lastReportedValue = preciseAEItemStackCount.get( g ).get( myStack );
+				if( this.lastReportedValue == 0 )
+				{
+					preciseAEItemStackCount.get( g ).remove( myStack );
+					preciseAEItemStackCount.trim();
+				}
+			}
 		}
 		this.updateState();
 	}
@@ -354,7 +421,8 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	@Override
 	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 ) && fullStack.equals( this.config.getAEStackInSlot( 0 ) ) && this.getInstalledUpgrades( Upgrades.FUZZY ) == 0 )
+		if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) && fullStack.equals( this.config.getAEStackInSlot( 0 ) ) && this
+				.getInstalledUpgrades( Upgrades.FUZZY ) == 0 )
 		{
 			this.lastReportedValue = fullStack.getStackSize();
 			this.updateState();
@@ -391,7 +459,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource actionSource )
 	{
-		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor );
+		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor, change );
 	}
 
 	@Override
@@ -484,7 +552,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	public void upgradesChanged()
 	{
 		this.configureWatchers();
-		this.updateState();
 	}
 
 	@Override
@@ -569,4 +636,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
+	public static void wipeCache(){
+		fuzzyAEItemStackCount.clear();
+		preciseAEItemStackCount.clear();
+		gridItemCount.clear();
+	}
 }

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

@@ -21,7 +21,6 @@ package appeng.parts.misc;
 
 import javax.annotation.Nullable;
 import appeng.api.AEApi;
-import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
@@ -45,6 +44,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemHandlerHelper;
 
 import java.util.*;
 
@@ -60,7 +60,8 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	private final IGridProxyable proxyable;
 	private final InventoryCache cache;
 	private StorageFilter mode;
-	private AccessRestriction access;
+
+	private ItemStack stackCache = null;
 
 	ItemHandlerAdapter( IItemHandler itemHandler, IGridProxyable proxy )
 	{
@@ -70,22 +71,18 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		{
 			PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
 			this.mode = ( (StorageFilter) partStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
-			this.access = ( (AccessRestriction) partStorageBus.getConfigManager().getSetting( Settings.ACCESS ) );
 		}
 		this.cache = new InventoryCache( this.itemHandler, this.mode );
-		this.cache.update();
 	}
 
 	@Override
 	public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
 	{
 		// Try to reuse the cached stack
-		@Nullable ItemStack currentCached = iox.getCachedItemStack();
+		@Nullable ItemStack currentCached = stackCache;
-		iox.setCachedItemStack(null);
+		stackCache = null;
 
 		ItemStack orgInput;
-		int slotCount = this.itemHandler.getSlots();
-
 		if( currentCached != null && iox.isSameType( currentCached ) )
 		{
 			// Cache is suitable, just update the count
@@ -97,18 +94,12 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			// We need a new stack :-(
 			orgInput = iox.createItemStack();
 		}
-
+		ItemStack remaining = ItemHandlerHelper.insertItem( this.itemHandler, orgInput, type == Actionable.SIMULATE );
-		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() )
+		if (!remaining.isEmpty() && remaining != orgInput)
 		{
-			iox.setCachedItemStack( remaining );
+			stackCache = remaining;
 		}
 
 		// At this point, we still have some items left...
@@ -120,9 +111,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		if( type == Actionable.MODULATE )
 		{
-			IAEItemStack added = iox.copy().setStackSize( iox.getStackSize() - remaining.getCount() );
-			this.cache.currentlyCached.add( added );
-			this.postDifference( Collections.singletonList( added ) );
 			try
 			{
 				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
@@ -131,6 +119,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			{
 				// meh
 			}
+
 		}
 
 		return AEItemStack.fromItemStack( remaining );
@@ -139,17 +128,18 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	@Override
 	public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
 	{
-		int remainingSize = Ints.saturatedCast( request.getStackSize() );
+		int remainingSize = Ints.saturatedCast(request.getStackSize());
 
 		// Use this to gather the requested items
 		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 );
 
-			if( !request.isSameType( stackInInventorySlot ) )
+			if (!request.isSameType(stackInInventorySlot))
 			{
 				continue;
 			}
@@ -201,15 +191,8 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		if( !gathered.isEmpty() )
 		{
-			IAEItemStack gatheredAEItemStack = AEItemStack.fromItemStack( gathered );
 			if( mode == Actionable.MODULATE )
 			{
-				IAEItemStack cachedStack = this.cache.currentlyCached.findPrecise( request );
-				if( cachedStack != null )
-				{
-					cachedStack.decStackSize( gatheredAEItemStack.getStackSize() );
-					this.postDifference( Collections.singletonList( gatheredAEItemStack.copy().setStackSize( -gatheredAEItemStack.getStackSize() ) ) );
-				}
 				try
 				{
 					this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
@@ -220,7 +203,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				}
 			}
 
-			return gatheredAEItemStack;
+			return AEItemStack.fromItemStack( gathered );
 		}
 
 		return null;
@@ -230,7 +213,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	public TickRateModulation onTick()
 	{
 		List<IAEItemStack> changes = this.cache.update();
-		if( !changes.isEmpty() && access.hasPermission( AccessRestriction.READ ) )
+		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
 			return TickRateModulation.URGENT;
@@ -291,9 +274,9 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 	private static class InventoryCache implements Iterable<ItemSlot>
 	{
+		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
 		private final IItemHandler itemHandler;
 		private final StorageFilter mode;
-		IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 
 		public InventoryCache( IItemHandler itemHandler, StorageFilter mode )
 		{
@@ -303,7 +286,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
 		{
-			currentlyCached.iterator().forEachRemaining( out::add );
+			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
 			return out;
 		}
 
@@ -315,41 +298,93 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		public List<IAEItemStack> update()
 		{
 			final List<IAEItemStack> changes = new ArrayList<>();
+			final int slots = this.itemHandler.getSlots();
 
-			IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+			// Make room for new slots
+			if( slots > this.cachedAeStacks.length )
+			{
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
+			}
 
 			for( final ItemSlot is : this )
 			{
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !is.isExtractable() )
+				// Save the old stuff
+				final IAEItemStack oldAeIS = this.cachedAeStacks[is.getSlot()];
+				final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
+
+				this.handlePossibleSlotChanges( is.getSlot(), oldAeIS, newIS, changes );
+			}
+			// Handle cases where the number of slots actually is lower now than before
+			if( slots < this.cachedAeStacks.length )
+			{
+				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
 				{
-					continue;
+					final IAEItemStack aeStack = this.cachedAeStacks[slot];
+
+					if( aeStack != null )
+					{
+						final IAEItemStack a = aeStack.copy();
+						a.setStackSize( -a.getStackSize() );
+						changes.add( a );
+					}
 				}
-				currentlyOnStorage.add( is.getAEItemStack() );
-			}
 
-			for ( final IAEItemStack is : currentlyCached )
+				// Reduce the cache size
-			{
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
-				is.setStackSize( -is.getStackSize() );
 			}
 
-			for ( final IAEItemStack is : currentlyOnStorage )
-			{
-				currentlyCached.add( is );
-			}
-
-			for ( final IAEItemStack is : currentlyCached )
-			{
-				if( is.getStackSize() != 0 )
-				{
-					changes.add( is );
-				}
-			}
-
-			currentlyCached = currentlyOnStorage;
-
 			return changes;
 		}
 
+		private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
+		{
+			if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
+			{
+				this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
+			}
+			else
+			{
+				this.handleItemChanged( slot, oldAeIS, newIS, changes );
+			}
+		}
+
+		private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
+		{
+			// Still the same item, but amount might have changed
+			final long diff = newIS.getCount() - oldAeIS.getStackSize();
+
+			if( diff != 0 )
+			{
+				final IAEItemStack stack = oldAeIS.copy();
+				stack.setStackSize( newIS.getCount() );
+
+				this.cachedAeStacks[slot] = stack;
+
+				final IAEItemStack a = stack.copy();
+				a.setStackSize( diff );
+				changes.add( a );
+			}
+		}
+
+		private void handleItemChanged( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
+		{
+			// Completely different item
+			this.cachedAeStacks[slot] = AEItemStack.fromItemStack( newIS );
+
+			// If we had a stack previously in this slot, notify the network about its disappearance
+			if( oldAeIS != null )
+			{
+				oldAeIS.setStackSize( -oldAeIS.getStackSize() );
+				changes.add( oldAeIS );
+			}
+
+			// Notify the network about the new stack. Note that this is null if newIS was null
+			if( this.cachedAeStacks[slot] != null )
+			{
+				changes.add( this.cachedAeStacks[slot] );
+			}
+		}
+
 		@Override
 		public Iterator<ItemSlot> iterator()
 		{

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

@@ -2,9 +2,7 @@ package appeng.parts.misc;
 
 import javax.annotation.Nullable;
 import appeng.api.AEApi;
-import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
-import appeng.api.config.Settings;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.ticking.TickRateModulation;
@@ -26,6 +24,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.item.ItemStack;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -40,7 +39,6 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     private final IItemRepository itemRepository;
     private final IGridProxyable proxyable;
     private final InventoryCache cache;
-    private AccessRestriction access;
 
     private ItemStack stackCache;
 
@@ -49,12 +47,6 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         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();
     }
 
     @Override
@@ -79,7 +71,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         ItemStack remaining = this.itemRepository.insertItem( orgInput, type == Actionable.SIMULATE );
 
         // Store the stack in the cache for next time.
-        if( !remaining.isEmpty() && remaining != orgInput )
+        if (!remaining.isEmpty() && remaining != orgInput)
         {
             stackCache = remaining;
         }
@@ -93,9 +85,6 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         if( type == Actionable.MODULATE )
         {
-            IAEItemStack added = iox.copy().setStackSize( iox.getStackSize() - remaining.getCount() );
-            this.cache.currentlyCached.add( added );
-            this.postDifference( Collections.singletonList( added ) );
             try
             {
                 this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
@@ -113,7 +102,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     @Override
     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 );
 
@@ -130,15 +119,8 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         if( !extracted.isEmpty() )
         {
-            IAEItemStack extractedAEItemStack = AEItemStack.fromItemStack( extracted );
             if( mode == Actionable.MODULATE )
             {
-                IAEItemStack cachedStack = this.cache.currentlyCached.findPrecise( request );
-                if (cachedStack != null)
-                {
-                    cachedStack.decStackSize( extractedAEItemStack.getStackSize() );
-                    this.postDifference( Collections.singletonList( extractedAEItemStack.copy().setStackSize( -extractedAEItemStack.getStackSize() ) ) );
-                }
                 try
                 {
                     this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
@@ -148,7 +130,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
                     // meh
                 }
             }
-            return extractedAEItemStack;
+            return AEItemStack.fromItemStack( extracted );
         }
         return null;
     }
@@ -198,15 +180,17 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     @Override
     public TickRateModulation onTick()
     {
-        List<IAEItemStack> changes = this.cache.update();
-        if( !changes.isEmpty() && access.hasPermission( AccessRestriction.READ ) )
         {
-            this.postDifference( changes );
+            List<IAEItemStack> changes = this.cache.update();
-            return TickRateModulation.URGENT;
+            if( !changes.isEmpty() )
-        }
+            {
-        else
+                this.postDifference( changes );
-        {
+                return TickRateModulation.URGENT;
-            return TickRateModulation.SLOWER;
+            }
+            else
+            {
+                return TickRateModulation.SLOWER;
+            }
         }
     }
 
@@ -218,7 +202,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
     private static class InventoryCache
     {
-        private IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+        private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
         private final IItemRepository iItemRepository;
 
         public InventoryCache( IItemRepository iItemRepository )
@@ -228,7 +212,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
         {
-            currentlyCached.iterator().forEachRemaining( out::add );
+            Arrays.stream( this.cachedAeStacks ).forEach( out::add );
             return out;
         }
 
@@ -236,31 +220,95 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         {
             final List<IAEItemStack> changes = new ArrayList<>();
 
-            IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect( Collectors.toList() );
-            this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).forEach( currentlyOnStorage::add );
 
-            for ( final IAEItemStack is : currentlyCached )
+            final int size = out.size();
+
+            // Make room for new slots
+            if( size > this.cachedAeStacks.length )
             {
-                is.setStackSize( -is.getStackSize() );
+                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
             }
 
-            for ( final IAEItemStack is : currentlyOnStorage )
+            for( int x = 0; x < size; x++ )
             {
-                currentlyCached.add( is );
+                // Save the old stuff
+                final IAEItemStack oldAeIS = this.cachedAeStacks[x];
+                final IAEItemStack newIS = out.get( x );
+
+                this.handlePossibleSlotChanges( x, oldAeIS, newIS, changes );
             }
 
-            for ( final IAEItemStack is : currentlyCached )
+            // Handle cases where the number of slots actually is lower now than before
+            if( size < this.cachedAeStacks.length )
             {
-                if( is.getStackSize() != 0 )
+                for( int x = 0; x < this.cachedAeStacks.length; x++ )
                 {
-                    changes.add( is );
+                    final IAEItemStack aeStack = this.cachedAeStacks[x];
-                }
-            }
 
-            currentlyCached = currentlyOnStorage;
+                    if( aeStack != null )
+                    {
+                        final IAEItemStack a = aeStack.copy();
+                        a.setStackSize( -a.getStackSize() );
+                        changes.add( a );
+                    }
+                }
+
+                // Reduce the cache size
+                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
+            }
 
             return changes;
         }
 
+        private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
+            {
+                this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
+            }
+            else
+            {
+                this.handleItemChanged( slot, oldAeIS, newIS, changes );
+            }
+        }
+
+        private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            // Still the same item, but amount might have changed
+            final long diff = newIS.getStackSize() - oldAeIS.getStackSize();
+
+            if( diff != 0 )
+            {
+                final IAEItemStack stack = oldAeIS.copy();
+                stack.setStackSize( newIS.getStackSize() );
+
+                this.cachedAeStacks[slot] = stack;
+
+                final IAEItemStack a = stack.copy();
+                a.setStackSize( diff );
+                changes.add( a );
+            }
+        }
+
+        private void handleItemChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            // Completely different item
+            this.cachedAeStacks[slot] =  newIS ;
+
+            // If we had a stack previously in this slot, notify the network about its disappearance
+            if( oldAeIS != null )
+            {
+                oldAeIS.setStackSize( -oldAeIS.getStackSize() );
+                changes.add( oldAeIS );
+            }
+
+            // Notify the network about the new stack. Note that this is null if newIS was null
+            if( this.cachedAeStacks[slot] != null )
+            {
+                changes.add( this.cachedAeStacks[slot] );
+            }
+        }
+
     }
 }

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

@@ -95,16 +95,14 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
 		super( is );
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void stateChange( final MENetworkChannelsChanged c )
 	{
 		this.duality.notifyNeighbors();
 	}
 
-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange c )
+	public void stateChange( final MENetworkPowerStatusChange c )
 	{
 		this.duality.notifyNeighbors();
 	}

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

@@ -1,215 +0,0 @@
-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.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 oreMatch;
-    OreDictPriorityList<IAEItemStack> priorityList;
-
-    public PartOreDicStorageBus( ItemStack is )
-    {
-        super( is );
-    }
-
-    @Override
-    public void readFromNBT( NBTTagCompound data )
-    {
-        super.readFromNBT( data );
-        this.oreMatch = data.getString( "oreMatch" );
-        this.priorityList = new OreDictPriorityList<>( OreHelper.INSTANCE.getMatchingOre( oreMatch ), oreMatch );
-    }
-
-    @Override
-    public void writeToNBT( NBTTagCompound data )
-    {
-        super.writeToNBT( data );
-        data.setString( "oreMatch", getOreMatch() );
-    }
-
-    @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( priorityList );
-
-                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;
-    }
-
-    public String getOreMatch()
-    {
-        if( this.oreMatch == null )
-        {
-            return "";
-        }
-        return oreMatch;
-    }
-
-    public void saveOreMatch( String oreMatch )
-    {
-        if( !this.oreMatch.equals( oreMatch ) )
-        {
-            this.oreMatch = oreMatch;
-            this.priorityList = new OreDictPriorityList<>( OreHelper.INSTANCE.getMatchingOre( oreMatch ), oreMatch );
-            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

@@ -0,0 +1,216 @@
+/*
+ * 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.fluids.parts.PartFluidInterface;
+import appeng.fluids.tile.TileFluidInterface;
+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;
+
+	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
+			}
+		}
+	}
+
+	@MENetworkEventSubscribe
+	public void updateChannels( 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 )
+	{
+		this.resetCache( true );
+		this.getHost().markForSave();
+	}
+
+	@Override
+	public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos 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();
+			}
+		}
+		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" );
+	}
+
+	@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/p2p/PartP2PFluids.java

@@ -83,19 +83,10 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
 
 		if( this.isOutput() )
 		{
-			try
+			final PartP2PFluids in = this.getInput();
+			if( in != null )
 			{
-				for( PartP2PFluids in : this.getInputs() )
+				in.onTunnelNetworkChange();
-				{
-					if( in != null )
-					{
-						in.onTunnelNetworkChange();
-					}
-				}
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
 			}
 		}
 	}
@@ -133,21 +124,13 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
 	{
 		if( !this.isOutput() )
 		{
-			try
+			final PartP2PFluids tun = this.getInput();
+			if( tun != null )
 			{
-				for( PartP2PFluids tun : this.getInputs() )
+				return ACTIVE_TANK;
-				{
-					if( tun != null )
-					{
-						return ACTIVE_TANK;
-					}
-				}
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
 			}
 		}
+
 		return INACTIVE_TANK;
 	}
 

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

@@ -33,6 +33,10 @@ 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;
@@ -70,22 +74,10 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
 	public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
 	{
 		this.cachedInv = null;
-		try
+		final PartP2PItems input = this.getInput();
+		if( input != null && this.isOutput() )
 		{
-			if( this.isOutput() )
+			input.onTunnelNetworkChange();
-			{
-				for( PartP2PItems input : this.getInputs() )
-				{
-					if( input != null )
-					{
-						input.onTunnelNetworkChange();
-					}
-				}
-			}
-		}
-		catch( GridAccessException e )
-		{
-			e.printStackTrace();
 		}
 	}
 
@@ -170,6 +162,51 @@ 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()
 	{
@@ -185,19 +222,10 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
 		}
 		else
 		{
-			try
+			final PartP2PItems input = this.getInput();
+			if( input != null )
 			{
-				for( PartP2PItems input : this.getInputs() )
+				input.getHost().notifyNeighbors();
-				{
-					if( input != null )
-					{
-						input.getHost().notifyNeighbors();
-					}
-				}
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
 			}
 		}
 	}

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

@@ -32,6 +32,8 @@ 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;
@@ -60,6 +62,20 @@ 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
 	{
@@ -99,17 +115,9 @@ 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( light );
+					out.setLightLevel( this.lastValue );
 				}
 			}
 			catch( final GridAccessException e )
@@ -188,22 +196,14 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
 	{
 		if( this.isOutput() )
 		{
-			try
+			final PartP2PLight src = this.getInput();
+			if( src != null && src.getProxy().isActive() )
 			{
-				int light = 0;
+				this.setLightLevel( src.lastValue );
-				for( PartP2PLight src : this.getInputs() )
-				{
-					if( src != null && src.getProxy().isActive() )
-					{
-						light = Math.max( light, src.lastValue );
-					}
-				}
-				this.setLightLevel( light );
-				this.getHost().markForUpdate();
 			}
-			catch( GridAccessException e )
+			else
 			{
-				e.printStackTrace();
+				this.getHost().markForUpdate();
 			}
 		}
 		else

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

@@ -31,6 +31,10 @@ 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;
@@ -56,25 +60,20 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 		super( is );
 	}
 
+	@MENetworkEventSubscribe
+	public void changeStateA( final MENetworkBootingStatusChange bs )
+	{
+		this.setNetworkReady();
+	}
+
 	private void setNetworkReady()
 	{
 		if( this.isOutput() )
 		{
-			try
+			final PartP2PRedstone in = this.getInput();
+			if( in != null )
 			{
-				int power = 0;
+				this.putInput( in.power );
-				for( PartP2PRedstone in : this.getInputs() )
-				{
-					if( in != null )
-					{
-						power = Math.max( power, in.power );
-					}
-				}
-				this.putInput( power );
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
 			}
 		}
 	}
@@ -87,20 +86,12 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 		}
 
 		this.recursive = true;
-		if( this.isOutput() )
+		if( this.isOutput() && this.getProxy().isActive() )
 		{
-			if( this.getProxy().isActive() )
+			final int newPower = (Integer) o;
+			if( this.power != newPower )
 			{
-				final int newPower = (Integer) o;
+				this.power = newPower;
-				if( this.power != newPower )
-				{
-					this.power = newPower;
-					this.notifyNeighbors();
-				}
-			}
-			else
-			{
-				this.power = 0;
 				this.notifyNeighbors();
 			}
 		}
@@ -120,6 +111,18 @@ 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 )
 	{
@@ -164,22 +167,7 @@ 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 ) );
-				int powerOut = this.power;
+				this.sendToOutput( 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,10 +24,6 @@ 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;
@@ -57,7 +53,6 @@ import appeng.me.cache.P2PCache;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.parts.PartBasicState;
 import appeng.util.Platform;
-import org.lwjgl.input.Keyboard;
 
 
 public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
@@ -82,13 +77,26 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 		return null;
 	}
 
-	public TunnelCollection<T> getInputs() throws GridAccessException
+	public T getInput()
 	{
-		if( this.getProxy().isActive() && this.getFrequency() != 0 )
+		if( this.getFrequency() == 0 )
 		{
-			return (TunnelCollection<T>) this.getProxy().getP2P().getInputs( this.getFrequency(), this.getClass() );
+			return null;
 		}
-		return new TunnelCollection( new ArrayList(), this.getClass() );
+
+		try
+		{
+			final PartP2PTunnel tunnel = this.getProxy().getP2P().getInput( this.getFrequency() );
+			if( this.getClass().isInstance( tunnel ) )
+			{
+				return (T) tunnel;
+			}
+		}
+		catch( final GridAccessException e )
+		{
+			// :P
+		}
+		return null;
 	}
 
 	public TunnelCollection<T> getOutputs() throws GridAccessException
@@ -156,30 +164,6 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 		super.writeToStream( data );
 		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 )
@@ -205,13 +189,8 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 		{
 			return false;
 		}
-		
+
-		boolean pasteAsOutput = true;
+		final ItemStack is = player.getHeldItem( hand );
-		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() );
@@ -232,29 +211,14 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 					final IPart testPart = ( (IPartItem) newType.getItem() ).createPartFromItemStack( newType );
 					if( testPart instanceof PartP2PTunnel )
 					{
-
-						try
-						{
-							this.getProxy().getP2P().removeTunnel( this, this.getFrequency() );
-						}
-						catch( GridAccessException e )
-						{
-							e.printStackTrace();
-						}
-
 						this.getHost().removePart( this.getSide(), true );
-
 						final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );
 						final IPart newBus = this.getHost().getPart( dir );
 
 						if( newBus instanceof PartP2PTunnel )
 						{
 							final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
-							
+							newTunnel.setOutput( true );
-							if( pasteAsOutput )
-							{
-								newTunnel.setOutput( true );
-							}
 
 							try
 							{
@@ -331,17 +295,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				final boolean oldOutput = this.isOutput();
 				final short myFreq = this.getFrequency();
 
-				try
-				{
-					this.getProxy().getP2P().removeTunnel( this, this.getFrequency() );
-				}
-				catch( GridAccessException e )
-				{
-					e.printStackTrace();
-				}
-
 				this.getHost().removePart( this.getSide(), false );
-
 				final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );
 				final IPart newBus = this.getHost().getPart( dir );
 
@@ -349,6 +303,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				{
 					final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
 					newTunnel.setOutput( oldOutput );
+					newTunnel.onTunnelNetworkChange();
 
 					try
 					{
@@ -359,10 +314,9 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 					{
 						// :P
 					}
-					newTunnel.onTunnelNetworkChange();
-
 				}
 
+				Platform.notifyBlocksOfNeighbors( this.getTile().getWorld(), this.getTile().getPos() );
 				return true;
 			}
 		}
@@ -396,38 +350,9 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				if( needsNewFrequency )
 				{
 					newFreq = this.getProxy().getP2P().newFrequency();
-
-					final ItemStack newType = this.getHost().getPart( this.getSide() ).getItemStack( PartItemStack.WRENCH );
-
-					try
-					{
-						this.getProxy().getP2P().removeTunnel( this, this.getFrequency() );
-					}
-					catch( GridAccessException e )
-					{
-						e.printStackTrace();
-					}
-
-					this.getHost().removePart( this.getSide(), false );
-
-					final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );
-					final IPart newBus = this.getHost().getPart( dir );
-
-					if( newBus instanceof PartP2PTunnel )
-					{
-						final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
-						newTunnel.setOutput( false );
-						newTunnel.getProxy().getP2P().updateFreq( newTunnel, newFreq );
-
-						newTunnel.onTunnelNetworkChange();
-					}
 				}
-				else
+
-				{
+				this.getProxy().getP2P().updateFreq( this, newFreq );
-					this.getProxy().getP2P().updateFreq( this, newFreq );
-					this.onTunnelNetworkChange();
-				}
-				Platform.notifyBlocksOfNeighbors( this.getTile().getWorld(), this.getTile().getPos() );
 			}
 			catch( final GridAccessException e )
 			{
@@ -440,17 +365,10 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 			final String type = p2pItem.getUnlocalizedName();
 
 			p2pItem.writeToNBT( data );
-			if( needsNewFrequency )
+			data.setShort( "freq", this.getFrequency() );
-			{
-				data.setShort( "freq", newFreq );
-			}
-			else
-			{
-				data.setShort( "freq", this.getFrequency() );
-			}
 
 			final AEColor[] colors = Platform.p2p().toColors( this.getFrequency() );
-			final int[] colorCode = new int[]{
+			final int[] colorCode = new int[] {
 					colors[0].ordinal(), colors[0].ordinal(), colors[1].ordinal(), colors[1].ordinal(),
 					colors[2].ordinal(), colors[2].ordinal(), colors[3].ordinal(), colors[3].ordinal(),
 			};
@@ -477,6 +395,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 
 	public void onTunnelNetworkChange()
 	{
+
 	}
 
 	protected void queueTunnelDrain( final PowerUnits unit, final double f )

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

@@ -21,14 +21,10 @@ package appeng.parts.reporting;
 
 import java.io.IOException;
 
-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.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IItemList;
 import appeng.fluids.util.AEFluidStack;
+import appeng.util.item.AEStack;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.client.renderer.GlStateManager;
@@ -47,6 +43,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.AEApi;
 import appeng.api.implementations.parts.IPartStorageMonitor;
+import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IStackWatcher;
 import appeng.api.networking.storage.IStackWatcherHost;
 import appeng.api.parts.IPartModel;
@@ -55,6 +52,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IItemList;
 import appeng.client.render.TesrRenderHelper;
 import appeng.core.localization.PlayerMessages;
 import appeng.helpers.Reflected;
@@ -82,7 +80,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 	private IAEItemStack configuredItem;
 	private IAEFluidStack configuredFluid;
-	private long configuredAmount;
 	private String lastHumanReadableText;
 	private boolean isLocked;
 	private IStackWatcher myWatcher;
@@ -223,7 +220,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 			}
 			else if( fluidInTank.amount > 0 )
 			{
-				this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank ).setStackSize( 0 );
+				this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank );
 				this.configuredItem = null;
 			}
 
@@ -307,31 +304,30 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 	private <T extends IAEStack<T>> void updateReportingValue ( final IMEMonitor<T> monitor )
 	{
+
 		if( this.configuredItem != null)
 		{
 			final IAEItemStack result = (IAEItemStack) monitor.getStorageList().findPrecise( (T) this.configuredItem );
 			if( result == null )
 			{
-				this.configuredAmount = 0;
+				this.configuredItem.setStackSize( 0 );
 			}
 			else
 			{
-				this.configuredAmount = result.getStackSize();
+				this.configuredItem.setStackSize( result.getStackSize() );
 			}
-			this.configuredItem.setStackSize( this.configuredAmount );
 		}
 		else if( this.configuredFluid != null)
 		{
 			final IAEFluidStack result = (IAEFluidStack) monitor.getStorageList().findPrecise( (T) this.configuredFluid );
 			if( result == null )
 			{
-				this.configuredAmount = 0;
+				this.configuredFluid.setStackSize( 0 );
 			}
 			else
 			{
-				this.configuredAmount = result.getStackSize();
+				this.configuredFluid.setStackSize( result.getStackSize() );
 			}
-			this.configuredFluid.setStackSize( this.configuredAmount );
 		}
 	}
 
@@ -396,38 +392,49 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		this.configureWatchers();
 	}
 
-	@MENetworkEventSubscribe
-	public void powerStatusChange( final MENetworkPowerStatusChange ev )
-	{
-		if( this.getProxy().isPowered() )
-		{
-			this.configureWatchers();
-		}
-	}
-
-	@MENetworkEventSubscribe
-	public void channelChanged( final MENetworkChannelsChanged c )
-	{
-		if( this.getProxy().isPowered() )
-		{
-			this.configureWatchers();
-		}
-	}
-
 	@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 )
 	{
-		this.configuredAmount = fullStack.getStackSize();
-
 		if( this.configuredItem != null )
 		{
-			this.configuredItem.setStackSize( this.configuredAmount );
+			if( fullStack == null )
+			{
+				this.configuredItem.setStackSize( 0 );
+			}
+			else
+			{
+				this.configuredItem.setStackSize( fullStack.getStackSize() );
+			}
+
+			final long stackSize = this.configuredItem.getStackSize();
+			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize );
+
+			if( !humanReadableText.equals( this.lastHumanReadableText ) )
+			{
+				this.lastHumanReadableText = humanReadableText;
+				this.getHost().markForUpdate();
+			}
 		}
 		else if( this.configuredFluid != null )
 		{
-			this.configuredFluid.setStackSize( this.configuredAmount );
+			if( fullStack == null )
+			{
+				this.configuredFluid.setStackSize( 0 );
+			}
+			else
+			{
+				this.configuredFluid.setStackSize( fullStack.getStackSize() );
+			}
+
+			final long stackSize = this.configuredFluid.getStackSize() / 1000;
+			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";
+
+			if( !humanReadableText.equals( this.lastHumanReadableText ) )
+			{
+				this.lastHumanReadableText = humanReadableText;
+				this.getHost().markForUpdate();
+			}
 		}
-		this.getHost().markForUpdate();
 	}
 
 	@Override

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

@@ -137,10 +137,14 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			{
 				this.insertItem( player, hand, false );
 			}
+
 		}
 
 		//If its a fluid container, grab its fluidstack. if its empty pass its itemstack;
 
+		if (eq.isEmpty()){
+			return super.onPartActivate( player, hand, pos );
+		}
 		if( fluidInTank != null && fluidInTank.amount > 0 )
 		{
 			if( getDisplayed() instanceof IAEItemStack || getDisplayed() == null )
@@ -151,14 +155,20 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			{
 				this.drainFluidContainer( player, hand );
 			}
-			else
+			else {
-			{
 				return super.onPartActivate( player, hand, pos );
 			}
 		}
-		else if( this.getDisplayed() != null && this.getDisplayed().equals( player.getHeldItem( hand ) ) )
+		else
 		{
-			this.insertItem( player, hand, false );
+			if( getDisplayed() instanceof IAEFluidStack || getDisplayed() == null )
+			{
+				return super.onPartActivate( player, hand, pos );
+			}
+			if( ( (IAEItemStack) this.getDisplayed() ).equals( eq ) )
+			{
+				this.insertItem( player, hand, false );
+			}
 		}
 		return super.onPartActivate( player, hand, pos );
 	}
@@ -181,6 +191,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			return false;
 		}
 
+		ItemStack eq = player.getHeldItem( hand );
 		if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEItemStack )
 		{
 			this.extractItem( player, ( (IAEItemStack) this.getDisplayed() ).getDefinition().getMaxStackSize() );
@@ -270,7 +281,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 	{
 		if (!(this.getDisplayed() instanceof IAEItemStack))
 			return;
-		final IAEItemStack input = (IAEItemStack) this.getDisplayed().copy();
+		final IAEItemStack input = (IAEItemStack) this.getDisplayed();
 		if( input != null )
 		{
 			try

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

@@ -1,138 +0,0 @@
-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 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 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/inventory/AppEngInternalInventory.java

@@ -123,7 +123,7 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl
 			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() || ItemStack.areItemsEqual( newStack, oldStack ) )
 			{
 				if( newStack.getCount() > oldStack.getCount() )
 				{

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

@@ -26,8 +26,6 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import appeng.me.storage.BasicCellInventoryHandler;
-import appeng.me.storage.CreativeCellInventory;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -495,15 +493,13 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 
 			try
 			{
-				if( this.getProxy().isActive() )
-				{
-					final IStorageGrid gs = this.getProxy().getStorage();
-					Platform.postChanges( gs, removed, added, this.mySrc );
-				}
 				this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
+				final IStorageGrid gs = this.getProxy().getStorage();
+				Platform.postChanges( gs, removed, added, this.mySrc );
 			}
 			catch( final GridAccessException ignored )
 			{
+
 			}
 
 			// update the neighbors
@@ -558,10 +554,14 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 	@Override
 	public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
 	{
-		this.updateHandler();
+		if( this.getProxy().isActive() )
-		if( this.cellHandler != null && this.cellHandler.getChannel() == channel )
 		{
-			return Collections.singletonList( this.cellHandler );
+			this.updateHandler();
+
+			if( this.cellHandler != null && this.cellHandler.getChannel() == channel )
+			{
+				return Collections.singletonList( this.cellHandler );
+			}
 		}
 		return Collections.emptyList();
 	}
@@ -692,16 +692,21 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 		@Override
 		public void postChange( final IBaseMonitor<T> monitor, final Iterable<T> change, final IActionSource source )
 		{
-			try
+			if( source == TileChest.this.mySrc || source.machine().map( machine -> machine == TileChest.this ).orElse( false ) )
 			{
-				if( TileChest.this.getProxy().isActive() )
+				try
 				{
-					TileChest.this.getProxy().getStorage().postAlterationOfStoredItems( this.chan, change, TileChest.this.mySrc );
+					if( TileChest.this.getProxy().isActive() )
+					{
+						TileChest.this.getProxy().getStorage().postAlterationOfStoredItems( this.chan, change, TileChest.this.mySrc );
+					}
+				}
+				catch( final GridAccessException e )
+				{
+					// :(
 				}
-			} catch ( final GridAccessException e )
-			{
-				// :(
 			}
+
 			TileChest.this.blinkCell( 0 );
 		}
 
@@ -737,15 +742,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 			{
 				return input;
 			}
-			T injected = super.injectItems( input, mode, src );
+			return super.injectItems( input, mode, src );
-			if (mode == Actionable.MODULATE && ( injected == null || injected.getStackSize() != input.getStackSize() ))
-			{
-				if( TileChest.this.getProxy().isActive() && this.getInternalHandler().getCellInv() != null )
-				{
-					TileChest.this.cellHandler.postChangesToListeners(Collections.singletonList( input.copy().setStackSize( input.getStackSize() - ( injected == null ? 0 : injected.getStackSize() ) ) ), TileChest.this.mySrc  );
-				}
-			}
-			return injected;
 		}
 
 		private boolean securityCheck( final EntityPlayer player, final SecurityPermissions requiredPermission )
@@ -789,15 +786,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 			{
 				return null;
 			}
-			T extracted = super.extractItems( request, mode, src );
+			return super.extractItems( request, mode, src );
-			if( mode == Actionable.MODULATE && extracted != null )
-			{
-				if( TileChest.this.getProxy().isActive() && this.getInternalHandler().getCellInv() != null )
-				{
-					TileChest.this.cellHandler.postChangesToListeners(Collections.singletonList( request.copy().setStackSize( -extracted.getStackSize() ) ), TileChest.this.mySrc  );
-				}
-			}
-			return extracted;
 		}
 	}
 

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

@@ -263,12 +263,10 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 
 		try
 		{
-			if( this.getProxy().isActive() )
-			{
-				final IStorageGrid gs = this.getProxy().getStorage();
-				Platform.postChanges( gs, removed, added, this.mySrc );
-			}
 			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
+
+			final IStorageGrid gs = this.getProxy().getStorage();
+			Platform.postChanges( gs, removed, added, this.mySrc );
 		}
 		catch( final GridAccessException ignored )
 		{
@@ -336,8 +334,13 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 	@Override
 	public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
 	{
-		this.updateState();
+		if( this.getProxy().isActive() )
-		return this.inventoryHandlers.get( channel );
+		{
+			this.updateState();
+
+			return this.inventoryHandlers.get( channel );
+		}
+		return Collections.emptyList();
 	}
 
 	@Override

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

@@ -418,12 +418,10 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 
 					if( possible > 0 )
 					{
-						IAEStack injectable = s.copy();
-
 						possible = Math.min( possible, itemsToMove );
-						injectable.setStackSize( possible );
+						s.setStackSize( possible );
 
-						final IAEStack extracted = src.extractItems( injectable, Actionable.MODULATE, this.mySrc );
+						final IAEStack extracted = src.extractItems( s, Actionable.MODULATE, this.mySrc );
 						if( extracted != null )
 						{
 							possible = extracted.getStackSize();
@@ -502,9 +500,8 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 		final IAEStack test = myList.getFirstItem();
 		if( test != null )
 		{
-			IAEStack testCopy = test.copy();
+			test.setStackSize( 1 );
-			testCopy.setStackSize( 1 );
+			return src.injectItems( test, Actionable.SIMULATE, this.mySrc ) != null;
-			return src.injectItems( testCopy, Actionable.SIMULATE, this.mySrc ) != null;
 		}
 		return false;
 	}

src/main/java/appeng/util/ConfigManager.java

@@ -36,7 +36,6 @@ public final class ConfigManager implements IConfigManager
 {
 	private final Map<Settings, Enum<?>> settings = new EnumMap<>( Settings.class );
 	private final IConfigManagerHost target;
-	private Map<Settings, Enum<?>> oldSettings = new EnumMap<>( Settings.class );
 
 	public ConfigManager( final IConfigManagerHost tile )
 	{
@@ -73,15 +72,10 @@ public final class ConfigManager implements IConfigManager
 	{
 		final Enum<?> oldValue = this.getSetting( settingName );
 		this.settings.put( settingName, newValue );
-		this.oldSettings.put( settingName, oldValue );
 		this.target.updateSetting( this, settingName, newValue );
 		return oldValue;
 	}
 
-	public Enum<?> getOldSetting(final Settings settingName){
-		return this.oldSettings.get( settingName );
-	}
-
 	/**
 	 * save all settings using config manager.
 	 *

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

@@ -53,7 +53,6 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
     private String displayName;
     @SideOnly(Side.CLIENT)
     private List<String> tooltip;
-    private ItemStack cachedItemStack;
 
     private AEItemStack(final AEItemStack is) {
         this.setStackSize(is.getStackSize());
@@ -251,18 +250,6 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return this.isSameType(is);
     }
 
-    @Override
-    public ItemStack getCachedItemStack()
-    {
-        return this.cachedItemStack;
-    }
-
-    @Override
-    public void setCachedItemStack( ItemStack is )
-    {
-        this.cachedItemStack = is;
-    }
-
     @Override
     public String toString() {
         return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName();

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

@@ -19,8 +19,13 @@
 package appeng.util.item;
 
 
-import java.util.*;
+import java.util.Collection;
-import java.util.concurrent.ConcurrentMap;
+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;
@@ -111,7 +116,7 @@ public class OreHelper
 	boolean sameOre( final AEItemStack aeItemStack, final IAEItemStack is )
 	{
 		final OreReference a = aeItemStack.getOre().orElse( null );
-		final OreReference b = ( (AEItemStack) is ).getOre().orElse( null );
+		final OreReference b = aeItemStack.getOre().orElse( null );
 
 		return this.sameOre( a, b );
 	}
@@ -155,53 +160,8 @@ public class OreHelper
 				}
 			}
 			return false;
-		} ).orElse( false );
+		} )
-	}
+				.orElse( false );
-
-	public Set<Integer> getMatchingOre( String allow )
-	{
-		List<String> matchingOres = new ArrayList<>();
-		ConcurrentMap<String, List<ItemStack>> oreKeys = oreDictCache.asMap();
-
-		oreKeys.forEach( ( s, l ) -> {
-
-			if( allow.startsWith( "*" ) && allow.endsWith( "*" ) )
-			{
-				if( s.contains( allow.substring( 1, allow.length() - 1 ) ) )
-				{
-					matchingOres.add( s );
-				}
-			}
-			else if( allow.startsWith( "*" ) )
-			{
-				if( s.endsWith( allow.substring( 1 ) ) )
-				{
-					matchingOres.add( s );
-				}
-			}
-			else if( allow.endsWith( "*" ) )
-			{
-				if( s.startsWith( allow.substring( 0, allow.length() - 1 ) ) )
-				{
-					matchingOres.add( s );
-				}
-			}
-			else
-			{
-				if( s.matches( allow ) )
-				{
-					matchingOres.add( s );
-				}
-			}
-		} );
-
-		Set<Integer> oreIDs = new HashSet<>();
-		for( String matchingOre : matchingOres )
-		{
-			oreIDs.add( OreDictionary.getOreID( matchingOre ) );
-		}
-
-		return oreIDs;
 	}
 
 	List<ItemStack> getCachedOres( final String oreName )

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

@@ -43,7 +43,7 @@ public class OreReference
 		return this.otherOptions;
 	}
 
-	public List<IAEItemStack> getAEEquivalents()
+	List<IAEItemStack> getAEEquivalents()
 	{
 		if( this.aeOtherOptions == null )
 		{
@@ -65,8 +65,8 @@ public class OreReference
 		return this.aeOtherOptions;
 	}
 
-	public Collection<Integer> getOres()
+	Collection<Integer> getOres()
-    {
+	{
-        return this.ores;
+		return this.ores;
-    }
+	}
 }

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

@@ -1,51 +0,0 @@
-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

@@ -133,7 +133,6 @@ 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
@@ -406,10 +405,8 @@ waila.appliedenergistics2.Showing=Showing
 waila.appliedenergistics2.Contains=Contains
 waila.appliedenergistics2.Channels=%1$d of %2$d Channels
 waila.appliedenergistics2.P2PUnlinked=Unlinked
-waila.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output
+waila.appliedenergistics2.P2PInputOneOutput=Linked (Input Side)
-waila.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs
+waila.appliedenergistics2.P2PInputManyOutputs=Linked (Input Side) - %d Outputs
-waila.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input
-waila.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs
 waila.appliedenergistics2.P2POutput=Linked (Output Side)
 
 // TheOneProbe
@@ -423,10 +420,8 @@ theoneprobe.appliedenergistics2.showing=Showing
 theoneprobe.appliedenergistics2.contains=Contains
 theoneprobe.appliedenergistics2.channels=%1$d of %2$d Channels
 theoneprobe.appliedenergistics2.p2p_unlinked=Unlinked
-theoneprobe.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output
+theoneprobe.appliedenergistics2.p2p_input_one_output=Linked (Input Side)
 theoneprobe.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs
-theoneprobe.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input
-theoneprobe.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs
 theoneprobe.appliedenergistics2.p2p_output=Linked (Output Side)
 theoneprobe.appliedenergistics2.p2p_frequency=Frequency: %1$s
 theoneprobe.appliedenergistics2.stored_energy=%1$d / %2$d
@@ -536,10 +531,8 @@ 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

@@ -1,9 +0,0 @@
-{
-    "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

@@ -1,106 +0,0 @@
-{
-    "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/part/expanded_processing_pattern_terminal_off.json

@@ -1,8 +0,0 @@
-{
-    "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

@@ -1,76 +0,0 @@
-{
-    "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

@@ -1,130 +0,0 @@
-{
-    "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/recipes/network/parts/terminal_expanded_processing.json

@@ -1,41 +0,0 @@
-{
-  "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"
-    }
-  }
-}