Merge pull request #1 from talchas/rv6-1.12

merge talchas fixes

README.md

@@ -1,15 +1,34 @@
-This is a fork of AE2 i made for trying to solve issues for the [Omnifactory](https://www.curseforge.com/minecraft/modpacks/omnifactory) modpack.
+[![Travis](https://img.shields.io/travis/AppliedEnergistics/Applied-Energistics-2.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/AppliedEnergistics/Applied-Energistics-2)
+[![Latest Release](https://img.shields.io/github/release/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest%20Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
 
-See https://github.com/PrototypeTrousers/Applied-Energistics-2/tree/AE2-Omnifactory branch for commits
-and
-https://github.com/PrototypeTrousers/Applied-Energistics-2/releases for the compiled jars.
+# Applied Energistics 2
 
-# Applied Energistics 2 (PrototypeTrousers fork for Omnifactory)
+## Table of Contents
+
+* [About](#about)
+* [Contacts](#contacts)
+* [License](#license)
+* [Downloads](#downloads)
+* [Installation](#installation)
+* [Issues](#issues)
+* [Building](#building)
+* [Contribution](#contribution)
+* [API](#applied-energistics-2-api)
+* [CraftTweaker](#applied-energistics-2-crafttweaker)
+* [Localization](#applied-energistics-2-localization)
+* [Credits](#credits)
 
 ## About
 
 A Mod about Matter, Energy and using them to conquer the world..
 
+## Contacts
+
+* [Website](http://ae-mod.info/)
+* [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
+* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
+* [Discord](https://discord.gg/GygKjjm)
+
 ## License
 
 * Applied Energistics 2 API
@@ -24,6 +43,198 @@ A Mod about Matter, Energy and using them to conquer the world..
 * Text and Translations
   - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)
 
+## Downloads
+
+Downloads can be found on [CurseForge](http://www.curse.com/mc-mods/minecraft/223794-applied-energistics-2) or on the [official website](http://ae-mod.info/Downloads/).
+
+## Installation
+
+You install this mod by putting it into the `minecraft/mods/` folder. It has no additional hard dependencies.
+
+## Issues
+
+Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!
+
+1. Make sure your issue has not already been answered or fixed and you are using the latest version. Also think about whether your issue is a valid one before submitting it.
+    * If it is already possible with vanilla and AE2 itself, the suggestion will be considered invalid.
+    * Asking for a smaller version, more compact version, or more efficient version of something will also be considered invalid.
+2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
+3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
+    * Do not tag it with something like `[Feature]`, `[Bug]`, or a version.
+    * Restrict it to a single bug or feature, it makes managing them way easier for us.
+    * The following details are required. Also refer to the issue template when creating one.
+        * Forge version
+        * AE2 version
+        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
+            * Never post an excerpt of what you consider important
+            * Always post the full log
+        * Other mods and their version, when reporting an issue between AE and another mod
+            * Also consider updating these before submitting a new issue, it might be already fixed
+        * A detailed description of the bug or feature
+    * To further help in resolving your issues please try to include the follow if applicable:
+        * What was expected?
+        * How to reproduce the problem?
+            * This is usually a great detail and allows us to fix it way faster
+        * Server or Single Player?
+        * Screen shots or Pictures of the problem
+        * Mod Pack using and version?
+            * Keep in mind that some mods might use an outdated version of AE2
+            * If so you should report it to your modpack
+4. Click `Submit New Issue`, and wait for feedback!
+
+Providing as many details as possible does help us to find and resolve the issue faster and also you getting a fixed version as fast as possible.
+
+Please note that we might close any issue not matching these requirements. 
+
+## Building
+
+1. Clone this repository via 
+  - SSH `git clone git@github.com:AppliedEnergistics/Applied-Energistics-2.git` or 
+  - HTTPS `git clone https://github.com/AppliedEnergistics/Applied-Energistics-2.git`
+2. Setup workspace 
+  - Decompiled source `gradlew setupDecompWorkspace`
+  - Obfuscated source `gradlew setupDevWorkspace`
+  - CI server `gradlew setupCIWorkspace`
+3. Build `gradlew build`. Jar will be in `build/libs`
+4. For core developer: Setup IDE
+  - IntelliJ: Import into IDE, execute `gradlew genIntellijRuns` and change RunConfiguration to `*_main` as quickfix for [ForgeGradle](https://github.com/MinecraftForge/ForgeGradle/issues/357)
+  - Eclipse: execute `gradlew eclipse`
+5. For add-on developer: Core-Mod Detection
+  - In order to have FML detect AE from your dev environment, add the following VM Option to your run profile
+  - `-Dfml.coreMods.load=appeng.coremod.AppEngCore`
+
+## Contribution
+
+Before you want to add major changes, you might want to discuss them with us first, before wasting your time.
+If you are still willing to contribute to this project, you can contribute via [Pull-Request](https://help.github.com/articles/creating-a-pull-request).
+
+The [guidelines for contributing](https://github.com/AppliedEnergistics/Applied-Energistics-2/blob/master/.github/CONTRIBUTING.md) contain more detailed information about topics like the used code style and should also be considered.
+
+Here are a few things to keep in mind that will help get your PR approved.
+
+* A PR should be focused on content. Any PRs where the changes are only syntax will be rejected.
+* Use the file you are editing as a style guide.
+* Consider your feature. [Suggestion Guidelines](http://ae-mod.info/Suggestion-Guidelines/)
+  - Is your suggestion already possible using Vanilla + AE2?
+  - Make sure your feature isn't already in the works, or hasn't been rejected previously.
+  - Does your feature simplify another feature of AE2? These changes will not be accepted.
+  - If your feature can be done by any popular mod, discuss with us first.
+
+**Getting Started**
+
+1. Fork this repository
+2. Clone the fork via
+  * SSH `git clone git@github.com:<your username>/Applied-Energistics-2.git` or 
+  * HTTPS `git clone https://github.com/<your username>/Applied-Energistics-2.git`
+3. Change code base
+4. Add changes to git `git add -A`
+5. Commit changes to your clone `git commit -m "<summary of made changes>"`
+6. Push to your fork `git push`
+7. Create a Pull-Request on GitHub
+8. Wait for review
+9. Squash commits for cleaner history
+
+If you are only doing single file pull requests, GitHub supports using a quick way without the need of cloning your fork. Also read up about [synching](https://help.github.com/articles/syncing-a-fork) if you plan to contribute on regular basis.
+
+## Applied Energistics 2 API
+
+The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general.
+
+Universal builds obtained [Here](http://ae2.ae-mod.info/Downloads/) should work in a development environment.
+
+### Maven
+
+When compiling against the AE2 API you can use gradle dependencies, just add
+
+    dependencies {
+        compile "appeng:appliedenergistics2:rv_-_____-__:api"
+    }
+
+or add the compile line to your existing dependencies task to your build.gradle
+
+Where the __ are filled in with the correct version criteria; AE2 is available from the default forge maven so no additional repositories are necessary.
+
+An example string would be `appeng:appliedenergistics2:rv5-stable-1:api` for the API only or `appeng:appliedenergistics2:rv5-stable-1`  for the whole mod.
+
+## Applied Energistics 2 CraftTweaker
+
+### Inscriber
+Add a recipe. When `inscribe` is true the bottom and top inputs are not consumed.
+
+	mods.appliedenergistics2.Inscriber.addRecipe(ItemStack output, ItemStack input, boolean inscribe, 
+	                                             @Optional ItemStack topInput, @Optional ItemStack bottomInput );
+
+Remove all recipes for this output stack. 
+	                                             
+	mods.appliedenergistics2.Inscriber.removeRecipe(ItemStack output);	
+
+### Grindstone
+Add a recipe.
+
+	mods.appliedenergistics2.Grinder.addRecipe( ItemStack output, ItemStack input, int turns, 
+	                                            @Optional ItemStack secondary1Output, @Optional float secondary1Chance,
+	                                            @Optional ItemStack secondary2Output, @Optional float secondary2Chance);
+	
+Remove recipes for this input.
+
+	mods.appliedenergistics2.Grinder.removeRecipe(ItemStack input);	
+
+### Spatial
+Whitelist a TileEntity class for Spatial IO.
+
+	mods.appliedenergistics2.Spatial.whitelistEntity( String fullEntityClassName );
+
+### Attunement
+Attune a ItemStack or ModID to a specific P2P-Tunnel type. ModID's are used as fallback when no ItemStack was found.
+
+	mods.appliedenergistics2.Attunement.attuneME( ItemStack itemStack );
+	mods.appliedenergistics2.Attunement.attuneME( String modID );
+	mods.appliedenergistics2.Attunement.attuneItem( ItemStack itemStack );
+	mods.appliedenergistics2.Attunement.attuneItem( String modID );
+	mods.appliedenergistics2.Attunement.attuneFluid( ItemStack itemStack );
+	mods.appliedenergistics2.Attunement.attuneFluid( String modID );
+	mods.appliedenergistics2.Attunement.attuneRedstone( ItemStack itemStack );
+	mods.appliedenergistics2.Attunement.attuneRedstone( String modID );
+	mods.appliedenergistics2.Attunement.attuneRF( ItemStack itemStack );
+	mods.appliedenergistics2.Attunement.attuneRF( String modID );
+	mods.appliedenergistics2.Attunement.attuneIC2( ItemStack itemStack );
+	mods.appliedenergistics2.Attunement.attuneIC2( String modID );
+	mods.appliedenergistics2.Attunement.attuneLight( ItemStack itemStack );
+	mods.appliedenergistics2.Attunement.attuneLight( String modID );
+
+### Cannon
+Add ammo types for the matter cannon.
+
+	mods.appliedenergistics2.Cannon.registerAmmo( ItemStack itemStack, double weight );
+
+## Applied Energistics 2 Localization
+
+### English Text
+
+`en_US` is included in this repository, fixes to typos are welcome.
+
+### Encoding
+
+Files must be encoded as UTF-8.
+
+### New or updated Translations
+
+The language files are located in `/src/main/resources/assets/appliedenergistics2/lang/` and use the [appropriate locale code](http://minecraft.gamepedia.com/Language) as name and `.lang` as extension.
+
+To update an translation edit the corresponding file and improve/correct the existing entry. Or copy any entries from `en_US.lang` for missing translation.
+
+To create a new translation, copy the contents of `en_US.lang`, create a new file with appropriate filename, and translate it to your language.
+
+Please keep in mind that we use [String format](https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html) to pass additional data to the text for displaying.
+Therefore you should preserve parts like `%s` or `%1$d%%`, which allows us to replace them with the correct values while you still have the option to change their order for match the rules of grammar.
+This might not be possible for some languages. Should this be the case, please contact us.
+
+### Final Note
+
+If you have have issues localizing something feel free to contact us on IRC, at #AppliedEnergistics on Esper.net
+
+Thanks to everyone helping out to improve localization of AE2.
+
 ## Credits
 
 Thanks to

build.gradle

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

gradle.properties

@@ -1,16 +1,15 @@
 aeversion=rv6
-aechannel=stable
-aebuild=7
+aechannel=alpha
+aebuild=0
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v21b
 
 #########################################################
 # Versions                                              #
 #########################################################
 minecraft_version=1.12.2
 mcp_mappings=snapshot_20171003
-forge_version=14.23.5.2847
+forge_version=14.23.5.2768
 
 #########################################################
 # Installable                                           #
@@ -20,7 +19,7 @@ hwyla_version=1.8.26-B41_1.12.2
 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=4.16.1.302
+jei_version=4.13.0.219
 tesla_version=1.0.63
 ic2_version=2.8.73-ex112
 top_version=1.12-1.4.23-16

gradle/scripts/dependencies.gradle

@@ -19,11 +19,6 @@
 repositories {
     mavenLocal()
 
-    maven {
-        name = "storagedrawers"
-        url = "https://dl.bintray.com/jaquadro/dev/"
-    }
-
     maven {
         name "Mobius"
         url "http://mobiusstrip.eu/maven"
@@ -85,9 +80,6 @@ configurations {
 }
 
 dependencies {
-    compileOnly "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2:api"
-    compileOnly "gregtechce:gregtech:1.12.2:1.12.0.662"
-
     // installable runtime dependencies
     mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
     mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
@@ -106,8 +98,6 @@ dependencies {
 
     // at runtime, use the full JEI jar
     runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
-    runtime "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2"
-    runtime "com.jaquadro.minecraft.chameleon:Chameleon:1.12-4.1.3"
 
     // unit test dependencies
     testCompile "junit:junit:4.12"

src/api/java/appeng/api/config/ActionItems.java

@@ -26,20 +26,5 @@ package appeng.api.config;
 
 public enum ActionItems
 {
-	WRENCH,
-	CLOSE,
-	STASH,
-	ENCODE,
-	SUBSTITUTION,
-	MULTIPLY_BY_TWO,
-	MULTIPLY_BY_THREE,
-	INCREASE_BY_ONE,
-	DIVIDE_BY_TWO,
-	DIVIDE_BY_THREE,
-	DECREASE_BY_ONE,
-	MAX_COUNT,
-	FREE_MOLECULAR_SLOT_SHORTCUT,
-	TOGGLE_SHOW_FULL_INTERFACES_ON,
-	TOGGLE_SHOW_FULL_INTERFACES_OFF,
-	HIGHLIGHT_INTERFACE
+	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
 }

src/api/java/appeng/api/config/FuzzyMode.java

@@ -23,38 +23,18 @@
 
 package appeng.api.config;
 
-public enum FuzzyMode {
-    /**
-     * Matches any item from undamaged to including 0% durability, but not negative durability (where item damage
-     * exceeds maxdamage).
-     */
-    IGNORE_ALL(-1),
-    /**
-     * Matches items that have less than 100% durability (that is, at least 1 damage point) if a damaged item is used as
-     * the filter, or undamaged items otherwise.
-     */
-    PERCENT_99(0),
-    /**
-     * If an item with less than 75% durability is used as the filter, items with less than 75% durability are matched.
-     * Otherwise items with 75% durability or more are matched.
-     */
-    PERCENT_75(25),
-    /**
-     * If an item with less than 50% durability is used as the filter, items with less than 50% durability are matched.
-     * Otherwise items with 50% durability or more are matched.
-     */
-    PERCENT_50(50),
-    /**
-     * If an item with less than 25% durability is used as the filter, items with less than 50% durability are matched.
-     * Otherwise items with 25% durability or more are matched.
-     */
-    PERCENT_25(75);
 
-    public final float breakPoint;
-    /**
-     * Note this is percentage "damaged". It's the inverse of percentage durability.
-     */
-    public final float percentage;
+public enum FuzzyMode
+{
+	// Note that percentage damaged, is the inverse of percentage durability.
+	IGNORE_ALL( -1 ),
+	PERCENT_99( 0 ),
+	PERCENT_75( 25 ),
+	PERCENT_50( 50 ),
+	PERCENT_25( 75 );
+
+	public final float breakPoint;
+	public final float percentage;
 
 	FuzzyMode( final float p )
 	{

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

@@ -112,13 +112,4 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 * @return definition stack
 	 */
 	ItemStack getDefinition();
-
-	/**
-	 * Compare this AE item stack to another item stack, but ignores the amount. It checks the item type, NBT and damage
-	 * values.
-	 *
-	 * @param is An item stack
-	 */
-	boolean equals(ItemStack is);
-
 }

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

@@ -23,24 +23,27 @@
 
 package appeng.api.storage.data;
 
+
 import java.io.IOException;
 
 import io.netty.buffer.ByteBuf;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;
 
-public interface IAEStack<T extends IAEStack<T>> {
+
+public interface IAEStack<T extends IAEStack<T>>
+{
 
 	/**
 	 * add two stacks together
 	 *
 	 * @param is added item
 	 */
-	void add(T is);
+	void add( T is );
 
 	/**
 	 * number of items in the stack.
@@ -54,7 +57,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @param stackSize , ItemStack.stackSize = N
 	 */
-	T setStackSize(long stackSize);
+	T setStackSize( long stackSize );
 
 	/**
 	 * Same as getStackSize, but for requestable items. ( LP )
@@ -68,7 +71,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @return basically itemStack.stackSize = N but for setStackSize items.
 	 */
-	T setCountRequestable(long countRequestable);
+	T setCountRequestable( long countRequestable );
 
 	/**
 	 * true, if the item can be crafted.
@@ -82,7 +85,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @param isCraftable can item be crafted
 	 */
-	T setCraftable(boolean isCraftable);
+	T setCraftable( boolean isCraftable );
 
 	/**
 	 * clears, requestable, craftable, and stack sizes.
@@ -101,33 +104,33 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @param i additional stack size
 	 */
-	void incStackSize(long i);
+	void incStackSize( long i );
 
 	/**
 	 * removes some from the stack size.
 	 */
-	void decStackSize(long i);
+	void decStackSize( long i );
 
 	/**
 	 * adds items to the requestable
 	 *
 	 * @param i increased amount of requested items
 	 */
-	void incCountRequestable(long i);
+	void incCountRequestable( long i );
 
 	/**
 	 * removes items from the requestable
 	 *
 	 * @param i decreased amount of requested items
 	 */
-	void decCountRequestable(long i);
+	void decCountRequestable( long i );
 
 	/**
-	 * write to a CompoundNBT.
+	 * write to a NBTTagCompound.
 	 *
 	 * @param i to be written data
 	 */
-	void writeToNBT( NBTTagCompound i);
+	void writeToNBT( NBTTagCompound i );
 
 	/**
 	 * Compare stacks using precise logic.
@@ -143,18 +146,17 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 * @return true if they are the same.
 	 */
 	@Override
-	boolean equals(Object obj);
+	boolean equals( Object obj );
 
 	/**
-	 * Compare the same subtype of {@link IAEStack} with another using a fuzzy
-	 * comparison.
+	 * Compare the same subtype of {@link IAEStack} with another using a fuzzy comparison.
 	 *
 	 * @param other The stack to compare.
-	 * @param mode  Which {@link FuzzyMode} should be used.
+	 * @param mode Which {@link FuzzyMode} should be used.
 	 *
 	 * @return true if two stacks are equal based on AE Fuzzy Comparison.
 	 */
-	boolean fuzzyComparison(T other, FuzzyMode mode);
+	boolean fuzzyComparison( T other, FuzzyMode mode );
 
 	/**
 	 * Slower for disk saving, but smaller/more efficient for packets.
@@ -163,7 +165,7 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 *
 	 * @throws IOException
 	 */
-	void writeToPacket( ByteBuf data) throws IOException;
+	void writeToPacket( ByteBuf data ) throws IOException;
 
 	/**
 	 * Clone the Item / Fluid Stack
@@ -180,7 +182,17 @@ public interface IAEStack<T extends IAEStack<T>> {
 	T empty();
 
 	/**
-	 * @return The {@link IStorageChannel} backing this stack.
+	 * @return true if the stack is a {@link IAEItemStack}
+	 */
+	boolean isItem();
+
+	/**
+	 * @return true if the stack is a {@link IAEFluidStack}
+	 */
+	boolean isFluid();
+
+	/**
+	 * @return ITEM or FLUID
 	 */
 	IStorageChannel<T> getChannel();
 
@@ -190,4 +202,4 @@ public interface IAEStack<T extends IAEStack<T>> {
 	 * @return itemstack
 	 */
 	ItemStack asItemStackRepresentation();
-}
+}

src/api/java/yalter/mousetweaks/api/IMTModGuiContainer2.java

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

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

@@ -19,7 +19,6 @@
 package appeng.capabilities;
 
 
-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.darkhax.tesla.api.ITeslaConsumer;
 import net.darkhax.tesla.api.ITeslaHolder;
 import net.minecraft.nbt.NBTBase;
@@ -55,8 +54,6 @@ public final class Capabilities
 
 	public static Capability<IEnergyStorage> FORGE_ENERGY;
 
-	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY;
-
 	/**
 	 * Register AE2 provided capabilities.
 	 */
@@ -102,9 +99,6 @@ public final class Capabilities
 		FORGE_ENERGY = cap;
 	}
 
-	@CapabilityInject( IItemRepository.class )
-	private static void capIItemRepositoryRegistered( Capability<IItemRepository> cap ) { ITEM_REPOSITORY_CAPABILITY = cap; }
-
 	// Create a storage implementation that does not do anything
 	private static <T> Capability.IStorage<T> createNullStorage()
 	{

src/main/java/appeng/client/ClientHelper.java

@@ -25,7 +25,6 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Random;
 
-import appeng.helpers.HighlighterHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.settings.KeyBinding;
@@ -38,7 +37,6 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.client.event.RenderLivingEvent;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeModContainer;
@@ -108,11 +106,6 @@ public class ClientHelper extends ServerHelper
 		}
 	}
 
-	@SubscribeEvent
-	public void renderWorldLastEvent( RenderWorldLastEvent event) {
-		HighlighterHandler.tick(event);
-	}
-
 	@Override
 	public World getWorld()
 	{

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

@@ -31,13 +31,10 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import appeng.tile.inventory.AppEngInternalInventory;
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 
-import net.minecraftforge.fml.common.Optional;
-import net.minecraftforge.items.IItemHandler;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -90,11 +87,9 @@ import appeng.core.sync.packets.PacketSwapSlots;
 import appeng.fluids.client.render.FluidStackSizeRenderer;
 import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
-import yalter.mousetweaks.api.IMTModGuiContainer2;
 
 
-@Optional.Interface( iface = "yalter.mousetweaks.api.IMTModGuiContainer2", modid = "mousetweaks" )
-public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContainer2
+public abstract class AEBaseGui extends GuiContainer
 {
 	private final List<InternalSlotME> meSlots = new ArrayList<>();
 	// drag y
@@ -380,59 +375,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				}
 			}
 		}
-		else if( slot instanceof SlotDisconnected )
-		{
-			this.drag_click.add( slot );
-			if( this.drag_click.size() > 1 )
-			{
-				if( !itemstack.isEmpty() )
-				{
-					Set<IItemHandler> visitedInterfaces = new HashSet<>();
-					for( final Slot dr : this.drag_click )
-					{
-						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
-						if (visitedInterfaces.contains( interfaceHandler )) break;
-						visitedInterfaces.add( interfaceHandler );
-						boolean canInsert = true;
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
-						{
-							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), itemstack ) )
-							{
-								canInsert = false;
-								break;
-							}
-						}
-						if( canInsert )
-						{
-							if( slot.getStack().isEmpty() )
-							{
-								InventoryAction action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-								final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
-								NetworkHandler.instance().sendToServer( p );
-							}
-						}
-					}
-				}
-
-				else if( isShiftKeyDown() )
-				{
-					for( final Slot dr : this.drag_click )
-					{
-						InventoryAction action = null;
-						if( !slot.getStack().isEmpty() )
-						{
-							action = InventoryAction.SHIFT_CLICK;
-						}
-						if( action != null )
-						{
-							final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
-							NetworkHandler.instance().sendToServer( p );
-						}
-					}
-				}
-			}
-		}
-
 		else
 		{
 			super.mouseClickMove( x, y, c, d );
@@ -526,35 +468,12 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 
 		if( slot instanceof SlotDisconnected )
 		{
-			if( this.drag_click.size() > 1 )
-			{
-				return;
-			}
-
 			InventoryAction action = null;
 
-			switch ( clickType )
+			switch( clickType )
 			{
 				case PICKUP: // pickup / set-down.
-					if( slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty() )
-					{
-						boolean canInsert = true;
-						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
-						{
-							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
-							{
-								canInsert = false;
-								break;
-							}
-						}
-						if( canInsert )
-						{
-							action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-						}
-						break;
-					}
-					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 ) action = InventoryAction.PICKUP_OR_SET_DOWN;
+					action = ( mouseButton == 1 ) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
 					break;
 				case QUICK_MOVE:
 					action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
@@ -783,16 +702,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				}
 			}
 		}
-		if( slot instanceof SlotFake )
-		{
-			final ItemStack stack = ( (SlotFake) slot ).getStack();
-			if( stack != ItemStack.EMPTY )
-			{
-				InventoryAction direction = wheel > 0 ? InventoryAction.PLACE_SINGLE : InventoryAction.PICKUP_SINGLE;
-				final PacketInventoryAction p = new PacketInventoryAction( direction , slot.slotNumber , 0);
-				NetworkHandler.instance().sendToServer( p );
-			}
-		}
 	}
 
 	protected boolean enableSpaceClicking()
@@ -1052,53 +961,4 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		return this.meSlots;
 	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isMouseTweaksDisabled()
-	{
-		return false;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isWheelTweakDisabled()
-	{
-		return true;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public Container MT_getContainer()
-	{
-		return this.inventorySlots;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public Slot MT_getSlotUnderMouse()
-	{
-		return getSlotUnderMouse();
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isCraftingOutput( Slot slot )
-	{
-		return slot instanceof SlotOutput || slot instanceof AppEngCraftingSlot;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_isIgnored( Slot slot )
-	{
-		return false;
-	}
-
-	@Override
-	@Optional.Method( modid = "mousetweaks" )
-	public boolean MT_disableRMBDraggingFunctionality()
-	{
-		return false;
-	}
 }

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

@@ -1,97 +0,0 @@
-package appeng.client.gui;
-
-import javax.annotation.Nullable;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.implementations.GuiCraftAmount;
-import appeng.client.gui.implementations.GuiCraftConfirm;
-import appeng.client.gui.implementations.GuiCraftingCPU;
-import appeng.client.gui.widgets.GuiCustomSlot;
-import appeng.container.implementations.ContainerCraftAmount;
-import mezz.jei.api.gui.IAdvancedGuiHandler;
-import net.minecraft.client.renderer.RenderItem;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-
-public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>
-{
-
-    @Override
-    public Class<AEBaseGui> getGuiContainerClass()
-    {
-        return AEBaseGui.class;
-    }
-
-    @Nullable
-    @Override
-    public List<Rectangle> getGuiExtraAreas( AEBaseGui guiContainer )
-    {
-        return Collections.emptyList();
-    }
-
-    @Nullable
-    @Override
-    public Object getIngredientUnderMouse( AEBaseGui guiContainer, int mouseX, int mouseY )
-    {
-        List<IAEItemStack> visual = new ArrayList<>();
-        int guiSlotIdx = 0;
-        Object result = null;
-        if( guiContainer instanceof GuiCraftConfirm )
-        {
-            guiSlotIdx = getSlotidx( guiContainer, mouseX, mouseY, ( (GuiCraftConfirm) guiContainer ).getDisplayedRows() );
-            visual = ( (GuiCraftConfirm) guiContainer ).getVisual();
-            if( guiSlotIdx < visual.size() && guiSlotIdx != -1 )
-            {
-                result = visual.get( guiSlotIdx ).getDefinition();
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        if( guiContainer instanceof GuiCraftingCPU )
-        {
-            guiSlotIdx = getSlotidx( guiContainer, mouseX, mouseY, ( (GuiCraftingCPU) guiContainer ).getDisplayedRows() );
-            visual = ( (GuiCraftingCPU) guiContainer ).getVisual();
-            if( guiSlotIdx < visual.size() && guiSlotIdx != -1 )
-            {
-                result = visual.get( guiSlotIdx ).getDefinition();
-            }
-            else
-            {
-                return null;
-            }
-        }
-        
-        if( guiContainer instanceof GuiCraftAmount )
-        {
-            if( guiContainer.getSlotUnderMouse() != null )
-            {
-                result = guiContainer.getSlotUnderMouse().getStack();
-            }
-        }
-        return result;
-    }
-
-    private int getSlotidx(AEBaseGui guiContainer, int mouseX, int mouseY, int rows)
-    {
-        int guileft = guiContainer.getGuiLeft();
-        int guitop = guiContainer.getGuiTop();
-        int currentScroll = guiContainer.getScrollBar().getCurrentScroll();
-        final int xo = 9;
-        final int yo = 19;
-
-        int guiSlotx = ( mouseX - guileft - xo ) / 67;
-        if( guiSlotx > 2 || mouseX < guileft + xo ) return -1;
-        int guiSloty = ( mouseY - guitop - yo ) / 23;
-        if( guiSloty > ( rows - 1 ) || mouseY < guitop + yo ) return -1;
-        return ( guiSloty * 3 ) + guiSlotx + ( currentScroll * 3 );
-    }
-}

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

@@ -582,14 +582,4 @@ public class GuiCraftConfirm extends AEBaseGui
 			}
 		}
 	}
-
-	public List<IAEItemStack> getVisual()
-	{
-		return visual;
-	}
-
-	public int getDisplayedRows()
-	{
-		return this.rows;
-	}
 }

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

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

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

@@ -20,17 +20,20 @@ package appeng.client.gui.implementations;
 
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
 
-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.util.BlockPosUtils;
 import com.google.common.collect.HashMultimap;
 
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -46,12 +49,6 @@ import appeng.container.implementations.ContainerInterfaceTerminal;
 import appeng.core.localization.GuiText;
 import appeng.parts.reporting.PartInterfaceTerminal;
 import appeng.util.Platform;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextComponentString;
-
-
-import static appeng.client.render.BlockPosHighlighter.hilightBlock;
 
 
 public class GuiInterfaceTerminal extends AEBaseGui
@@ -60,33 +57,26 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private static final int LINES_ON_PAGE = 6;
 
 	// TODO: copied from GuiMEMonitorable. It looks not changed, maybe unneeded?
-	private final int offsetX = 21;
+	private final int offsetX = 9;
 
 	private final HashMap<Long, ClientDCInternalInv> byId = new HashMap<>();
 	private final HashMultimap<String, ClientDCInternalInv> byName = HashMultimap.create();
-	private final HashMap<ClientDCInternalInv,BlockPos> blockPosHashMap = new HashMap<>();
-	private final HashMap<GuiButton,ClientDCInternalInv> guiButtonHashMap = new HashMap<>();
 	private final ArrayList<String> names = new ArrayList<>();
 	private final ArrayList<Object> lines = new ArrayList<>();
 
 	private final Map<String, Set<Object>> cachedSearches = new WeakHashMap<>();
 
 	private boolean refreshList = false;
-	private MEGuiTextField searchFieldOutputs;
-	private MEGuiTextField searchFieldInputs;
-	private PartInterfaceTerminal partInterfaceTerminal;
-	private GuiButton guiButtonHide;
-	private GuiButton guiButtonNextAssembler;
+	private MEGuiTextField searchField;
 
 	public GuiInterfaceTerminal( final InventoryPlayer inventoryPlayer, final PartInterfaceTerminal te )
 	{
 		super( new ContainerInterfaceTerminal( inventoryPlayer, te ) );
 
-		this.partInterfaceTerminal = te;
 		final GuiScrollbar scrollbar = new GuiScrollbar();
 		this.setScrollBar( scrollbar );
-		this.xSize = 208;
-		this.ySize = 256;
+		this.xSize = 195;
+		this.ySize = 222;
 	}
 
 	@Override
@@ -94,64 +84,36 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		super.initGui();
 
-		this.getScrollBar().setLeft( 189 );
+		this.getScrollBar().setLeft( 175 );
 		this.getScrollBar().setHeight( 106 );
-		this.getScrollBar().setTop( 51 );
+		this.getScrollBar().setTop( 18 );
 
-		this.searchFieldInputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 32, this.offsetX ), this.guiTop + 25, 65, 12 );
-		this.searchFieldInputs.setEnableBackgroundDrawing( false );
-		this.searchFieldInputs.setMaxStringLength( 25 );
-		this.searchFieldInputs.setTextColor( 0xFFFFFF );
-		this.searchFieldInputs.setVisible( true );
-		this.searchFieldInputs.setFocused( false );
-
-		this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 32, this.offsetX ), this.guiTop + 38, 65, 12 );
-		this.searchFieldOutputs.setEnableBackgroundDrawing( false );
-		this.searchFieldOutputs.setMaxStringLength( 25 );
-		this.searchFieldOutputs.setTextColor( 0xFFFFFF );
-		this.searchFieldOutputs.setVisible( true );
-		this.searchFieldOutputs.setFocused( true );
-
-		this.searchFieldInputs.setText( partInterfaceTerminal.in );
-		this.searchFieldOutputs.setText( partInterfaceTerminal.out );
-	}
-
-	@Override
-	public void onGuiClosed()
-	{
-		partInterfaceTerminal.saveSearchStrings( this.searchFieldInputs.getText().toLowerCase(), this.searchFieldOutputs.getText().toLowerCase() );
-		super.onGuiClosed();
-	}
-
-	@Override
-	protected boolean isPointInRegion( int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY )
-	{
-		if( searchFieldInputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop , "Inputs OR names" );
-		else if( searchFieldOutputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop, "Outputs OR names" );
-		return super.isPointInRegion( rectX, rectY, rectWidth, rectHeight, pointX, pointY );
+		this.searchField = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 );
+		this.searchField.setEnableBackgroundDrawing( false );
+		this.searchField.setMaxStringLength( 25 );
+		this.searchField.setTextColor( 0xFFFFFF );
+		this.searchField.setVisible( true );
+		this.searchField.setFocused( true );
 	}
 
 	@Override
 	public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
-		this.buttonList.clear();
-
 		this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
-		this.fontRenderer.drawString( GuiText.inventory.getLocal(), this.offsetX + 2, this.ySize - 96 + 3, 4210752 );
+		this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
 
 		final int ex = this.getScrollBar().getCurrentScroll();
 
-		this.guiButtonNextAssembler = new GuiImgButton(guiLeft + 123, guiTop + 25,Settings.ACTIONS, ActionItems.FREE_MOLECULAR_SLOT_SHORTCUT);
-		this.buttonList.add( guiButtonNextAssembler );
+		final Iterator<Slot> o = this.inventorySlots.inventorySlots.iterator();
+		while( o.hasNext() )
+		{
+			if( o.next() instanceof SlotDisconnected )
+			{
+				o.remove();
+			}
+		}
 
-		guiButtonHide = new GuiImgButton( guiLeft + 141, guiTop + 25,Settings.ACTIONS, this.partInterfaceTerminal.onlyInterfacesWithFreeSlots ?
-																							ActionItems.TOGGLE_SHOW_FULL_INTERFACES_OFF :
-																							ActionItems.TOGGLE_SHOW_FULL_INTERFACES_ON);
-		this.buttonList.add( guiButtonHide );
-
-		this.inventorySlots.inventorySlots.removeIf( slot -> slot instanceof SlotDisconnected );
-
-		int offset = 51;
+		int offset = 17;
 		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
 		{
 			final Object lineObj = this.lines.get( ex + x );
@@ -160,13 +122,8 @@ public class GuiInterfaceTerminal extends AEBaseGui
 				final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
 				for( int z = 0; z < inv.getInventory().getSlots(); z++ )
 				{
-					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 22, 1 + offset ) );
+					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) );
 				}
-
-				GuiButton guiButton = new GuiImgButton(guiLeft + 4, guiTop + offset + 1, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE);
-				guiButtonHashMap.put( guiButton , inv);
-				this.buttonList.add( guiButton );
-
 			}
 			else if( lineObj instanceof String )
 			{
@@ -182,7 +139,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					name = name.substring( 0, name.length() - 1 );
 				}
 
-				this.fontRenderer.drawString( name, this.offsetX + 2, 6 + offset, 4210752 );
+				this.fontRenderer.drawString( name, 10, 6 + offset, 4210752 );
 			}
 			offset += 18;
 		}
@@ -191,66 +148,24 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	@Override
 	protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
 	{
-		this.searchFieldInputs.mouseClicked( xCoord, yCoord, btn );
+		this.searchField.mouseClicked( xCoord, yCoord, btn );
 
-		if( btn == 1 && this.searchFieldInputs.isMouseIn( xCoord, yCoord ) )
+		if( btn == 1 && this.searchField.isMouseIn( xCoord, yCoord ) )
 		{
-			this.searchFieldInputs.setText( "" );
-			this.refreshList();
-		}
-
-		this.searchFieldOutputs.mouseClicked( xCoord, yCoord, btn );
-
-		if( btn == 1 && this.searchFieldOutputs.isMouseIn( xCoord, yCoord ) )
-		{
-			this.searchFieldOutputs.setText( "" );
+			this.searchField.setText( "" );
 			this.refreshList();
 		}
 
 		super.mouseClicked( xCoord, yCoord, btn );
 	}
 
-	@Override
-	protected void actionPerformed( final GuiButton btn ) throws IOException
-	{
-		if( guiButtonHashMap.containsKey( btn ) )
-		{
-			BlockPos blockPos = blockPosHashMap.get( guiButtonHashMap.get( this.selectedButton ) );
-			BlockPos blockPos2 = mc.player.getPosition();
-			hilightBlock( blockPos, System.currentTimeMillis() + 500 * BlockPosUtils.getDistance(blockPos, blockPos2) );
-			mc.player.sendStatusMessage( new TextComponentString( "The interface is now highlighted at " + "X: " + blockPos.getX() + " Y: " + blockPos.getY() + " Z: " + blockPos.getZ() ), false );
-			mc.player.closeScreen();
-		}
-
-		if (btn == guiButtonHide)
-		{
-			partInterfaceTerminal.onlyInterfacesWithFreeSlots = !partInterfaceTerminal.onlyInterfacesWithFreeSlots;
-			this.refreshList();
-		}
-
-		if (btn == guiButtonNextAssembler)
-		{
-			// Set Search to "Molecular Assembler" and set "Only Free Interface"
-			boolean currentOnlyInterfacesWithFreeSlots = this.partInterfaceTerminal.onlyInterfacesWithFreeSlots;
-			String currentSearchText = this.searchFieldOutputs.getText();
-
-			this.partInterfaceTerminal.onlyInterfacesWithFreeSlots = true;
-			this.searchFieldOutputs.setText("Molecular Assembler");
-
-			this.refreshList();
-
-			this.partInterfaceTerminal.onlyInterfacesWithFreeSlots = currentOnlyInterfacesWithFreeSlots;
-			this.searchFieldOutputs.setText(currentSearchText);
-		}
-	}
-
 	@Override
 	public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
-		this.bindTexture( "guis/newinterfaceterminal.png" );
+		this.bindTexture( "guis/interfaceterminal.png" );
 		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
 
-		int offset = 51;
+		int offset = 17;
 		final int ex = this.getScrollBar().getCurrentScroll();
 
 		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
@@ -262,19 +177,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
 
 				GlStateManager.color( 1, 1, 1, 1 );
 				final int width = inv.getInventory().getSlots() * 18;
-				this.drawTexturedModalRect( offsetX + 20, offsetY + offset, 20, 173, width, 18 );
+				this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 139, width, 18 );
 			}
 			offset += 18;
 		}
 
-		if( this.searchFieldInputs != null )
+		if( this.searchField != null )
 		{
-			this.searchFieldInputs.drawTextBox();
-		}
-
-		if( this.searchFieldOutputs != null )
-		{
-			this.searchFieldOutputs.drawTextBox();
+			this.searchField.drawTextBox();
 		}
 	}
 
@@ -283,21 +193,15 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		if( !this.checkHotbarKeys( key ) )
 		{
-			if( character == ' ' && this.searchFieldInputs.getText().isEmpty() && this.searchFieldInputs.isFocused() )
+			if( character == ' ' && this.searchField.getText().isEmpty() )
 			{
 				return;
 			}
 
-			if( character == ' ' && this.searchFieldOutputs.getText().isEmpty() && this.searchFieldOutputs.isFocused())
-			{
-				return;
-			}
-
-			if( this.searchFieldInputs.textboxKeyTyped( character, key ) || this.searchFieldOutputs.textboxKeyTyped( character, key ))
+			if( this.searchField.textboxKeyTyped( character, key ) )
 			{
 				this.refreshList();
 			}
-
 			else
 			{
 				super.keyTyped( character, key );
@@ -323,7 +227,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					final long id = Long.parseLong( key.substring( 1 ), Character.MAX_RADIX );
 					final NBTTagCompound invData = in.getCompoundTag( key );
 					final ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) );
-					blockPosHashMap.put( current, NBTUtil.getPosFromTag( invData.getCompoundTag( "pos" )) );
 
 					for( int x = 0; x < current.getInventory().getSlots(); x++ )
 					{
@@ -357,68 +260,41 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private void refreshList()
 	{
 		this.byName.clear();
-		this.buttonList.clear();
 
-		final String searchFieldInputs = this.searchFieldInputs.getText().toLowerCase();
-		final String searchFieldOutputs = this.searchFieldOutputs.getText().toLowerCase();
+		final String searchFilterLowerCase = this.searchField.getText().toLowerCase();
 
-		final Set<Object> cachedSearch = this.getCacheForSearchTerm( "IN:" + searchFieldInputs + " OUT:" + searchFieldOutputs + partInterfaceTerminal.onlyInterfacesWithFreeSlots);
+		final Set<Object> cachedSearch = this.getCacheForSearchTerm( searchFilterLowerCase );
 		final boolean rebuild = cachedSearch.isEmpty();
 
 		for( final ClientDCInternalInv entry : this.byId.values() )
 		{
-			// ignore inventory if not doing a full rebuild and cache already marks it as miss.
+			// ignore inventory if not doing a full rebuild or cache already marks it as miss.
 			if( !rebuild && !cachedSearch.contains( entry ) )
 			{
 				continue;
 			}
 
 			// Shortcut to skip any filter if search term is ""/empty
-
-			boolean found = (searchFieldInputs.isEmpty() && searchFieldOutputs.isEmpty() && !partInterfaceTerminal.onlyInterfacesWithFreeSlots);
+			boolean found = searchFilterLowerCase.isEmpty();
 
 			// Search if the current inventory holds a pattern containing the search term.
-			if( !found )
+			if( !found && !searchFilterLowerCase.isEmpty() )
 			{
 				for( final ItemStack itemStack : entry.getInventory() )
 				{
-					if( !searchFieldInputs.isEmpty() && !searchFieldOutputs.isEmpty() )
-						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) || this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
-					else if( !searchFieldInputs.isEmpty() )
-						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) );
-					else if( !searchFieldOutputs.isEmpty() )
-						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
+					found = this.itemStackMatchesSearchTerm( itemStack, searchFilterLowerCase );
 					if( found )
 					{
 						break;
 					}
 				}
-			} 
-
-			// If only Interfaces with empty slots should be shown, check that here
-			boolean interfaceHasFreeSlots = false;
-			if (partInterfaceTerminal.onlyInterfacesWithFreeSlots) {
-				for( final ItemStack itemStack : entry.getInventory() )
-				{
-					if(itemStack.isEmpty()){
-						interfaceHasFreeSlots = true;
-						break;
-					}
-				}
 			}
 
 			// if found, filter skipped or machine name matching the search term, add it
-			if( found || (entry.getName().toLowerCase().contains( searchFieldInputs ) && entry.getName().toLowerCase().contains( searchFieldOutputs )))
+			if( found || entry.getName().toLowerCase().contains( searchFilterLowerCase ) )
 			{
-				if (!partInterfaceTerminal.onlyInterfacesWithFreeSlots)
-				{
-					this.byName.put( entry.getName(), entry );
-					cachedSearch.add( entry );
-				}
-				else if ( interfaceHasFreeSlots ){
-					this.byName.put( entry.getName(), entry );
-					cachedSearch.add( entry );
-				}
+				this.byName.put( entry.getName(), entry );
+				cachedSearch.add( entry );
 			}
 			else
 			{
@@ -448,7 +324,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		this.getScrollBar().setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 );
 	}
 
-	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm,int pass )
+	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm )
 	{
 		if( itemStack.isEmpty() )
 		{
@@ -462,21 +338,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			return false;
 		}
 
-		NBTTagList tag = new NBTTagList();
+		// Potential later use to filter by input
+		// NBTTagList inTag = encodedValue.getTagList( "in", 10 );
+		final NBTTagList outTag = encodedValue.getTagList( "out", 10 );
 
-		if (pass == 0)
-		{
-			tag = encodedValue.getTagList( "in", 10 );
-		}
-		else
-		{
-			tag = encodedValue.getTagList( "out", 10 );
-		}
-
-		for( int i = 0; i < tag.tagCount(); i++ )
+		for( int i = 0; i < outTag.tagCount(); i++ )
 		{
 
-			final ItemStack parsedItemStack = new ItemStack( tag.getCompoundTagAt( i ) );
+			final ItemStack parsedItemStack = new ItemStack( outTag.getCompoundTagAt( i ) );
 			if( !parsedItemStack.isEmpty() )
 			{
 				final String displayName = Platform

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

@@ -60,13 +60,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 	private GuiImgButton substitutionsDisabledBtn;
 	private GuiImgButton encodeBtn;
 	private GuiImgButton clearBtn;
-	private GuiImgButton x2Btn;
-	private GuiImgButton x3Btn;
-	private GuiImgButton plusOneBtn;
-	private GuiImgButton divTwoBtn;
-	private GuiImgButton divThreeBtn;
-	private GuiImgButton minusOneBtn;
-	private GuiImgButton maxCountBtn;
 
 	public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
 	{
@@ -92,13 +85,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
 
 			if( this.encodeBtn == btn )
 			{
-				if ( isShiftKeyDown() ){
-					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "2" ) );
-				}
-				else
-				{
-					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
-				}
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
 			}
 
 			if( this.clearBtn == btn )
@@ -106,41 +93,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) );
 			}
 
-			if( this.x2Btn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByTwo", "1" ) );
-			}
-
-			if( this.x3Btn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByThree", "1" ) );
-			}
-
-			if( this.divTwoBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByTwo", "1" ) );
-			}
-
-			if( this.divThreeBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByThree", "1" ) );
-			}
-
-			if( this.plusOneBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.IncreaseByOne", "1" ) );
-			}
-
-			if( this.minusOneBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DecreaseByOne", "1" ) );
-			}
-
-			if( this.maxCountBtn == btn )
-			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MaximizeCount", "1" ) );
-			}
-
 			if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
 			{
 				NetworkHandler.instance()
@@ -179,34 +131,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 		this.clearBtn.setHalfSize( true );
 		this.buttonList.add( this.clearBtn );
 
-		this.x3Btn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.MULTIPLY_BY_THREE );
-		this.x3Btn.setHalfSize( true );
-		this.buttonList.add( this.x3Btn );
-
-		this.x2Btn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.MULTIPLY_BY_TWO );
-		this.x2Btn.setHalfSize( true );
-		this.buttonList.add( this.x2Btn );
-
-		this.plusOneBtn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 138, Settings.ACTIONS, ActionItems.INCREASE_BY_ONE );
-		this.plusOneBtn.setHalfSize( true );
-		this.buttonList.add( this.plusOneBtn );
-
-		this.divThreeBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.DIVIDE_BY_THREE );
-		this.divThreeBtn.setHalfSize( true );
-		this.buttonList.add( this.divThreeBtn );
-
-		this.divTwoBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.DIVIDE_BY_TWO );
-		this.divTwoBtn.setHalfSize( true );
-		this.buttonList.add( this.divTwoBtn );
-
-		this.minusOneBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 138, Settings.ACTIONS, ActionItems.DECREASE_BY_ONE );
-		this.minusOneBtn.setHalfSize( true );
-		this.buttonList.add( this.minusOneBtn );
-
-		//this.maxCountBtn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 108, Settings.ACTIONS, ActionItems.MAX_COUNT );
-		//this.maxCountBtn.setHalfSize( true );
-		//this.buttonList.add( this.maxCountBtn );
-
 		this.encodeBtn = new GuiImgButton( this.guiLeft + 147, this.guiTop + this.ySize - 142, Settings.ACTIONS, ActionItems.ENCODE );
 		this.buttonList.add( this.encodeBtn );
 	}
@@ -218,13 +142,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 		{
 			this.tabCraftButton.visible = true;
 			this.tabProcessButton.visible = false;
-			this.x2Btn.visible = false;
-			this.x3Btn.visible = false;
-			this.divTwoBtn.visible = false;
-			this.divThreeBtn.visible = false;
-			this.plusOneBtn.visible = false;
-			this.minusOneBtn.visible = false;
-			//this.maxCountBtn.visible = false;
 
 			if( this.container.substitute )
 			{
@@ -243,13 +160,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 			this.tabProcessButton.visible = true;
 			this.substitutionsEnabledBtn.visible = false;
 			this.substitutionsDisabledBtn.visible = false;
-			this.x2Btn.visible = true;
-			this.x3Btn.visible = true;
-			this.divTwoBtn.visible = true;
-			this.divThreeBtn.visible = true;
-			this.plusOneBtn.visible = true;
-			this.minusOneBtn.visible = true;
-			//this.maxCountBtn.visible = true;
 		}
 
 		super.drawFG( offsetX, offsetY, mouseX, mouseY );

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

@@ -134,19 +134,6 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			this.registerApp( 6, Settings.ACTIONS, ActionItems.CLOSE, ButtonToolTips.Clear, ButtonToolTips.ClearSettings );
 			this.registerApp( 6, Settings.ACTIONS, ActionItems.STASH, ButtonToolTips.Stash, ButtonToolTips.StashDesc );
 
-			this.registerApp( 6 + 4 * 16, Settings.ACTIONS, ActionItems.MULTIPLY_BY_TWO, ButtonToolTips.MultiplyByTwo, ButtonToolTips.MultiplyByTwoDesc );
-			this.registerApp( 7 + 4 * 16, Settings.ACTIONS, ActionItems.MULTIPLY_BY_THREE, ButtonToolTips.MultiplyByThree, ButtonToolTips.MultiplyByThreeDesc );
-			this.registerApp( 8 + 4 * 16, Settings.ACTIONS, ActionItems.INCREASE_BY_ONE, ButtonToolTips.IncreaseByOne, ButtonToolTips.IncreaseByOneDesc );
-			this.registerApp( 9 + 4 * 16, Settings.ACTIONS, ActionItems.DIVIDE_BY_TWO, ButtonToolTips.DivideByTwo, ButtonToolTips.DivideByTwoDesc );
-			this.registerApp( 10 + 4 * 16, Settings.ACTIONS, ActionItems.DIVIDE_BY_THREE, ButtonToolTips.DivideByThree, ButtonToolTips.DivideByThreeDesc );
-			this.registerApp( 11 + 4 * 16, Settings.ACTIONS, ActionItems.DECREASE_BY_ONE, ButtonToolTips.DecreaseByOne, ButtonToolTips.DecreaseByOneDesc );
-			this.registerApp( 12 + 4 * 16, Settings.ACTIONS, ActionItems.MAX_COUNT, ButtonToolTips.MaxCount, ButtonToolTips.MaxCountDesc );
-
-			this.registerApp( 6 + 5 * 16, Settings.ACTIONS, ActionItems.FREE_MOLECULAR_SLOT_SHORTCUT, ButtonToolTips.FreeMolecularSlotShortcut, ButtonToolTips.FreeMolecularSlotShortcutDesc );
-			this.registerApp( 7 + 5 * 16, Settings.ACTIONS, ActionItems.TOGGLE_SHOW_FULL_INTERFACES_ON, ButtonToolTips.ToggleShowFullInterfaces, ButtonToolTips.ToggleShowFullInterfacesOnDesc );
-			this.registerApp( 8 + 5 * 16, Settings.ACTIONS, ActionItems.TOGGLE_SHOW_FULL_INTERFACES_OFF, ButtonToolTips.ToggleShowFullInterfaces, ButtonToolTips.ToggleShowFullInterfacesOffDesc );
-			this.registerApp( 6 + 6 * 16, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE, ButtonToolTips.HighlightInterface, "" );
-
 			this.registerApp( 8, Settings.ACTIONS, ActionItems.ENCODE, ButtonToolTips.Encode, ButtonToolTips.EncodeDescription );
 			this.registerApp( 4 + 3 * 16, Settings.ACTIONS, ItemSubstitution.ENABLED, ButtonToolTips.Substitutions, ButtonToolTips.SubstitutionsDescEnabled );
 			this.registerApp( 7 + 3 * 16, Settings.ACTIONS, ItemSubstitution.DISABLED, ButtonToolTips.Substitutions, ButtonToolTips.SubstitutionsDescDisabled );

src/main/java/appeng/client/me/ClientDCInternalInv.java

@@ -37,7 +37,7 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
 
 	public ClientDCInternalInv( final int size, final long id, final long sortBy, final String unlocalizedName )
 	{
-		this.inventory = new AppEngInternalInventory( null, size, 1 );
+		this.inventory = new AppEngInternalInventory( null, size );
 		this.unlocalizedName = unlocalizedName;
 		this.id = id;
 		this.sortBy = sortBy;

src/main/java/appeng/client/render/BlockPosHighlighter.java

@@ -1,25 +0,0 @@
-package appeng.client.render;
-
-import net.minecraft.util.math.BlockPos;
-
-// taken from McJty's McJtyLib
-public class BlockPosHighlighter
-{
-    private static BlockPos hilightedBlock;
-    private static long expireHilight;
-
-    public static void hilightBlock( BlockPos c, long expireHilight ) {
-        hilightedBlock = c;
-        BlockPosHighlighter.expireHilight = expireHilight;
-    }
-
-    public static BlockPos getHilightedBlock() {
-        return hilightedBlock;
-    }
-
-    public static long getExpireHilight() {
-        return expireHilight;
-    }
-
-
-}

src/main/java/appeng/container/AEBaseContainer.java

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

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

@@ -51,12 +51,6 @@ public class ContainerCraftAmount extends AEBaseContainer
 		this.addSlotToContainer( this.getCraftingItem() );
 	}
 
-	@Override
-	public Slot getSlot( int slotId )
-	{
-		return super.getSlot( 0 );
-	}
-
 	@Override
 	public void detectAndSendChanges()
 	{

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

@@ -53,7 +53,7 @@ public class ContainerInterface extends ContainerUpgradeable
 		for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ )
 		{
 			this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
-					.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ).setStackLimit( 1 ) );
+					.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ) );
 		}
 
 		for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ )

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

@@ -28,8 +28,6 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.config.Settings;
@@ -80,7 +78,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			this.grid = anchor.getActionableNode().getGrid();
 		}
 
-		this.bindPlayerInventory( ip, 14, 256 - /* height of player inventory */82 );
+		this.bindPlayerInventory( ip, 0, 222 - /* height of player inventory */82 );
 	}
 
 	@Override
@@ -258,7 +256,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 					if( hasItemInHand )
 					{
 						ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
-						if( !extra.isEmpty() && !interfaceSlot.containsItems())
+						if( !extra.isEmpty() )
 						{
 							extra = interfaceSlot.addItems( extra );
 						}
@@ -380,7 +378,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		{
 			tag.setLong( "sortBy", inv.sortBy );
 			tag.setString( "un", inv.unlocalizedName );
-			tag.setTag("pos", NBTUtil.createPosTag( inv.pos ) );
 		}
 
 		for( int x = 0; x < length; x++ )
@@ -411,7 +408,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		private final String unlocalizedName;
 		private final IItemHandler client;
 		private final IItemHandler server;
-		private final BlockPos pos;
 
 		public InvTracker( final DualityInterface dual, final IItemHandler patterns, final String unlocalizedName )
 		{
@@ -419,7 +415,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			this.client = new AppEngInternalInventory( null, this.server.getSlots() );
 			this.unlocalizedName = unlocalizedName;
 			this.sortBy = dual.getSortValue();
-			this.pos = dual.getLocation().getPos();
 		}
 	}
 

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

@@ -203,19 +203,6 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 
 	}
 
-	public void encodeAndMoveToInventory()
-	{
-		encode();
-		ItemStack output = this.patternSlotOUT.getStack();
-		if ( !output.isEmpty() )
-		{
-			if (!getPlayerInv().addItemStackToInventory( output )){
-				getPlayerInv().player.dropItem( output , false );
-			}
-			this.patternSlotOUT.putStack( ItemStack.EMPTY );
-		}
-	}
-
 	public void encode()
 	{
 		ItemStack output = this.patternSlotOUT.getStack();
@@ -282,212 +269,6 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		output.setTagCompound( encodedValue );
 	}
 
-	public void multiply(int multiple)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canMultiplyInputs = true;
-		boolean canMultiplyOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() * multiple > input[x].getMaxStackSize() )
-			{
-				canMultiplyInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() * multiple > out.getMaxStackSize() )
-			{
-				canMultiplyOutputs = false;
-			}
-		}
-		if( canMultiplyInputs && canMultiplyOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() * multiple );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() * multiple );
-			}
-		}
-	}
-
-	public void divide(int divide)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canDivideInputs = true;
-		boolean canDivideOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() % divide != 0 )
-			{
-				canDivideInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() % divide != 0 )
-			{
-				canDivideOutputs = false;
-			}
-		}
-		if( canDivideInputs && canDivideOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() / divide );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() / divide );
-			}
-		}
-	}
-
-	public void increase(int increase)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canIncreaseInputs = true;
-		boolean canIncreaseOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() + increase > input[x].getMaxStackSize() )
-			{
-				canIncreaseInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() + increase > out.getMaxStackSize() )
-			{
-				canIncreaseOutputs = false;
-			}
-		}
-		if( canIncreaseInputs && canIncreaseOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() + increase );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() + increase );
-			}
-		}
-	}
-
-	public void decrease(int decrease)
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canDecreaseInputs = true;
-		boolean canDecreaseOutputs = true;
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getCount() - decrease < 1 )
-			{
-				canDecreaseInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			if( !out.isEmpty() && out.getCount() - decrease < 1 )
-			{
-				canDecreaseOutputs = false;
-			}
-		}
-		if( canDecreaseInputs && canDecreaseOutputs )
-		{
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-				craftingSlot.getStack().setCount( stack.getCount() - decrease );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-				outputSlot.getStack().setCount( stack.getCount() - decrease );
-			}
-		}
-	}
-
-	public void maximizeCount()
-	{
-		ItemStack[] input = new ItemStack[9];
-		boolean canGrowInputs = true;
-		boolean canGrowOutputs = true;
-		int maxInputStackGrowth = 0;
-		int maxOutputStackGrowth = 0;
-
-
-		for( int x = 0; x < this.craftingSlots.length; x++ )
-		{
-			input[x] = this.craftingSlots[x].getStack();
-			if( !input[x].isEmpty() && input[x].getMaxStackSize() - input[x].getCount() > maxInputStackGrowth )
-			{
-				maxInputStackGrowth = input[x].getMaxStackSize() - input[x].getCount();
-			}
-			if( !input[x].isEmpty() && input[x].getCount() + maxInputStackGrowth > input[x].getMaxStackSize() )
-			{
-				canGrowInputs = false;
-			}
-		}
-		for( final OptionalSlotFake outputSlot : this.outputSlots )
-		{
-			final ItemStack out = outputSlot.getStack();
-			{
-				maxOutputStackGrowth = out.getMaxStackSize() - out.getCount();
-			}
-			if( !out.isEmpty() && out.getCount() + maxOutputStackGrowth > out.getMaxStackSize() )
-			{
-				canGrowOutputs = false;
-			}
-		}
-		if( canGrowInputs && canGrowOutputs )
-		{
-			int maxStackGrowth = Math.min(maxInputStackGrowth,maxOutputStackGrowth);
-			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
-			{
-				ItemStack stack = craftingSlot.getStack();
-				if( !stack.isEmpty() )
-					craftingSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
-			}
-			for( OptionalSlotFake outputSlot : this.outputSlots )
-			{
-				ItemStack stack = outputSlot.getStack();
-				if( !stack.isEmpty() )
-					outputSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
-			}
-		}
-	}
-
 	private ItemStack[] getInputs()
 	{
 		final ItemStack[] input = new ItemStack[9];

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

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

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

@@ -164,7 +164,6 @@ public enum AEFeature
 	PATTERNS( "Patterns", Constants.CATEGORY_CRAFTING_FEATURES ),
 	CRAFTING_CPU( "CraftingCPU", Constants.CATEGORY_CRAFTING_FEATURES ),
 	CRAFTING_MANAGER_FALLBACK( "CraftingManagerFallback", Constants.CATEGORY_CRAFTING_FEATURES, "Use CraftingManager to find an alternative recipe, after a pattern rejected an ingredient. Should be enabled to avoid issues, but can have a minor performance impact." ),
-	INSANE_BLOCKING_MODE( "InsaneBlockingMode", Constants.CATEGORY_CRAFTING_FEATURES, "Use the default AE2 blocking mode that doesn't work on any machines" ),
 
 	BASIC_CARDS( "BasicCards", Constants.CATEGORY_UPGRADES ),
 	ADVANCED_CARDS( "AdvancedCards", Constants.CATEGORY_UPGRADES ),

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

@@ -19,7 +19,6 @@
 package appeng.core.localization;
 
 
-import appeng.api.config.SchedulingMode;
 import net.minecraft.util.text.translation.I18n;
 
 
@@ -138,28 +137,6 @@ public enum ButtonToolTips
 	BlockPlacementYes,
 	BlockPlacementNo,
 
-	MultiplyByTwo,
-	MultiplyByTwoDesc,
-	MultiplyByThree,
-	MultiplyByThreeDesc,
-	IncreaseByOne,
-	IncreaseByOneDesc,
-	DivideByTwo,
-	DivideByTwoDesc,
-	DivideByThree,
-	DivideByThreeDesc,
-	DecreaseByOne,
-	DecreaseByOneDesc,
-	MaxCount,
-	MaxCountDesc,
-	FreeMolecularSlotShortcut,
-	FreeMolecularSlotShortcutDesc,
-	ToggleShowFullInterfaces,
-	ToggleShowFullInterfacesOnDesc,
-	ToggleShowFullInterfacesOffDesc,
-	HighlightInterface,
-	HighlightInterfaceDesc,
-
 	// Used in the tooltips of the items in the terminal, when moused over
 	ItemsStored,
 	ItemsRequestable,

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

@@ -23,12 +23,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.data.IItemList;
-import appeng.container.implementations.ContainerPatternTerm;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -69,8 +64,6 @@ public class PacketJEIRecipe extends AppEngPacket
 {
 
 	private ItemStack[][] recipe;
-	private ItemStack[] output;
-
 
 	// automatic.
 	public PacketJEIRecipe( final ByteBuf stream ) throws IOException
@@ -93,19 +86,7 @@ public class PacketJEIRecipe extends AppEngPacket
 					}
 				}
 			}
-			if ( comp.hasKey("outputs") ) {
-				final NBTTagList outputList = comp.getTagList("outputs", 10);
-				this.output = new ItemStack[3];
-				for( int x = 0; x < this.output.length; x++ )
-				{
-					if( outputList.tagCount() > 0 )
-					{
-						this.output[x] = new ItemStack(outputList.getCompoundTagAt( x ));
-					}
-				}
-			}
 		}
-
 	}
 
 	// api
@@ -171,11 +152,6 @@ public class PacketJEIRecipe extends AppEngPacket
 					// already the correct item?
 					ItemStack newItem = this.canUseInSlot( x, currentItem );
 
-					if ( !cct.useRealItems() && this.recipe[x] != null ) {
-						if (this.recipe[x].length > 0 )
-						currentItem.setCount( recipe[x][0].getCount() );
-					}
-
 					// put away old item
 					if( newItem != currentItem && security.hasPermission( player, SecurityPermissions.INJECT ) )
 					{
@@ -209,26 +185,6 @@ public class PacketJEIRecipe extends AppEngPacket
 								if( cct.useRealItems() )
 								{
 									out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() );
-									if( out == null )
-									{
-										Collection<IAEItemStack> outList = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findFuzzy( request, FuzzyMode.IGNORE_ALL );
-										IAEItemStack mostDamaged = null;
-										for( IAEItemStack is : outList )
-										{
-											if( !is.isCraftable() && is.getItem().isDamageable() )
-											{
-												if( mostDamaged == null || mostDamaged.getItemDamage() < is.getItemDamage() )
-												{
-													mostDamaged = is;
-												}
-											}
-										}
-										if( mostDamaged != null )
-										{
-											mostDamaged.setStackSize( 1 );
-											out = Platform.poweredExtraction( energy, storage, mostDamaged, cct.getActionSource() );
-										}
-									}
 								}
 								else
 								{
@@ -246,7 +202,6 @@ public class PacketJEIRecipe extends AppEngPacket
 
 								if( out != null )
 								{
-									out.setStackSize( recipe[x][y].getCount() );
 									currentItem = out.createItemStack();
 								}
 							}
@@ -258,36 +213,19 @@ public class PacketJEIRecipe extends AppEngPacket
 
 								if( cct.useRealItems() )
 								{
-									currentItem = ad.removeSimilarItems(1, this.recipe[x][y],FuzzyMode.IGNORE_ALL, null );
+									currentItem = ad.removeItems( 1, this.recipe[x][y], null );
 								}
 								else
 								{
-									currentItem = ad.simulateSimilarRemove(recipe[x][y].getCount(), this.recipe[x][y],FuzzyMode.IGNORE_ALL, null );
+									currentItem = ad.simulateRemove( 1, this.recipe[x][y], null );
 								}
 							}
 						}
 					}
-					if (!cct.useRealItems())
-					{
-						if( currentItem.isEmpty() && this.recipe[x] != null )
-						{
-							currentItem = this.recipe[x][0].copy();
-						}
-					}
 				}
 				ItemHandlerUtil.setStackInSlot( craftMatrix, x, currentItem );
 			}
-
 			con.onCraftMatrixChanged( new WrapperInvItemHandler( craftMatrix ) );
-
-			if( this.output != null && con instanceof ContainerPatternTerm && !( (ContainerPatternTerm) con ).isCraftingMode() )
-			{
-				IItemHandler outputSlots = cct.getInventoryByName( "output" );
-				for( int i = 0; i < this.output.length; ++i )
-				{
-					ItemHandlerUtil.setStackInSlot( outputSlots, i, this.output[i] );
-				}
-			}
 		}
 	}
 

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

@@ -175,46 +175,12 @@ public class PacketValueConfig extends AppEngPacket
 			}
 			else if( this.Name.equals( "PatternTerminal.Encode" ) )
 			{
-				if (this.Value.equals( "2" )) {
-					cpt.encodeAndMoveToInventory();
-				}
-				else
-				{
-					cpt.encode();
-				}
+				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" ) );

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

@@ -59,6 +59,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private final IItemList<IAEItemStack> missing = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 	private final HashMap<String, TwoIntegers> opsAndMultiplier = new HashMap<>();
 	private final Object monitor = new Object();
+	private final Stopwatch watch = Stopwatch.createUnstarted();
 	private CraftingTreeNode tree;
 	private final IAEItemStack output;
 	private boolean simulate = false;
@@ -66,7 +67,10 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private long bytes = 0;
 	private final IActionSource actionSrc;
 	private final ICraftingCallback callback;
+	private boolean running = false;
 	private boolean done = false;
+	private int time = 5;
+	private int incTime = Integer.MAX_VALUE;
 
 	private World wrapWorld( final World w )
 	{
@@ -133,6 +137,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 			try
 			{
 				TickHandler.INSTANCE.registerCraftingSimulation( this.world, this );
+				this.handlePausing();
 
 				final Stopwatch timer = Stopwatch.createStarted();
 
@@ -214,6 +219,42 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.finish();
 	}
 
+	void handlePausing() throws InterruptedException
+	{
+		if( this.incTime > 100 )
+		{
+			this.incTime = 0;
+
+			synchronized( this.monitor )
+			{
+				if( this.watch.elapsed( TimeUnit.MICROSECONDS ) > this.time )
+				{
+					this.running = false;
+					this.watch.stop();
+					this.monitor.notify();
+				}
+
+				if( !this.running )
+				{
+					AELog.craftingDebug( "crafting job will now sleep" );
+
+					while( !this.running )
+					{
+						this.monitor.wait();
+					}
+
+					AELog.craftingDebug( "crafting job now active" );
+				}
+			}
+
+			if( Thread.interrupted() )
+			{
+				throw new InterruptedException();
+			}
+		}
+		this.incTime++;
+	}
+
 	private void finish()
 	{
 		if( this.callback != null )
@@ -225,6 +266,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 
 		synchronized( this.monitor )
 		{
+			this.running = false;
 			this.done = true;
 			this.monitor.notify();
 		}
@@ -268,15 +310,45 @@ public class CraftingJob implements Runnable, ICraftingJob
 	}
 
 	/**
+	 * returns true if this needs more simulation.
+	 *
+	 * @param milli milliseconds of simulation
+	 *
 	 * @return true if this needs more simulation
 	 */
-	public boolean simulateFor()
+	public boolean simulateFor( final int milli )
 	{
-		synchronized( this.monitor ) {
-			if ( this.done ) {
+		this.time = milli;
+
+		synchronized( this.monitor )
+		{
+			if( this.done )
+			{
 				return false;
 			}
+
+			this.watch.reset();
+			this.watch.start();
+			this.running = true;
+
+			AELog.craftingDebug( "main thread is now going to sleep" );
+
+			this.monitor.notify();
+
+			while( this.running )
+			{
+				try
+				{
+					this.monitor.wait();
+				}
+				catch( final InterruptedException ignored )
+				{
+				}
+			}
+
+			AELog.craftingDebug( "main thread is now active" );
 		}
+
 		return true;
 	}
 

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

@@ -119,6 +119,7 @@ public class CraftingTreeNode
 
 	IAEItemStack request( final MECraftingInventory inv, long l, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
+		this.job.handlePausing();
 
 		final List<IAEItemStack> thingsUsed = new ArrayList<>();
 

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

@@ -77,6 +77,8 @@ public class CraftingTreeProcess
 				ic.setInventorySlotContents( x, is[x] == null ? ItemStack.EMPTY : is[x].createItemStack() );
 			}
 
+			FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) world ), details.getOutput( ic, world ), ic );
+
 			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
 				final ItemStack g = ic.getStackInSlot( x );
@@ -185,6 +187,7 @@ public class CraftingTreeProcess
 
 	void request( final MECraftingInventory inv, final long i, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
+		this.job.handlePausing();
 
 		if( this.fullSimulation )
 		{
@@ -198,6 +201,8 @@ public class CraftingTreeProcess
 				ic.setInventorySlotContents( entry.getKey().getSlot(), stack.createItemStack() );
 			}
 
+			FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.world ), this.details.getOutput( ic, this.world ), ic );
+
 			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
 				ItemStack is = ic.getStackInSlot( x );
@@ -260,7 +265,7 @@ public class CraftingTreeProcess
 	{
 		for( final IAEItemStack is : this.details.getCondensedOutputs() )
 		{
-			if( is.isSameType( what2 ) )
+			if( is.equals( what2 ) )
 			{
 				what2 = what2.copy();
 				what2.setStackSize( is.getStackSize() );

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

@@ -28,7 +28,6 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.AEApi;
@@ -73,7 +72,7 @@ import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
 
 
-public class DualityFluidInterface implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost, IConfigurableFluidInventory
+public class DualityFluidInterface implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost
 {
 	public static final int NUMBER_OF_TANKS = 6;
 	public static final int TANK_CAPACITY = Fluid.BUCKET_VOLUME * 4;
@@ -604,14 +603,6 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		return null;
 	}
 
-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	@Override
 	public int getInstalledUpgrades( Upgrades u )
 	{

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

@@ -1,11 +0,0 @@
-package appeng.fluids.helper;
-
-import net.minecraftforge.fluids.capability.IFluidHandler;
-
-public interface IConfigurableFluidInventory
-{
-    default IFluidHandler getFluidInventoryByName( String name )
-    {
-        return null;
-    }
-}

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

@@ -26,9 +26,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.parts.misc.PartStorageBus;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -64,18 +61,12 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 	private final IFluidHandler fluidHandler;
 	private final IGridProxyable proxyable;
 	private final FluidHandlerAdapter.InventoryCache cache;
-	private StorageFilter mode;
 
 	FluidHandlerAdapter( IFluidHandler fluidHandler, IGridProxyable proxy )
 	{
 		this.fluidHandler = fluidHandler;
 		this.proxyable = proxy;
-		if( this.proxyable instanceof PartStorageBus )
-		{
-			PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
-			this.mode = ( (StorageFilter) partStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
-		}
-		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler, this.mode);
+		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler );
 	}
 
 	@Override
@@ -204,11 +195,9 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 	{
 		private IAEFluidStack[] cachedAeStacks = new IAEFluidStack[0];
 		private final IFluidHandler fluidHandler;
-		private final StorageFilter mode;
 
-		public InventoryCache( IFluidHandler fluidHandler, StorageFilter mode )
+		public InventoryCache( IFluidHandler fluidHandler )
 		{
-			this.mode = mode;
 			this.fluidHandler = fluidHandler;
 		}
 
@@ -228,14 +217,8 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 			{
 				// Save the old stuff
 				final IAEFluidStack oldAEFS = this.cachedAeStacks[slot];
-				FluidStack newFS = tankProperties[slot].getContents();
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && newFS != null )
-				{
-					if( this.fluidHandler.drain( 1, false ) == null )
-					{
-						newFS = null;
-					}
-				}
+				final FluidStack newFS = tankProperties[slot].getContents();
+
 				this.handlePossibleSlotChanges( slot, oldAEFS, newFS, changes );
 			}
 

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

@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.state.IBlockState;
@@ -52,10 +51,9 @@ import appeng.parts.automation.PartAbstractFormationPlane;
 import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
 import appeng.util.prioritylist.PrecisePriorityList;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 
 
-public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluidStack> implements IAEFluidInventory, IConfigurableFluidInventory
+public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluidStack> implements IAEFluidInventory
 {
 	private static final PlaneModels MODELS = new PlaneModels( "part/fluid_formation_plane_", "part/fluid_formation_plane_on_" );
 
@@ -224,14 +222,6 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
 		return this.config;
 	}
 
-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{

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

@@ -21,7 +21,6 @@ package appeng.fluids.parts;
 
 import java.util.EnumSet;
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -31,7 +30,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.AEApi;
@@ -63,7 +61,7 @@ import appeng.parts.PartModel;
 import appeng.util.Platform;
 
 
-public class PartFluidInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost, IConfigurableFluidInventory
+public class PartFluidInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost
 {
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/fluid_interface_base" );
 
@@ -235,11 +233,6 @@ public class PartFluidInterface extends PartBasicState implements IGridTickable,
 		return this.duality.getInventoryByName( name );
 	}
 
-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		return this.duality.getFluidInventoryByName(name);
-	}
-
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{

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

@@ -4,7 +4,6 @@ package appeng.fluids.parts;
 
 import java.util.Random;
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -49,10 +48,9 @@ import appeng.parts.PartModel;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 
 
-public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack>, IConfigurableFluidInventory
+public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack>
 {
 	@PartModels
 	public static final ResourceLocation MODEL_BASE_OFF = new ResourceLocation( AppEng.MOD_ID, "part/level_emitter_base_off" );
@@ -356,14 +354,6 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		return this.config;
 	}
 
-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	@Override
 	public void readFromNBT( final NBTTagCompound data )
 	{

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

@@ -25,7 +25,6 @@ import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -88,7 +87,7 @@ import appeng.util.prioritylist.PrecisePriorityList;
  * @version rv6 - 22/05/2018
  * @since rv6 22/05/2018
  */
-public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMonitorHandlerReceiver<IAEFluidStack>, IAEFluidInventory, IConfigurableFluidInventory
+public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMonitorHandlerReceiver<IAEFluidStack>, IAEFluidInventory
 {
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/fluid_storage_bus_base" );
 	@PartModels
@@ -470,14 +469,6 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		return this.config;
 	}
 
-	@Override
-	public IFluidHandler getFluidInventoryByName(final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	@Nonnull
 	@Override
 	public IPartModel getStaticModels()

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

@@ -19,7 +19,6 @@
 package appeng.fluids.parts;
 
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -45,7 +44,6 @@ import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.util.Platform;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 
 
 /**
@@ -53,7 +51,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
  * @version rv6 - 30/04/2018
  * @since rv6 30/04/2018
  */
-public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable, IConfigurableFluidInventory
+public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable
 {
 
 	private final AEFluidInventory config = new AEFluidInventory( null, 9 );
@@ -178,14 +176,6 @@ public abstract class PartSharedFluidBus extends PartUpgradeable implements IGri
 		return this.config;
 	}
 
-	@Override
-	public IFluidHandler getFluidInventoryByName( final String name) {
-		if (name.equals("config")) {
-			return this.config;
-		}
-		return null;
-	}
-
 	protected IFluidStorageChannel getChannel()
 	{
 		return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class );

src/main/java/appeng/fluids/tile/TileFluidInterface.java

@@ -23,13 +23,11 @@ import java.util.EnumSet;
 
 import javax.annotation.Nullable;
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.AEApi;
@@ -52,7 +50,7 @@ import appeng.helpers.IPriorityHost;
 import appeng.tile.grid.AENetworkTile;
 
 
-public class TileFluidInterface extends AENetworkTile implements IGridTickable, IFluidInterfaceHost, IPriorityHost, IConfigurableFluidInventory
+public class TileFluidInterface extends AENetworkTile implements IGridTickable, IFluidInterfaceHost, IPriorityHost
 {
 	private final DualityFluidInterface duality = new DualityFluidInterface( this.getProxy(), this );
 
@@ -178,11 +176,6 @@ public class TileFluidInterface extends AENetworkTile implements IGridTickable,
 		return this.duality.getInventoryByName( name );
 	}
 
-	@Override
-	public IFluidHandler getFluidInventoryByName(final String name) {
-		return this.duality.getFluidInventoryByName(name);
-	}
-
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{

src/main/java/appeng/fluids/util/AEFluidStack.java

@@ -32,7 +32,6 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -217,6 +216,18 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 		return dup;
 	}
 
+	@Override
+	public boolean isItem()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean isFluid()
+	{
+		return true;
+	}
+
 	@Override
 	public IStorageChannel<IAEFluidStack> getChannel()
 	{
@@ -307,17 +318,17 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 	}
 
 	@Override
-	public void writeToPacket( final ByteBuf i ) throws IOException
+	public void writeToPacket( final ByteBuf buffer ) throws IOException
 	{
 		final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
 				.getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
 
-		i.writeByte( mask );
+		buffer.writeByte( mask );
 
-		this.writeToStream( i );
+		this.writeToStream( buffer );
 
-		this.putPacketValue( i, this.getStackSize() );
-		this.putPacketValue( i, this.getCountRequestable() );
+		this.putPacketValue( buffer, this.getStackSize() );
+		this.putPacketValue( buffer, this.getCountRequestable() );
 	}
 
 	private void writeToStream( final ByteBuf buffer ) throws IOException

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

@@ -29,12 +29,8 @@ import java.util.Optional;
 
 import javax.annotation.Nullable;
 
-import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
-import appeng.util.*;
 import com.google.common.collect.ImmutableSet;
 
-import gregtech.api.block.machines.BlockMachine;
-import gregtech.api.metatileentity.MetaTileEntity;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Items;
@@ -50,7 +46,6 @@ import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.RangedWrapper;
@@ -93,8 +88,6 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
-import appeng.core.AEConfig;
-import appeng.core.features.AEFeature;
 import appeng.core.settings.TickRates;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
@@ -106,18 +99,19 @@ import appeng.parts.automation.StackUpgradeInventory;
 import appeng.parts.automation.UpgradeInventory;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.util.ConfigManager;
+import appeng.util.IConfigManagerHost;
+import appeng.util.InventoryAdaptor;
+import appeng.util.Platform;
 import appeng.util.inv.AdaptorItemHandler;
 import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.IInventoryDestination;
 import appeng.util.inv.InvOperation;
 import appeng.util.item.AEItemStack;
 
-import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
-
 
 public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
 {
-	private int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};
 
 	public static final int NUMBER_OF_STORAGE_SLOTS = 9;
 	public static final int NUMBER_OF_CONFIG_SLOTS = 9;
@@ -135,11 +129,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS );
 	private final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS );
 	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance()
-																																	.storage()
-																																	.getStorageChannel( IItemStorageChannel.class ) );
+			.storage()
+			.getStorageChannel( IItemStorageChannel.class ) );
 	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
-																																	   .storage()
-																																	   .getStorageChannel( IFluidStorageChannel.class ) );
+			.storage()
+			.getStorageChannel( IFluidStorageChannel.class ) );
 	private final UpgradeInventory upgrades;
 	private boolean hasConfig = false;
 	private int priority;
@@ -148,7 +142,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private IMEInventory<IAEItemStack> destination;
 	private int isWorking = -1;
 	private final Accessor accessor = new Accessor();
-	private GTCEInventoryAdaptor GTad;
 
 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
 	{
@@ -437,18 +430,14 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				this.requireWork[slot] = req.copy();
 				return;
 			}
-			else if( req.isSameType( stored ) ) // same type and quantity  )!
+			else if( req.isSameType( stored ) ) // same type ( qty different? )!
 			{
-				if( req.getStackSize() == stored.getCount() )
-				{
-					this.requireWork[slot] = null;
-				}
-				else                                // same type ( qty different? )!
+				if( req.getStackSize() != stored.getCount() )
 				{
 					this.requireWork[slot] = req.copy();
 					this.requireWork[slot].setStackSize( req.getStackSize() - stored.getCount() );
+					return;
 				}
-				return;
 			}
 			else
 			// Stored != null; dispose!
@@ -770,17 +759,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				if (this.failedCraftTriesSlot[x] <= 0)
-				{
-					boolean crafted = this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
+				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
 						this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
-
-					if (crafted) this.failedCraftTriesSlot[x] = 0;
-					else{
-						this.failedCraftTriesSlot[x] += 2;
-					}
-				}
-				this.failedCraftTriesSlot[x] -= 1;
 			}
 		}
 		catch( final GridAccessException e )
@@ -913,20 +893,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		};
 	}
 
-	private static boolean invIsBlocked( InventoryAdaptor inv )
-	{
-		if( AEConfig.instance().isFeatureEnabled( AEFeature.INSANE_BLOCKING_MODE ) )
-		{
-			return !inv.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty();
-		}
-		else return inv.containsItems();
-	}
-
-	private static boolean invIsBlockedGTCE( GTCEInventoryAdaptor inv )
-	{
-		return ( !inv.canRemoveAllExceptCircuits() );
-	}
-
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table )
 	{
@@ -975,20 +941,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			{
 				if( this.isBlocking() )
 				{
-					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
+					if( !ad.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty() )
 					{
-						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-						if( invIsBlockedGTCE( GTad ) )
-						{
-							continue;
-						}
-					}
-					else
-					{
-						if( invIsBlocked( ad ) )
-						{
-							continue;
-						}
+						continue;
 					}
 				}
 
@@ -1037,28 +992,17 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 				if( ad != null )
 				{
-					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
+					if( ad.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty() )
 					{
-						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-						if( !invIsBlockedGTCE( GTad ) )
-						{
-							allAreBusy = false;
-							break;
-						}
-					}
-					else
-					{
-						if( !invIsBlocked( ad ) )
-						{
-							allAreBusy = false;
-							break;
-						}
-
+						allAreBusy = false;
+						break;
 					}
 				}
 			}
+
 			busy = allAreBusy;
 		}
+
 		return busy;
 	}
 
@@ -1240,13 +1184,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final IBlockState directedBlockState = hostWorld.getBlockState( targ );
 				final Block directedBlock = directedBlockState.getBlock();
 				ItemStack what = new ItemStack( directedBlock, 1, directedBlock.getMetaFromState( directedBlockState ) );
-
-				if ( Loader.isModLoaded("gregtech") && directedBlock instanceof BlockMachine )
-				{
-					MetaTileEntity metaTileEntity = getMetaTileEntity(hostWorld, targ);
-					return metaTileEntity.getMetaFullName();
-				}
-
 				try
 				{
 					Vec3d from = new Vec3d( hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5, hostTile.getPos().getZ() + 0.5 );

src/main/java/appeng/helpers/HighlighterHandler.java

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

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

@@ -192,11 +192,12 @@ public class TickHandler
 				final Collection<CraftingJob> jobSet = this.craftingJobs.get( wte.world );
 				if( !jobSet.isEmpty() )
 				{
+					final int simTime = Math.max( 1, AEConfig.instance().getCraftingCalculationTimePerTick() / jobSet.size() );
 					final Iterator<CraftingJob> i = jobSet.iterator();
 					while( i.hasNext() )
 					{
 						final CraftingJob cj = i.next();
-						if( !cj.simulateFor() )
+						if( !cj.simulateFor( simTime ) )
 						{
 							i.remove();
 						}

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

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

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

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

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

@@ -23,11 +23,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import appeng.client.gui.AEGuiHandler;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-import mezz.jei.config.Constants;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
@@ -93,10 +91,7 @@ public class JEIPlugin implements IModPlugin
 						VanillaRecipeCategoryUid.CRAFTING );
 		registry.getRecipeTransferRegistry()
 				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ),
-						Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
-
-		AEGuiHandler aeGuiHandler = new AEGuiHandler();
-		registry.addAdvancedGuiHandlers(aeGuiHandler);
+						VanillaRecipeCategoryUid.CRAFTING );
 	}
 
 	private void registerDescriptions( IDefinitions definitions, IModRegistry registry )

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

@@ -26,11 +26,6 @@ import java.util.Map;
 
 import javax.annotation.Nullable;
 
-import appeng.container.implementations.ContainerPatternTerm;
-import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
-import mezz.jei.transfer.RecipeTransferErrorInternal;
-import mezz.jei.transfer.RecipeTransferErrorTooltip;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
@@ -71,29 +66,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 	@Override
 	public IRecipeTransferError transferRecipe( T container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer )
 	{
-		final String recipeType = recipeLayout.getRecipeCategory().getUid();
-
-		if (!recipeType.equals( VanillaRecipeCategoryUid.INFORMATION) && !recipeType.equals(VanillaRecipeCategoryUid.FUEL))
-		{
-			if( container instanceof ContainerPatternTerm )
-			{
-				if( !( (ContainerPatternTerm) container ).isCraftingMode() )
-				{
-					if( recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
-					{
-						return new RecipeTransferErrorTooltip( I18n.format( "gui.appliedenergistics2.CraftingPattern" ) );
-					}
-				}
-				else if( !recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
-				{
-					return new RecipeTransferErrorTooltip( I18n.format( "gui.appliedenergistics2.ProcessingPattern" ) );
-				}
-			}
-		}
-		else
-		{
-			return RecipeTransferErrorInternal.INSTANCE;
-		}
 
 		if( !doTransfer )
 		{
@@ -103,8 +75,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 		Map<Integer, ? extends IGuiIngredient<ItemStack>> ingredients = recipeLayout.getItemStacks().getGuiIngredients();
 
 		final NBTTagCompound recipe = new NBTTagCompound();
-		final NBTTagList outputs = new NBTTagList();
-
 
 		int slotIndex = 0;
 		for( Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> ingredientEntry : ingredients.entrySet() )
@@ -112,13 +82,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 			IGuiIngredient<ItemStack> ingredient = ingredientEntry.getValue();
 			if( !ingredient.isInput() )
 			{
-				ItemStack output = ingredient.getDisplayedIngredient();
-				if( output != null )
-				{
-					final NBTTagCompound tag = new NBTTagCompound();
-					output.writeToNBT( tag );
-					outputs.appendTag( tag );
-				}
 				continue;
 			}
 
@@ -167,8 +130,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 			slotIndex++;
 		}
 
-		recipe.setTag( "outputs", outputs );
-
 		try
 		{
 			NetworkHandler.instance().sendToServer( new PacketJEIRecipe( recipe ) );

src/main/java/appeng/items/misc/ItemEncodedPattern.java

@@ -56,7 +56,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
 
 	public ItemEncodedPattern()
 	{
-		this.setMaxStackSize( 64 );
+		this.setMaxStackSize( 1 );
 	}
 
 	@Override

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

@@ -139,9 +139,9 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Override
 	public IItemList<T> getStorageList()
 	{
-		if( hasChanged )
+		if( this.hasChanged )
 		{
-			hasChanged = false;
+			this.hasChanged = false;
 			this.cachedList.resetStatus();
 			return this.getAvailableItems( this.cachedList );
 		}

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

@@ -19,9 +19,9 @@
 package appeng.me.cache;
 
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.PriorityQueue;
 
-import appeng.parts.automation.PartLevelEmitter;
 import com.google.common.base.Preconditions;
 
 import net.minecraft.crash.CrashReport;
@@ -46,7 +46,6 @@ public class TickManagerCache implements ITickManager
 	private final HashMap<IGridNode, TickTracker> alertable = new HashMap<>();
 	private final HashMap<IGridNode, TickTracker> sleeping = new HashMap<>();
 	private final HashMap<IGridNode, TickTracker> awake = new HashMap<>();
-	private final HashMap<IGridNode, TickTracker> laterTicker = new HashMap<>();
 	private final PriorityQueue<TickTracker> upcomingTicks = new PriorityQueue<>();
 
 	private long currentTick = 0;
@@ -87,7 +86,7 @@ public class TickManagerCache implements ITickManager
 		{
 			this.currentTick++;
 
-			while ( !this.upcomingTicks.isEmpty() )
+			while( !this.upcomingTicks.isEmpty() )
 			{
 				tt = this.upcomingTicks.peek();
 
@@ -102,7 +101,7 @@ public class TickManagerCache implements ITickManager
 				final int diff = (int) ( this.currentTick - tt.getLastTick() );
 				final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
 
-				switch ( mod )
+				switch( mod )
 				{
 					case FASTER:
 						tt.setCurrentRate( tt.getCurrentRate() - 2 );
@@ -138,7 +137,6 @@ 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

@@ -504,16 +504,17 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( g.getStackSize() );
 					final IAEItemStack ais = this.inventory.extractItems( fuzz, Actionable.SIMULATE, this.machineSrc );
+					final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack();
 
-					if (ais != null && ais.getStackSize() == g.getStackSize())
+					if( !is.isEmpty() && is.getCount() == g.getStackSize() )
 					{
 						found = true;
 						break;
 					}
-					else if( ais != null )
+					else if( !is.isEmpty() )
 					{
 						g = g.copy();
-						g.decStackSize( ais.getStackSize() );
+						g.decStackSize( is.getCount() );
 					}
 				}
 
@@ -525,8 +526,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 			else
 			{
 				final IAEItemStack ais = this.inventory.extractItems( g.copy(), Actionable.SIMULATE, this.machineSrc );
+				final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack();
 
-				if (ais == null || ais.getStackSize() < g.getStackSize())
+				if( is.isEmpty() || is.getCount() < g.getStackSize() )
 				{
 					return false;
 				}
@@ -777,6 +779,10 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 
 							if( details.isCraftable() )
 							{
+								FMLCommonHandler.instance()
+										.firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ),
+												details.getOutput( ic, this.getWorld() ), ic );
+
 								for( int x = 0; x < ic.getSizeInventory(); x++ )
 								{
 									final ItemStack output = Platform.getContainerItem( ic.getStackInSlot( x ) );
@@ -1113,7 +1119,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 				{
 					for( final IAEItemStack ais : t.getKey().getCondensedOutputs() )
 					{
-						if( ais.isSameType( is ) )
+						if( ais.equals( is ) )
 						{
 							is.setStackSize( is.getStackSize() + ais.getStackSize() * t.getValue().value );
 						}

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

@@ -19,7 +19,6 @@
 package appeng.me.storage;
 
 
-import appeng.api.config.StorageFilter;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.ticking.TickRateModulation;
 
@@ -31,8 +30,4 @@ public interface ITickingMonitor
 
 	void setActionSource( IActionSource actionSource );
 
-	default void setMode( StorageFilter setting )
-	{
-
-	}
 }

src/main/java/appeng/parts/AEBasePart.java

@@ -26,10 +26,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
-import appeng.fluids.parts.PartFluidLevelEmitter;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.parts.automation.PartLevelEmitter;
 import com.google.common.base.Preconditions;
 
 import io.netty.buffer.ByteBuf;
@@ -47,7 +43,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.IItemHandler;
@@ -388,26 +383,6 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
 			{
 				target.setStackInSlot( x, tmp.getStackInSlot( x ) );
 			}
-			if (this instanceof PartLevelEmitter ) {
-				final PartLevelEmitter partLevelEmitter = (PartLevelEmitter) this;
-				partLevelEmitter.setReportingValue(compound.getLong("reportingValue"));
-			}
-		}
-
-		if (this instanceof IConfigurableFluidInventory) {
-			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
-			if (tank instanceof AEFluidInventory ) {
-				final AEFluidInventory target = (AEFluidInventory) tank;
-				final AEFluidInventory tmp = new AEFluidInventory(null, target.getSlots());
-				tmp.readFromNBT(compound, "config");
-				for (int x = 0; x < tmp.getSlots(); x++) {
-					target.setFluidInSlot(x, tmp.getFluidInSlot(x));
-				}
-			}
-			if (this instanceof PartFluidLevelEmitter ) {
-				final PartFluidLevelEmitter partFluidLevelEmitter = (PartFluidLevelEmitter) this;
-				partFluidLevelEmitter.setReportingValue(compound.getLong("reportingValue"));
-			}
 		}
 	}
 
@@ -438,21 +413,6 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
 		if( inv instanceof AppEngInternalAEInventory )
 		{
 			( (AppEngInternalAEInventory) inv ).writeToNBT( output, "config" );
-			if (this instanceof PartLevelEmitter) {
-				final PartLevelEmitter partLevelEmitter = (PartLevelEmitter) this;
-				output.setLong("reportingValue", partLevelEmitter.getReportingValue());
-			}
-		}
-
-		if (this instanceof IConfigurableFluidInventory) {
-			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
-			if (tank instanceof AEFluidInventory ) {
-				((AEFluidInventory) tank).writeToNBT(output, "config");
-			}
-			if (this instanceof PartFluidLevelEmitter) {
-				final PartFluidLevelEmitter partFluidLevelEmitter = (PartFluidLevelEmitter) this;
-				output.setLong("reportingValue", partFluidLevelEmitter.getReportingValue());
-			}
 		}
 
 		return output.hasNoTags() ? null : output;

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

@@ -70,7 +70,6 @@ import appeng.util.item.AEItemStack;
 
 public class PartExportBus extends PartSharedItemBus implements ICraftingRequester
 {
-	private final int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};
 
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/export_bus_base" );
 
@@ -150,18 +149,13 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 					final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport );
 
-					if( ais == null || this.itemToSend <= 0 ) continue;
-
-					if ( this.craftOnly() ) {
-						if (this.failedCraftTriesSlot[x] <= 0) {
-
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
+					if( ais == null || this.itemToSend <= 0 || this.craftOnly() )
+					{
+						if( this.isCraftingEnabled() )
+						{
+							this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+									this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
 						}
-						this.failedCraftTriesSlot[x] -= 1;
 						continue;
 					}
 
@@ -185,15 +179,8 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 					if( this.itemToSend == before && this.isCraftingEnabled() )
 					{
-						if (this.failedCraftTriesSlot[x] <= 0) {
-
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
+						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+								this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
 					}
 				}
 

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

@@ -19,14 +19,9 @@
 package appeng.parts.automation;
 
 
+import java.util.Collection;
 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;
@@ -123,9 +118,6 @@ 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 )
@@ -323,91 +315,40 @@ 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 );
 
-		GridNode node = (GridNode) (this.getGridNode());
-
-		if( node != null )
+		if( myStack == null )
 		{
-
-			final Grid g = node.getInternalGrid();
-
-			if( myStack == null )
+			this.lastReportedValue = 0;
+			for( final IAEItemStack st : monitor.getStorageList() )
 			{
-				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 );
+				this.lastReportedValue += st.getStackSize();
 			}
-
-			else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+		}
+		else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+		{
+			this.lastReportedValue = 0;
+			final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
+			final Collection<IAEItemStack> fuzzyList = monitor.getStorageList().findFuzzy( myStack, fzMode );
+			for( final IAEItemStack st : fuzzyList )
 			{
-				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();
-						} );
-					}
-				}
-
-				fuzzyAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
-				fuzzyAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
-					this.lastReportedValue = 0;
-					monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-					return ( lastReportedValue );
-				} ) );
-
-				this.lastReportedValue = fuzzyAEItemStackCount.get( g ).get( myStack );
-				if( this.lastReportedValue == 0 )
-				{
-					fuzzyAEItemStackCount.get( g ).remove( myStack );
-					fuzzyAEItemStackCount.trim();
-				}
+				this.lastReportedValue += st.getStackSize();
+			}
+		}
+		else
+		{
+			final IAEItemStack r = monitor.getStorageList().findPrecise( myStack );
+			if( r == null )
+			{
+				this.lastReportedValue = 0;
 			}
 			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.lastReportedValue = r.getStackSize();
 			}
 		}
+
 		this.updateState();
 	}
 
@@ -459,7 +400,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, change );
+		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor );
 	}
 
 	@Override
@@ -635,10 +576,4 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 			return this.isLevelEmitterOn() ? MODEL_ON_OFF : MODEL_OFF_OFF;
 		}
 	}
-
-	public static void wipeCache(){
-		fuzzyAEItemStackCount.clear();
-		preciseAEItemStackCount.clear();
-		gridItemCount.clear();
-	}
 }

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

@@ -26,8 +26,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 
@@ -59,18 +57,12 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	private final IItemHandler itemHandler;
 	private final IGridProxyable proxyable;
 	private final InventoryCache cache;
-	private StorageFilter mode;
 
 	ItemHandlerAdapter( IItemHandler itemHandler, IGridProxyable proxy )
 	{
 		this.itemHandler = itemHandler;
 		this.proxyable = proxy;
-		if( this.proxyable instanceof PartStorageBus )
-		{
-			PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
-			this.mode = ( (StorageFilter) partStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
-		}
-		this.cache = new InventoryCache( this.itemHandler, this.mode );
+		this.cache = new InventoryCache( this.itemHandler );
 	}
 
 	@Override
@@ -142,14 +134,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				extracted = this.itemHandler.extractItem( i, remainingCurrentSlot, simulate );
 				if( !extracted.isEmpty() )
 				{
-					// In order to guard against broken IItemHandler implementations, we'll try to guess if the returned
-					// stack (especially in simulate mode) is the same that was returned by getStackInSlot. This is
-					// obviously not a precise science, but it would catch the previous Forge bug:
-					// https://github.com/MinecraftForge/MinecraftForge/pull/6580
-					if (extracted == stackInInventorySlot) {
-						extracted = extracted.copy();
-					}
-
 					if( extracted.getCount() > remainingCurrentSlot )
 					{
 						// Something broke. It should never return more than we requested...
@@ -159,17 +143,12 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 						extracted.setCount( remainingCurrentSlot );
 					}
 
-					// Heuristic for simulation: looping in case of simulations is pointless, since the state of the
-					// underlying inventory does not change after a simulated extraction. To still support inventories
-					// that report stacks that are larger than maxStackSize, we use this heuristic
-					if (simulate && extracted.getCount() == extracted.getMaxStackSize()
-								&& remainingCurrentSlot > extracted.getMaxStackSize()) {
-						extracted.setCount(remainingCurrentSlot);
-					}
-
+					// We're just gonna use the first stack we get our hands on as the template for the rest.
+					// In case some stupid itemhandler (aka forge) returns an internal state we have to do a second
+					// expensive copy again.
 					if( gathered.isEmpty() )
 					{
-						gathered = extracted;
+						gathered = extracted.copy();
 					}
 					else
 					{
@@ -178,7 +157,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 					remainingCurrentSlot -= extracted.getCount();
 				}
 			}
-			while( !simulate && !extracted.isEmpty() && remainingCurrentSlot > 0 );
+			while( !extracted.isEmpty() && remainingCurrentSlot > 0 );
 
 			remainingSize -= stackSizeCurrentSlot - remainingCurrentSlot;
 
@@ -276,11 +255,9 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	{
 		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
 		private final IItemHandler itemHandler;
-		private final StorageFilter mode;
 
-		public InventoryCache( IItemHandler itemHandler, StorageFilter mode )
+		public InventoryCache( IItemHandler itemHandler )
 		{
-			this.mode = mode;
 			this.itemHandler = itemHandler;
 		}
 
@@ -305,14 +282,8 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			{
 				// Save the old stuff
 				final IAEItemStack oldAeIS = this.cachedAeStacks[slot];
-				ItemStack newIS = this.itemHandler.getStackInSlot( slot );
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !newIS.isEmpty() )
-				{
-					if( this.itemHandler.extractItem( slot, 1, true ).isEmpty() )
-					{
-						newIS = ItemStack.EMPTY;
-					}
-				}
+				final ItemStack newIS = this.itemHandler.getStackInSlot( slot );
+
 				this.handlePossibleSlotChanges( slot, oldAeIS, newIS, changes );
 			}
 

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

@@ -1,305 +0,0 @@
-package appeng.parts.misc;
-
-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 java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import appeng.api.storage.IStorageChannel;
-
-import appeng.core.AELog;
-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-
-import appeng.api.AEApi;
-import appeng.api.config.Actionable;
-import appeng.api.networking.security.IActionSource;
-import appeng.api.networking.storage.IBaseMonitor;
-import appeng.api.networking.ticking.TickRateModulation;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.me.GridAccessException;
-import appeng.me.helpers.IGridProxyable;
-import appeng.me.storage.ITickingMonitor;
-import appeng.util.item.AEItemStack;
-
-import javax.annotation.Nonnull;
-
-/**
- * Wraps an Item Repository in such a way that it can be used as an IMEInventory for items.
- * Used by the Storage Bus
- */
-
-class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
-{
-    private final Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
-    private IActionSource mySource;
-    private final IItemRepository itemRepository;
-    private final IGridProxyable proxyable;
-    private final InventoryCache cache;
-
-
-    ItemRepositoryAdapter( IItemRepository itemRepository, IGridProxyable proxy )
-    {
-        this.itemRepository = itemRepository;
-        this.proxyable = proxy;
-        this.cache = new InventoryCache( this.itemRepository );
-    }
-
-    @Override
-    public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
-    {
-        ItemStack orgInput = iox.createItemStack();
-        ItemStack remaining = orgInput;
-
-        boolean simulate = ( type == Actionable.SIMULATE );
-
-        remaining = this.itemRepository.insertItem( remaining, simulate );
-
-        // At this point, we still have some items left...
-        if( remaining == orgInput )
-        {
-            // The stack remained unmodified, target inventory is full
-            return iox;
-        }
-
-        if( type == Actionable.MODULATE )
-        {
-            try
-            {
-                this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-            }
-            catch( GridAccessException ex )
-            {
-                // meh
-            }
-        }
-
-        return AEItemStack.fromItemStack( remaining );
-
-    }
-
-    @Override
-    public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
-    {
-        ItemStack requestedItemStack = request.createItemStack();
-        int remainingSize = requestedItemStack.getCount();
-
-        final boolean simulate = ( mode == Actionable.SIMULATE );
-
-        ItemStack extracted;
-        extracted = this.itemRepository.extractItem( requestedItemStack, remainingSize, simulate );
-
-        if( extracted.getCount() > remainingSize )
-        {
-            // Something broke. It should never return more than we requested...
-            // We're going to silently eat the remainder
-            AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.",
-                    this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
-            extracted.setCount( remainingSize );
-        }
-
-        if( !extracted.isEmpty() )
-        {
-            if( mode == Actionable.MODULATE )
-            {
-                try
-                {
-                    this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-                }
-                catch( GridAccessException ex )
-                {
-                    // meh
-                }
-            }
-
-            return AEItemStack.fromItemStack( extracted );
-        }
-
-        return null;
-    }
-
-    @Override
-    public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
-    {
-        return this.cache.getAvailableItems( out );
-    }
-
-    @Override
-    public IStorageChannel<IAEItemStack> getChannel()
-    {
-        return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
-    }
-
-    @Override
-    public void addListener( IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken )
-    {
-        this.listeners.put( l, verificationToken );
-    }
-
-    @Override
-    public void removeListener( IMEMonitorHandlerReceiver<IAEItemStack> l )
-    {
-        this.listeners.remove( l );
-    }
-
-    private void postDifference( Iterable<IAEItemStack> a )
-    {
-        final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
-        while( i.hasNext() )
-        {
-            final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
-            final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
-            if( key.isValid( l.getValue() ) )
-            {
-                key.postChange( this, a, this.mySource );
-            }
-            else
-            {
-                i.remove();
-            }
-        }
-    }
-
-    @Override
-    public TickRateModulation onTick()
-    {
-        {
-            List<IAEItemStack> changes = this.cache.update();
-            if( !changes.isEmpty() )
-            {
-                this.postDifference( changes );
-                return TickRateModulation.URGENT;
-            }
-            else
-            {
-                return TickRateModulation.SLOWER;
-            }
-        }
-    }
-
-    @Override
-    public void setActionSource( final IActionSource mySource )
-    {
-        this.mySource = mySource;
-    }
-
-    private static class InventoryCache
-    {
-        private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
-        private final IItemRepository iItemRepository;
-
-        public InventoryCache( IItemRepository iItemRepository )
-        {
-            this.iItemRepository = iItemRepository;
-        }
-
-        public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
-        {
-            Arrays.stream( this.cachedAeStacks ).forEach( out::add );
-            return out;
-        }
-
-        public List<IAEItemStack> update()
-        {
-            final List<IAEItemStack> changes = new ArrayList<>();
-
-            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect(Collectors.toList() );
-
-            final int size = out.size();
-
-            // Make room for new slots
-            if( size > this.cachedAeStacks.length )
-            {
-                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
-            }
-
-            for( int x = 0; x < size; x++ )
-            {
-                // Save the old stuff
-                final IAEItemStack oldAeIS = this.cachedAeStacks[x];
-                final IAEItemStack newIS = out.get( x );
-
-                this.handlePossibleSlotChanges( x, oldAeIS, newIS, changes );
-            }
-
-            // Handle cases where the number of slots actually is lower now than before
-            if( size < this.cachedAeStacks.length )
-            {
-                for( int x = 0; x < this.cachedAeStacks.length; x++ )
-                {
-                    final IAEItemStack aeStack = this.cachedAeStacks[x];
-
-                    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/PartStorageBus.java

@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -34,8 +33,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 
@@ -98,8 +95,6 @@ import appeng.util.prioritylist.PrecisePriorityList;
 
 public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPriorityHost
 {
-	@CapabilityInject(IItemRepository.class)
-	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY = null;
 
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_base" );
 
@@ -400,12 +395,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			return null;
 		}
 
-		// Check via cap for IItemRepository
-		IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
-		if( handlerRepo != null )
-		{
-			return new ItemRepositoryAdapter( handlerRepo, this );
-		}
 		// Check via cap for IItemHandler
 		IItemHandler handlerExt = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );
 		if( handlerExt != null )
@@ -431,13 +420,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			return Objects.hash( target, target.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, targetSide ) );
 		}
 
-		final IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
-
-		if( handlerRepo != null )
-		{
-			return Objects.hash( target, handlerRepo, handlerRepo.getAllItems().size() );
-		}
-
 		final IItemHandler itemHandler = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );
 
 		if( itemHandler != null )
@@ -484,7 +466,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			{
 				this.monitor = (ITickingMonitor) inv;
 				this.monitor.setActionSource( new MachineSource( this ) );
-				this.monitor.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
 			}
 
 			if( inv != null )

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

@@ -44,9 +44,6 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
 	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 );
-	public String in = "";
-	public String out = "";
-	public boolean onlyInterfacesWithFreeSlots = false;
 
 	public PartInterfaceTerminal( final ItemStack is )
 	{
@@ -72,8 +69,4 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
 		return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL );
 	}
 
-	public void saveSearchStrings(String in, String out){
-		this.in = in;
-		this.out = out;
-	}
 }

src/main/java/appeng/recipes/factories/conditions/PartExists.java

@@ -1,36 +0,0 @@
-package appeng.recipes.factories.conditions;
-
-import appeng.core.Api;
-import appeng.core.AppEng;
-import com.google.gson.JsonObject;
-import net.minecraft.util.JsonUtils;
-import net.minecraftforge.common.crafting.IConditionFactory;
-import net.minecraftforge.common.crafting.JsonContext;
-
-import java.util.function.BooleanSupplier;
-
-public class PartExists implements IConditionFactory {
-
-    private static final String JSON_MATERIAL_KEY = "part";
-
-    @Override
-    public BooleanSupplier parse(JsonContext jsonContext, JsonObject jsonObject )
-    {
-        final boolean result;
-
-        if( JsonUtils.isString( jsonObject, JSON_MATERIAL_KEY ) )
-        {
-            final String part = JsonUtils.getString( jsonObject, JSON_MATERIAL_KEY );
-            final Object item = Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, part );
-
-            result = item != null;
-        }
-        else
-        {
-            result = false;
-        }
-
-        return () -> result;
-
-    }
-}

src/main/java/appeng/tile/AEBaseTile.java

@@ -28,8 +28,6 @@ import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import appeng.fluids.helper.IConfigurableFluidInventory;
-import appeng.fluids.util.AEFluidInventory;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -43,7 +41,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.implementations.tiles.ISegmentedInventory;
@@ -401,18 +398,6 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 				}
 			}
 		}
-
-		if (this instanceof IConfigurableFluidInventory ) {
-			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
-			if (tank instanceof AEFluidInventory) {
-				final AEFluidInventory target = (AEFluidInventory) tank;
-				final AEFluidInventory tmp = new AEFluidInventory(null, target.getSlots());
-				tmp.readFromNBT(compound, "config");
-				for (int x = 0; x < tmp.getSlots(); x++) {
-					target.setFluidInSlot(x, tmp.getFluidInSlot(x));
-				}
-			}
-		}
 	}
 
 	/**
@@ -477,13 +462,6 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 			}
 		}
 
-		if (this instanceof IConfigurableFluidInventory) {
-			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
-			if (tank instanceof AEFluidInventory ) {
-				((AEFluidInventory) tank).writeToNBT(output, "config");
-			}
-		}
-
 		return output.hasNoTags() ? null : output;
 	}
 

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

@@ -458,6 +458,8 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 			final ItemStack output = this.myPlan.getOutput( this.craftingInv, this.getWorld() );
 			if( !output.isEmpty() )
 			{
+				FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ), output, this.craftingInv );
+
 				this.pushOut( output.copy() );
 
 				for( int x = 0; x < this.craftingInv.getSizeInventory(); x++ )

src/main/java/appeng/util/BlockPosUtils.java

@@ -1,41 +0,0 @@
-package appeng.util;
-
-import net.minecraft.util.math.BlockPos;
-
-
-public class BlockPosUtils
-{
-    public static long getDistance( BlockPos blockPos, BlockPos blockPos2 )
-    {
-        int x;
-        if( (blockPos.getX() > 0 && blockPos2.getX() > 0) || (blockPos.getX() < 0 && blockPos2.getX() < 0))
-        {
-            x = blockPos.getX() - blockPos2.getX();
-        }
-        else
-        {
-            x = blockPos.getX() + blockPos2.getX();
-        }
-
-        int y;
-        if( (blockPos.getY() > 0 && blockPos2.getY() > 0) || (blockPos.getY() < 0 && blockPos2.getY() < 0) )
-        {
-            y = blockPos.getY() - blockPos2.getY();
-        }
-        else
-        {
-            y = blockPos.getY() + blockPos2.getY();
-        }
-
-        int z;
-        if( (blockPos.getZ() > 0 && blockPos2.getZ() > 0) || (blockPos.getZ() < 0 && blockPos2.getZ() < 0) )
-        {
-            z = blockPos.getZ() - blockPos2.getZ();
-        }
-        else
-        {
-            z = blockPos.getZ() + blockPos2.getZ();
-        }
-        return Math.abs( x ) + Math.abs( y ) + Math.abs( z );
-    }
-}

src/main/java/appeng/util/InventoryAdaptor.java

@@ -19,18 +19,19 @@
 package appeng.util;
 
 
-import appeng.util.inv.*;
-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.config.FuzzyMode;
+import appeng.util.inv.AdaptorItemHandler;
+import appeng.util.inv.AdaptorItemHandlerPlayerInv;
+import appeng.util.inv.IInventoryDestination;
+import appeng.util.inv.ItemSlot;
+
 
 /**
  * Universal Facade for other inventories. Used to conveniently interact with various types of inventories. This is not
@@ -40,29 +41,15 @@ import appeng.api.config.FuzzyMode;
  */
 public abstract class InventoryAdaptor implements Iterable<ItemSlot>
 {
-	@CapabilityInject( IItemRepository.class)
-	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY = null;
-
 	public static InventoryAdaptor getAdaptor( final TileEntity te, final EnumFacing d )
 	{
-		if( te != null )
+		if( te != null && te.hasCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d ) )
 		{
-			if( te.hasCapability( ITEM_REPOSITORY_CAPABILITY, d ) )
+			// Attempt getting an IItemHandler for the given side via caps
+			IItemHandler itemHandler = te.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d );
+			if( itemHandler != null )
 			{
-				IItemRepository itemRepository = te.getCapability( ITEM_REPOSITORY_CAPABILITY, d );
-				if (itemRepository != null){
-					return new AdaptorItemRepository( itemRepository );
-				}
-			}
-			else if( te.hasCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d ) )
-			{
-
-				// Attempt getting an IItemHandler for the given side via caps
-				IItemHandler itemHandler = te.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d );
-				if( itemHandler != null )
-				{
-					return new AdaptorItemHandler( itemHandler );
-				}
+				return new AdaptorItemHandler( itemHandler );
 			}
 		}
 		return null;
@@ -95,5 +82,4 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot>
 	public abstract boolean containsItems();
 
 	public abstract boolean hasSlots();
-
 }

src/main/java/appeng/util/UUIDMatcher.java

@@ -48,4 +48,4 @@ public final class UUIDMatcher
 	{
 		return PATTERN.matcher( potential ).matches();
 	}
-}
+}

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

@@ -264,5 +264,4 @@ public class AdaptorItemHandler extends InventoryAdaptor
 	{
 		return new ItemHandlerIterator( this.itemHandler );
 	}
-
 }

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

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

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

@@ -225,5 +225,4 @@ public class AdaptorList extends InventoryAdaptor
 	{
 		return new StackToSlotIterator( this.i.iterator() );
 	}
-
 }

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

@@ -203,5 +203,4 @@ public class IMEAdaptor extends InventoryAdaptor
 	{
 		this.maxSlots = maxSlots;
 	}
-
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2020, AlgorithmX2, All rights reserved.
+ * Copyright (c) 2013 - 2014, 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
@@ -18,6 +18,7 @@
 
 package appeng.util.item;
 
+
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -25,287 +26,348 @@ import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import appeng.api.AEApi;
 import io.netty.buffer.ByteBuf;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.ItemHandlerHelper;
 
+import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.Platform;
 
-public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack {
 
-    private final AESharedItemStack sharedStack;
-    private Optional<OreReference> oreReference;
+public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack
+{
+	private AESharedItemStack sharedStack;
+	private Optional<OreReference> oreReference;
 
-    @SideOnly( Side.CLIENT )
-    private String displayName;
-    @SideOnly( Side.CLIENT )
-    private List<String> tooltip;
+	@SideOnly( Side.CLIENT )
+	private String displayName;
+	@SideOnly( Side.CLIENT )
+	private List<String> tooltip;
+	@SideOnly( Side.CLIENT )
+	private ResourceLocation uniqueID;
 
-    private AEItemStack(final AEItemStack is) {
-        this.setStackSize(is.getStackSize());
-        this.setCraftable(is.isCraftable());
-        this.setCountRequestable(is.getCountRequestable());
-        this.sharedStack = is.sharedStack;
-        this.oreReference = is.oreReference;
-    }
+	private AEItemStack( final AEItemStack is )
+	{
+		this.setStackSize( is.getStackSize() );
+		this.setCraftable( is.isCraftable() );
+		this.setCountRequestable( is.getCountRequestable() );
+		this.sharedStack = is.sharedStack;
+		this.oreReference = is.oreReference;
+	}
 
-    private AEItemStack(final AESharedItemStack is, long size) {
-        this.sharedStack = is;
-        this.setStackSize(size);
-        this.setCraftable(false);
-        this.setCountRequestable(0);
-        this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
-    }
+	private AEItemStack( final AESharedItemStack is, long size )
+	{
+		this.sharedStack = is;
+		this.setStackSize( size );
+		this.setCraftable( false );
+		this.setCountRequestable( 0 );
+		this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
+	}
 
-    @Nullable
-    public static AEItemStack fromItemStack(@Nonnull final ItemStack stack) {
-        if (stack.isEmpty()) {
-            return null;
-        }
+	@Nullable
+	public static AEItemStack fromItemStack( @Nonnull final ItemStack stack )
+	{
+		if( stack.isEmpty() )
+		{
+			return null;
+		}
 
-        return new AEItemStack(AEItemStackRegistry.getRegisteredStack(stack), stack.getCount());
-    }
+		return new AEItemStack( AEItemStackRegistry.getRegisteredStack( stack ), stack.getCount() );
+	}
 
-    public static IAEItemStack fromNBT( final NBTTagCompound i )
-    {
-        if( i == null )
-        {
-            return null;
-        }
+	public static IAEItemStack fromNBT( final NBTTagCompound i )
+	{
+		if( i == null )
+		{
+			return null;
+		}
 
-        final ItemStack itemstack = new ItemStack( i );
-        if( itemstack.isEmpty() )
-        {
-            return null;
-        }
+		final ItemStack itemstack = new ItemStack( i );
+		if( itemstack.isEmpty() )
+		{
+			return null;
+		}
 
-        final AEItemStack item = AEItemStack.fromItemStack( itemstack );
-        item.setStackSize( i.getLong( "Cnt" ) );
-        item.setCountRequestable( i.getLong( "Req" ) );
-        item.setCraftable( i.getBoolean( "Craft" ) );
-        return item;
-    }
+		final AEItemStack item = AEItemStack.fromItemStack( itemstack );
+		item.setStackSize( i.getLong( "Cnt" ) );
+		item.setCountRequestable( i.getLong( "Req" ) );
+		item.setCraftable( i.getBoolean( "Craft" ) );
+		return item;
+	}
 
-    @Override
-    public void writeToNBT( final NBTTagCompound i )
-    {
-        this.getDefinition().writeToNBT( i );
-        i.setLong( "Cnt", this.getStackSize() );
-        i.setLong( "Req", this.getCountRequestable() );
-        i.setBoolean( "Craft", this.isCraftable() );
-    }
+	@Override
+	public void writeToNBT( final NBTTagCompound i )
+	{
+		this.getDefinition().writeToNBT( i );
+		i.setLong( "Cnt", this.getStackSize() );
+		i.setLong( "Req", this.getCountRequestable() );
+		i.setBoolean( "Craft", this.isCraftable() );
+	}
 
-    public static AEItemStack fromPacket( final ByteBuf data )
-    {
-        final byte mask = data.readByte();
-        final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
-        final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
-        final boolean isCraftable = ( mask & 0x40 ) > 0;
+	public static AEItemStack fromPacket( final ByteBuf data )
+	{
+		final byte mask = data.readByte();
+		final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
+		final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
+		final boolean isCraftable = ( mask & 0x40 ) > 0;
 
-        final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
-        final long stackSize = getPacketValue( stackType, data );
-        final long countRequestable = getPacketValue( countReqType, data );
+		final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
+		final long stackSize = getPacketValue( stackType, data );
+		final long countRequestable = getPacketValue( countReqType, data );
 
-        if( itemstack.isEmpty() )
-        {
-            return null;
-        }
+		if( itemstack.isEmpty() )
+		{
+			return null;
+		}
 
-        final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
-        item.setCountRequestable( countRequestable );
-        item.setCraftable( isCraftable );
-        return item;
-    }
+		final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
+		item.setCountRequestable( countRequestable );
+		item.setCraftable( isCraftable );
+		return item;
+	}
 
-    @Override
-    public void writeToPacket( final ByteBuf i )
-    {
-        final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
-                .getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
+	@Override
+	public void writeToPacket( final ByteBuf i )
+	{
+		final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
+				.getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
 
-        i.writeByte( mask );
-        ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
-        this.putPacketValue( i, this.getStackSize() );
-        this.putPacketValue( i, this.getCountRequestable() );
-    }
+		i.writeByte( mask );
+		ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
+		this.putPacketValue( i, this.getStackSize() );
+		this.putPacketValue( i, this.getCountRequestable() );
+	}
 
-    /**
-     * We're assuming that using capNBT here is safe, because {@link #getDefinition()} should have been created by
-     * {@link ItemStack#copy()}, and then never mutated. Copying an item stack will automatically serialize the
-     * capabilities of the source stack and initialize the target stacks capNBT field using that tag, which we are then
-     * reusing here.
-     */
+	@Override
+	public void add( final IAEItemStack option )
+	{
+		if( option == null )
+		{
+			return;
+		}
 
-    @Override
-    public void add(final IAEItemStack option) {
-        if (option == null) {
-            return;
-        }
+		this.incStackSize( option.getStackSize() );
+		this.setCountRequestable( this.getCountRequestable() + option.getCountRequestable() );
+		this.setCraftable( this.isCraftable() || option.isCraftable() );
+	}
 
-        this.incStackSize(option.getStackSize());
-        this.setCountRequestable(this.getCountRequestable() + option.getCountRequestable());
-        this.setCraftable(this.isCraftable() || option.isCraftable());
-    }
+	@Override
+	public boolean fuzzyComparison( final IAEItemStack other, final FuzzyMode mode )
+	{
+		if( mode == FuzzyMode.IGNORE_ALL && OreHelper.INSTANCE.sameOre( this, other ) )
+		{
+			return true;
+		}
 
-    @Override
-    public boolean fuzzyComparison(final IAEItemStack other, final FuzzyMode mode) {
-        final ItemStack itemStack = this.getDefinition();
-        final ItemStack otherStack = other.getDefinition();
+		final ItemStack itemStack = this.getDefinition();
+		final ItemStack otherStack = other.getDefinition();
 
-        return this.fuzzyItemStackComparison(itemStack, otherStack, mode);
-    }
+		return this.fuzzyItemStackComparison( itemStack, otherStack, mode );
+	}
 
-    @Override
-    public IAEItemStack copy() {
-        return new AEItemStack(this);
-    }
+	@Override
+	public IAEItemStack copy()
+	{
+		return new AEItemStack( this );
+	}
 
-    @Override
-    public IStorageChannel<IAEItemStack> getChannel() {
-        return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
-    }
+	@Override
+	public boolean isItem()
+	{
+		return true;
+	}
 
-    @Override
-    public ItemStack createItemStack() {
-        return ItemHandlerHelper.copyStackWithSize(this.getDefinition(),
-                (int) Math.min(Integer.MAX_VALUE, this.getStackSize()));
-    }
+	@Override
+	public boolean isFluid()
+	{
+		return false;
+	}
 
-    @Override
-    public Item getItem() {
-        return this.getDefinition().getItem();
-    }
+	@Override
+	public IStorageChannel<IAEItemStack> getChannel()
+	{
+		return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
+	}
 
-    @Override
-    public int getItemDamage() {
-        return this.sharedStack.getItemDamage();
-    }
+	@Override
+	public ItemStack createItemStack()
+	{
+		return ItemHandlerHelper.copyStackWithSize( this.getDefinition(), (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ) );
+	}
 
-    public Optional<OreReference> getOre()
-    {
-        return this.oreReference;
-    }
+	@Override
+	public Item getItem()
+	{
+		return this.getDefinition().getItem();
+	}
 
-    @Override
-    public boolean sameOre( final IAEItemStack is )
-    {
-        return OreHelper.INSTANCE.sameOre( this, is );
-    }
+	@Override
+	public int getItemDamage()
+	{
+		return this.sharedStack.getItemDamage();
+	}
 
-    @Override
-    public boolean isSameType(final IAEItemStack otherStack) {
-        if (otherStack == null) {
-            return false;
-        }
+	@Override
+	public boolean sameOre( final IAEItemStack is )
+	{
+		return OreHelper.INSTANCE.sameOre( this, is );
+	}
 
-        return Objects.equals(this.sharedStack, ((AEItemStack) otherStack).sharedStack);
-    }
+	@Override
+	public boolean isSameType( final IAEItemStack otherStack )
+	{
+		if( otherStack == null )
+		{
+			return false;
+		}
 
-    @Override
-    public boolean isSameType(final ItemStack otherStack) {
-        if (otherStack.isEmpty()) {
-            return false;
-        }
-        int oldSize = otherStack.getCount();
+		return Objects.equals( this.sharedStack, ( (AEItemStack) otherStack ).sharedStack );
+	}
 
-        otherStack.setCount(1);
-        boolean ret = ItemStack.areItemStacksEqual(this.getDefinition(), otherStack);
-        otherStack.setCount(oldSize);
+	@Override
+	public boolean isSameType( final ItemStack otherStack )
+	{
+		if( otherStack.isEmpty() )
+		{
+			return false;
+		}
+		int oldSize = otherStack.getCount();
 
-        return ret;
-    }
+		otherStack.setCount( 1 );
+		boolean ret = ItemStack.areItemStacksEqual( this.getDefinition(), otherStack );
+		otherStack.setCount( oldSize );
 
-    @Override
-    public int hashCode() {
-        return this.sharedStack.hashCode();
-    }
+		return ret;
+	}
 
-    @Override
-    public boolean equals(final Object ia) {
-        if (ia instanceof AEItemStack) {
-            return this.isSameType((AEItemStack) ia);
-        } else if (ia instanceof ItemStack) {
-            // this actually breaks the equals contract (being equals to unrelated classes)
-            return equals((ItemStack) ia);
-        }
-        return false;
-    }
+	@Override
+	public int hashCode()
+	{
+		return this.sharedStack.hashCode();
+	}
 
-    @Override
-    public String toString() {
-        return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName();
-    }
+	@Override
+	public boolean equals( final Object ia )
+	{
+		if( ia instanceof AEItemStack )
+		{
+			return this.isSameType( (AEItemStack) ia );
+		}
+		else if( ia instanceof ItemStack )
+		{
+			return this.isSameType( (ItemStack) ia );
+		}
+		return false;
+	}
 
-    @SideOnly( Side.CLIENT )
-    public List<String> getToolTip() {
-        if (this.tooltip == null) {
-            this.tooltip = Platform.getTooltip(this.asItemStackRepresentation());
-        }
-        return this.tooltip;
-    }
+	@Override
+	public String toString()
+	{
+		return this.getStackSize() + "x" + this.getDefinition().getItem().getUnlocalizedName() + "@" + this.getDefinition().getItemDamage();
+	}
 
-    @SideOnly( Side.CLIENT )
-    public String getDisplayName() {
-        if (this.displayName == null) {
-            this.displayName = Platform.getItemDisplayName(this.asItemStackRepresentation());
-        }
-        return this.displayName;
-    }
+	@SideOnly( Side.CLIENT )
+	public List<String> getToolTip()
+	{
+		if( this.tooltip == null )
+		{
+			this.tooltip = Platform.getTooltip( this.asItemStackRepresentation() );
+		}
+		return this.tooltip;
+	}
 
-    @SideOnly( Side.CLIENT )
-    public String getModID() {
-        return this.getDefinition().getItem().getRegistryName().getResourceDomain();
-    }
+	@SideOnly( Side.CLIENT )
+	public String getDisplayName()
+	{
+		if( this.displayName == null )
+		{
+			this.displayName = Platform.getItemDisplayName( this.asItemStackRepresentation() );
+		}
+		return this.displayName;
+	}
 
-    @Override
-    public boolean hasTagCompound() {
-        return this.getDefinition().hasTagCompound();
-    }
+	@SideOnly( Side.CLIENT )
+	public String getModID()
+	{
+		if( this.uniqueID == null )
+		{
+			this.uniqueID = Item.REGISTRY.getNameForObject( this.getDefinition().getItem() );
+		}
 
-    @Override
-    public ItemStack asItemStackRepresentation() {
-        return this.getDefinition().copy();
-    }
+		if( this.uniqueID == null )
+		{
+			return "** Null";
+		}
 
-    @Override
-    public ItemStack getDefinition() {
-        return this.sharedStack.getDefinition();
-    }
+		return this.uniqueID.getResourceDomain() == null ? "** Null" : this.uniqueID.getResourceDomain();
+	}
 
-    public boolean equals(final ItemStack is) {
-        return this.isSameType(is);
-    }
+	public Optional<OreReference> getOre()
+	{
+		return this.oreReference;
+	}
 
-    AESharedItemStack getSharedStack() {
-        return this.sharedStack;
-    }
+	@Override
+	public boolean hasTagCompound()
+	{
+		return this.getDefinition().hasTagCompound();
+	}
 
-    private boolean fuzzyItemStackComparison(ItemStack a, ItemStack b, FuzzyMode mode) {
-        if (a.getItem() == b.getItem()) {
-            if (a.getItem().isDamageable()) {
-                if (mode == FuzzyMode.IGNORE_ALL) {
-                    return true;
-                } else if (mode == FuzzyMode.PERCENT_99) {
-                    return (a.getItemDamage() > 1) == (b.getItemDamage() > 1);
-                } else {
-                    final float percentDamageOfA = (float) a.getItemDamage() / a.getMaxDamage();
-                    final float percentDamageOfB = (float) b.getItemDamage() / b.getMaxDamage();
+	@Override
+	public ItemStack asItemStackRepresentation()
+	{
+		return this.getDefinition().copy();
+	}
 
-                    return (percentDamageOfA > mode.breakPoint) == (percentDamageOfB > mode.breakPoint);
-                }
-            }
-        }
+	@Override
+	public ItemStack getDefinition()
+	{
+		return this.sharedStack.getDefinition();
+	}
+
+	AESharedItemStack getSharedStack()
+	{
+		return this.sharedStack;
+	}
+
+	private boolean fuzzyItemStackComparison( ItemStack a, ItemStack b, FuzzyMode mode )
+	{
+		if( a.getItem() == b.getItem() )
+		{
+			if( a.getItem().isDamageable() )
+			{
+				if( mode == FuzzyMode.IGNORE_ALL )
+				{
+					return true;
+				}
+				else if( mode == FuzzyMode.PERCENT_99 )
+				{
+					return ( a.getItemDamage() > 1 ) == ( b.getItemDamage() > 1 );
+				}
+				else
+				{
+					final float percentDamageOfA = (float) a.getItemDamage() / (float) a.getMaxDamage();
+					final float percentDamageOfB = (float) b.getItemDamage() / (float) b.getMaxDamage();
+
+					return ( percentDamageOfA > mode.breakPoint ) == ( percentDamageOfB > mode.breakPoint );
+				}
+			}
+
+			return a.getMetadata() == b.getMetadata();
+		}
+
+		return false;
+	}
 
-        return false;
-    }
 }

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

@@ -23,6 +23,7 @@
 
 package appeng.util.item;
 
+
 import java.lang.ref.WeakReference;
 import java.util.WeakHashMap;
 
@@ -30,34 +31,56 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 
-public final class AEItemStackRegistry {
-    private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> REGISTRY = new WeakHashMap<>();
+import appeng.util.Platform;
 
-    private AEItemStackRegistry() {
-    }
 
-    static synchronized AESharedItemStack getRegisteredStack(final @Nonnull ItemStack itemStack) {
-        if (itemStack.isEmpty()) {
-            throw new IllegalArgumentException("stack cannot be empty");
-        }
+public final class AEItemStackRegistry
+{
+	private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> SERVER_REGISTRY = new WeakHashMap<>();
+	private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> CLIENT_REGISTRY = new WeakHashMap<>();
 
-        int oldStackSize = itemStack.getCount();
-        itemStack.setCount(1);
+	private AEItemStackRegistry()
+	{
+	}
 
-        AESharedItemStack search = new AESharedItemStack(itemStack);
-        WeakReference<AESharedItemStack> weak = REGISTRY.get(search);
-        AESharedItemStack ret = null;
+	private static WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> registry()
+	{
+		if( Platform.isClient() )
+		{
+			return CLIENT_REGISTRY;
+		}
+		else
+		{
+			return SERVER_REGISTRY;
+		}
+	}
 
-        if (weak != null) {
-            ret = weak.get();
-        }
+	static synchronized AESharedItemStack getRegisteredStack( final @Nonnull ItemStack itemStack )
+	{
+		if( itemStack.isEmpty() )
+		{
+			throw new IllegalArgumentException( "stack cannot be empty" );
+		}
 
-        if (ret == null) {
-            ret = new AESharedItemStack(itemStack.copy());
-            REGISTRY.put(ret, new WeakReference<>(ret));
-        }
-        itemStack.setCount(oldStackSize);
+		int oldStackSize = itemStack.getCount();
+		itemStack.setCount( 1 );
 
-        return ret;
-    }
+		AESharedItemStack search = new AESharedItemStack( itemStack );
+		WeakReference<AESharedItemStack> weak = registry().get( search );
+		AESharedItemStack ret = null;
+
+		if( weak != null )
+		{
+			ret = weak.get();
+		}
+
+		if( ret == null )
+		{
+			ret = new AESharedItemStack( itemStack.copy() );
+			registry().put( ret, new WeakReference<>( ret ) );
+		}
+		itemStack.setCount( oldStackSize );
+
+		return ret;
+	}
 }

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

@@ -18,76 +18,255 @@
 
 package appeng.util.item;
 
+
 import java.util.Objects;
 
 import com.google.common.base.Preconditions;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 
-final class AESharedItemStack {
+import appeng.api.config.FuzzyMode;
 
-    private final ItemStack itemStack;
-    private final int itemId;
-    private final int itemDamage;
-    private final int hashCode;
 
-    public AESharedItemStack(final ItemStack itemStack) {
-        this(itemStack, itemStack.getItemDamage());
-    }
+final class AESharedItemStack implements Comparable<AESharedItemStack>
+{
+	private static final NBTTagCompound LOW_TAG = new NBTTagCompound();
+	private static final NBTTagCompound HIGH_TAG = new NBTTagCompound();
 
-    /**
-     * A constructor to explicitly set the damage value and not fetch it from the {@link ItemStack}
-     * 
-     * @param itemStack The {@link ItemStack} to filter
-     * @param damage    The damage of the item
-     */
-    private AESharedItemStack(ItemStack itemStack, int damage) {
-        this.itemStack = itemStack;
-        this.itemId = Item.getIdFromItem(itemStack.getItem());
-        this.itemDamage = damage;
+	private final ItemStack itemStack;
+	private final int itemId;
+	private final int itemDamage;
+	private final int hashCode;
 
-        // Ensure this is always called last.
-        this.hashCode = this.makeHashCode();
-    }
+	public AESharedItemStack( final ItemStack itemStack )
+	{
+		this.itemStack = itemStack;
+		this.itemId = Item.getIdFromItem( itemStack.getItem() );
+		this.itemDamage = itemStack.getItemDamage();
+		this.hashCode = this.makeHashCode();
+	}
 
-    ItemStack getDefinition() {
-        return this.itemStack;
-    }
+	Bounds getBounds( final FuzzyMode fuzzy, final boolean ignoreMeta )
+	{
+		return new Bounds( this.itemStack, fuzzy, ignoreMeta );
+	}
 
-    int getItemDamage() {
-        return this.itemDamage;
-    }
+	ItemStack getDefinition()
+	{
+		return this.itemStack;
+	}
 
-    @Override
-    public int hashCode() {
-        return this.hashCode;
-    }
+	int getItemDamage()
+	{
+		return this.itemDamage;
+	}
 
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof AESharedItemStack)) {
-            return false;
-        }
+	int getItemID()
+	{
+		return this.itemId;
+	}
 
-        final AESharedItemStack other = (AESharedItemStack) obj;
-        Preconditions.checkState(this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1");
-        Preconditions.checkArgument(other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1");
+	@Override
+	public int hashCode()
+	{
+		return this.hashCode;
+	}
 
-        if (this.itemStack == other.itemStack) {
-            return true;
-        }
-        return ItemStack.areItemStacksEqual(this.itemStack, other.itemStack);
-    }
+	@Override
+	public boolean equals( final Object obj )
+	{
+		if( obj instanceof AESharedItemStack )
+		{
+			final AESharedItemStack other = (AESharedItemStack) obj;
 
-    private int makeHashCode() {
-        return Objects.hash(
-                this.itemId,
-                this.itemDamage,
-                this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0);
-    }
+			Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
+			Preconditions.checkArgument( other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
 
+			if( this.itemStack == other.itemStack )
+			{
+				return true;
+			}
+			return ItemStack.areItemStacksEqual( this.itemStack, other.itemStack );
+		}
+		return false;
+	}
+
+	@Override
+	public int compareTo( final AESharedItemStack b )
+	{
+		Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
+		Preconditions.checkArgument( b.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
+
+		if( this.itemStack == b.getDefinition() )
+		{
+			return 0;
+		}
+
+		final int id = this.itemId - b.itemId;
+		if( id != 0 )
+		{
+			return id;
+		}
+
+		final int damageValue = this.itemDamage - b.itemDamage;
+		if( damageValue != 0 )
+		{
+			return damageValue;
+		}
+
+		final int nbt = this.compareNBT( b.getDefinition() );
+		if( nbt != 0 )
+		{
+			return nbt;
+		}
+
+		if( !this.itemStack.areCapsCompatible( b.getDefinition() ) )
+		{
+			return System.identityHashCode( this.itemStack ) - System.identityHashCode( b.getDefinition() );
+		}
+		return 0;
+	}
+
+	private int compareNBT( final ItemStack b )
+	{
+		if( this.itemStack.getTagCompound() == b.getTagCompound() )
+		{
+			return 0;
+		}
+		if( this.itemStack.getTagCompound() == LOW_TAG || b.getTagCompound() == HIGH_TAG )
+		{
+			return -1;
+		}
+		if( this.itemStack.getTagCompound() == HIGH_TAG || b.getTagCompound() == LOW_TAG )
+		{
+			return 1;
+		}
+		return System.identityHashCode( this.itemStack.getTagCompound() ) - System.identityHashCode( b.getTagCompound() );
+	}
+
+	private int makeHashCode()
+	{
+		return Objects.hash( this.itemId, this.itemDamage, this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0 );
+	}
+
+	/**
+	 * Creates the lower and upper bounds for a specific shared itemstack.
+	 */
+	public static final class Bounds
+	{
+		/**
+		 * Bounds enforced by {@link ItemStack#isEmpty()}
+		 */
+		private static final int MIN_DAMAGE_VALUE = 0;
+		private static final int MAX_DAMAGE_VALUE = 65535;
+
+		private final AESharedItemStack lower;
+		private final AESharedItemStack upper;
+
+		public Bounds( final ItemStack stack, final FuzzyMode fuzzy, final boolean ignoreMeta )
+		{
+			Preconditions.checkState( !stack.isEmpty(), "ItemStack#isEmpty() has to be false" );
+			Preconditions.checkState( stack.getCount() == 1, "ItemStack#getCount() has to be 1" );
+
+			final NBTTagCompound tag = stack.hasTagCompound() ? stack.getTagCompound() : null;
+
+			this.lower = this.makeLowerBound( stack, tag, fuzzy, ignoreMeta );
+			this.upper = this.makeUpperBound( stack, tag, fuzzy, ignoreMeta );
+		}
+
+		public AESharedItemStack lower()
+		{
+			return this.lower;
+		}
+
+		public AESharedItemStack upper()
+		{
+			return this.upper;
+		}
+
+		private AESharedItemStack makeLowerBound( final ItemStack itemStack, final NBTTagCompound tag, final FuzzyMode fuzzy, final boolean ignoreMeta )
+		{
+			final ItemStack newDef = itemStack.copy();
+
+			if( ignoreMeta )
+			{
+				newDef.setItemDamage( MIN_DAMAGE_VALUE );
+				newDef.setTagCompound( tag );
+			}
+			else
+			{
+				if( newDef.getItem().isDamageable() )
+				{
+					if( fuzzy == FuzzyMode.IGNORE_ALL )
+					{
+						newDef.setItemDamage( MIN_DAMAGE_VALUE );
+					}
+					else if( fuzzy == FuzzyMode.PERCENT_99 )
+					{
+						if( itemStack.getItemDamage() == MIN_DAMAGE_VALUE )
+						{
+							newDef.setItemDamage( MIN_DAMAGE_VALUE );
+						}
+						else
+						{
+							newDef.setItemDamage( MIN_DAMAGE_VALUE + 1 );
+						}
+					}
+					else
+					{
+						final int breakpoint = fuzzy.calculateBreakPoint( itemStack.getMaxDamage() );
+						final int damage = breakpoint <= itemStack.getItemDamage() ? breakpoint : 0;
+						newDef.setItemDamage( damage );
+					}
+				}
+				newDef.setTagCompound( LOW_TAG );
+			}
+
+			return new AESharedItemStack( newDef );
+		}
+
+		private AESharedItemStack makeUpperBound( final ItemStack itemStack, final NBTTagCompound tag, final FuzzyMode fuzzy, final boolean ignoreMeta )
+		{
+			final ItemStack newDef = itemStack.copy();
+
+			if( ignoreMeta )
+			{
+				newDef.setItemDamage( MAX_DAMAGE_VALUE );
+				newDef.setTagCompound( tag );
+			}
+			else
+			{
+				if( newDef.getItem().isDamageable() )
+				{
+					if( fuzzy == FuzzyMode.IGNORE_ALL )
+					{
+						newDef.setItemDamage( itemStack.getMaxDamage() + 1 );
+					}
+					else if( fuzzy == FuzzyMode.PERCENT_99 )
+					{
+						if( itemStack.getItemDamage() == MIN_DAMAGE_VALUE )
+						{
+							newDef.setItemDamage( MIN_DAMAGE_VALUE );
+						}
+						else
+						{
+							newDef.setItemDamage( itemStack.getMaxDamage() + 1 );
+						}
+					}
+					else
+					{
+						final int breakpoint = fuzzy.calculateBreakPoint( itemStack.getMaxDamage() );
+						final int damage = itemStack.getItemDamage() < breakpoint ? breakpoint - 1 : itemStack.getMaxDamage() + 1;
+						newDef.setItemDamage( damage );
+					}
+				}
+				newDef.setTagCompound( HIGH_TAG );
+			}
+
+			return new AESharedItemStack( newDef );
+		}
+
+	}
 }

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

@@ -18,152 +18,169 @@
 
 package appeng.util.item;
 
-import appeng.api.storage.data.IAEStack;
+
 import io.netty.buffer.ByteBuf;
 
+import appeng.api.storage.data.IAEStack;
 
-public abstract class AEStack<T extends IAEStack<T>> implements IAEStack<T> {
 
-    private boolean isCraftable;
-    private long stackSize;
-    private long countRequestable;
+public abstract class AEStack<StackType extends IAEStack<StackType>> implements IAEStack<StackType>
+{
 
-    @Override
-    public long getStackSize() {
-        return this.stackSize;
-    }
+	private boolean isCraftable;
+	private long stackSize;
+	private long countRequestable;
 
-    @Override
-    public T setStackSize(final long ss) {
-        this.stackSize = ss;
-        return (T) this;
-    }
+	protected static long getPacketValue( final byte type, final ByteBuf tag )
+	{
+		if( type == 0 )
+		{
+			long l = tag.readByte();
+			l -= Byte.MIN_VALUE;
+			return l;
+		}
+		else if( type == 1 )
+		{
+			long l = tag.readShort();
+			l -= Short.MIN_VALUE;
+			return l;
+		}
+		else if( type == 2 )
+		{
+			long l = tag.readInt();
+			l -= Integer.MIN_VALUE;
+			return l;
+		}
 
-    @Override
-    public long getCountRequestable() {
-        return this.countRequestable;
-    }
+		return tag.readLong();
+	}
 
-    @Override
-    public T setCountRequestable(final long countRequestable) {
-        this.countRequestable = countRequestable;
-        return (T) this;
-    }
+	@Override
+	public long getStackSize()
+	{
+		return this.stackSize;
+	}
 
-    @Override
-    public boolean isCraftable() {
-        return this.isCraftable;
-    }
+	@Override
+	public StackType setStackSize( final long ss )
+	{
+		this.stackSize = ss;
+		return (StackType) this;
+	}
 
-    @Override
-    public T setCraftable(final boolean isCraftable) {
-        this.isCraftable = isCraftable;
-        return (T) this;
-    }
+	@Override
+	public long getCountRequestable()
+	{
+		return this.countRequestable;
+	}
 
-    @Override
-    public T reset() {
-        this.stackSize = 0;
-        this.setCountRequestable(0);
-        this.setCraftable(false);
-        return (T) this;
-    }
+	@Override
+	public StackType setCountRequestable( final long countRequestable )
+	{
+		this.countRequestable = countRequestable;
+		return (StackType) this;
+	}
 
-    @Override
-    public T empty() {
-        final T dup = this.copy();
-        dup.reset();
-        return dup;
-    }
+	@Override
+	public boolean isCraftable()
+	{
+		return this.isCraftable;
+	}
 
-    @Override
-    public boolean isMeaningful() {
-        return this.stackSize != 0 || this.countRequestable > 0 || this.isCraftable;
-    }
+	@Override
+	public StackType setCraftable( final boolean isCraftable )
+	{
+		this.isCraftable = isCraftable;
+		return (StackType) this;
+	}
 
-    @Override
-    public void incStackSize(final long i) {
-        this.stackSize += i;
-    }
+	@Override
+	public StackType reset()
+	{
+		this.stackSize = 0;
+		// priority = Integer.MIN_VALUE;
+		this.setCountRequestable( 0 );
+		this.setCraftable( false );
+		return (StackType) this;
+	}
 
-    @Override
-    public void decStackSize(final long i) {
-        this.stackSize -= i;
-    }
+	@Override
+	public StackType empty()
+	{
+		final StackType dup = this.copy();
+		dup.reset();
+		return dup;
+	}
 
-    @Override
-    public void incCountRequestable(final long i) {
-        this.countRequestable += i;
-    }
+	@Override
+	public boolean isMeaningful()
+	{
+		return this.stackSize != 0 || this.countRequestable > 0 || this.isCraftable;
+	}
 
-    @Override
-    public void decCountRequestable(final long i) {
-        this.countRequestable -= i;
-    }
+	@Override
+	public void incStackSize( final long i )
+	{
+		this.stackSize += i;
+	}
 
-    protected abstract boolean hasTagCompound();
+	@Override
+	public void decStackSize( final long i )
+	{
+		this.stackSize -= i;
+	}
 
-    protected static long getPacketValue( final byte type, final ByteBuf tag )
-    {
-        if( type == 0 )
-        {
-            long l = tag.readByte();
-            l -= Byte.MIN_VALUE;
-            return l;
-        }
-        else if( type == 1 )
-        {
-            long l = tag.readShort();
-            l -= Short.MIN_VALUE;
-            return l;
-        }
-        else if( type == 2 )
-        {
-            long l = tag.readInt();
-            l -= Integer.MIN_VALUE;
-            return l;
-        }
+	@Override
+	public void incCountRequestable( final long i )
+	{
+		this.countRequestable += i;
+	}
 
-        return tag.readLong();
-    }
+	@Override
+	public void decCountRequestable( final long i )
+	{
+		this.countRequestable -= i;
+	}
 
-    protected void putPacketValue( final ByteBuf tag, final long num )
-    {
-        if( num <= 255 )
-        {
-            tag.writeByte( (byte) ( num + Byte.MIN_VALUE ) );
-        }
-        else if( num <= 65535 )
-        {
-            tag.writeShort( (short) ( num + Short.MIN_VALUE ) );
-        }
-        else if( num <= 4294967295L )
-        {
-            tag.writeInt( (int) ( num + Integer.MIN_VALUE ) );
-        }
-        else
-        {
-            tag.writeLong( num );
-        }
-    }
+	protected byte getType( final long num )
+	{
+		if( num <= 255 )
+		{
+			return 0;
+		}
+		else if( num <= 65535 )
+		{
+			return 1;
+		}
+		else if( num <= 4294967295L )
+		{
+			return 2;
+		}
+		else
+		{
+			return 3;
+		}
+	}
 
-    protected byte getType( final long num )
-    {
-        if( num <= 255 )
-        {
-            return 0;
-        }
-        else if( num <= 65535 )
-        {
-            return 1;
-        }
-        else if( num <= 4294967295L )
-        {
-            return 2;
-        }
-        else
-        {
-            return 3;
-        }
-    }
+	protected abstract boolean hasTagCompound();
+
+	protected void putPacketValue( final ByteBuf tag, final long num )
+	{
+		if( num <= 255 )
+		{
+			tag.writeByte( (byte) ( num + Byte.MIN_VALUE ) );
+		}
+		else if( num <= 65535 )
+		{
+			tag.writeShort( (short) ( num + Short.MIN_VALUE ) );
+		}
+		else if( num <= 4294967295L )
+		{
+			tag.writeInt( (int) ( num + Integer.MIN_VALUE ) );
+		}
+		else
+		{
+			tag.writeLong( num );
+		}
+	}
 }

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

@@ -1,179 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2021, TeamAppliedEnergistics, 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.util.item;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Map;
-
-import com.google.common.base.Preconditions;
-
-import net.minecraft.item.ItemStack;
-
-import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap;
-
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.data.IAEItemStack;
-
-/**
- * This variant list is optimized for damageable items, and supports selecting durability ranges with
- * {@link #findFuzzy(IAEItemStack, FuzzyMode)}.
- */
-class FuzzyItemVariantList extends ItemVariantList {
-
-    static final SharedStackComparator COMPARATOR = new SharedStackComparator();
-
-    // NOTE: We only use Object as they key here so we can pass our special DamageBounds to the subMap method.
-    // We NEVER put any keys in this map that are not AESharedItemStacks.
-    private final Object2ObjectSortedMap<Object, IAEItemStack> records = new Object2ObjectAVLTreeMap<>(COMPARATOR);
-
-    @Override
-    public Collection<IAEItemStack> findFuzzy(final IAEItemStack filter, final FuzzyMode fuzzy) {
-        ItemStack itemStack = filter.getDefinition();
-
-        ItemDamageBound lowerBound = makeLowerBound(itemStack, fuzzy);
-        ItemDamageBound upperBound = makeUpperBound(itemStack, fuzzy);
-        Preconditions.checkState(lowerBound.itemDamage > upperBound.itemDamage);
-
-        return this.records.subMap(lowerBound, upperBound).values();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    Map<AESharedItemStack, IAEItemStack> getRecords() {
-        // We ensure on our end that we NEVER use anything but AESharedItemStack as the key in this map
-        return (Map<AESharedItemStack, IAEItemStack>) (Object) this.records;
-    }
-
-    static class ItemDamageBound {
-        final int itemDamage;
-
-        public ItemDamageBound(int itemDamage) {
-            this.itemDamage = itemDamage;
-        }
-    }
-
-    /**
-     * This comparator creates a strict and total ordering over all {@link AESharedItemStack} of the same item. To
-     * support selecting ranges of durability, it is defined for type {@link Object} and also accepts
-     * {@link ItemDamageBound} as an argument to compare against.
-     */
-    static class SharedStackComparator implements Comparator<Object> {
-        @Override
-        public int compare(Object a, Object b) {
-            // Either argument can either be a damage bound or a shared item stack
-            // Since we never put damage bounds into the map as keys, only one
-            // of the two arguments can possibly be a bound
-            ItemDamageBound boundA = null;
-            AESharedItemStack stackA = null;
-            int itemDamageA;
-            if (a instanceof ItemDamageBound) {
-                boundA = (ItemDamageBound) a;
-                itemDamageA = boundA.itemDamage;
-            } else {
-                stackA = (AESharedItemStack) a;
-                itemDamageA = stackA.getItemDamage();
-            }
-            ItemDamageBound boundB = null;
-            AESharedItemStack stackB = null;
-            int itemDamageB;
-            if (b instanceof ItemDamageBound) {
-                boundB = (ItemDamageBound) b;
-                itemDamageB = boundB.itemDamage;
-            } else {
-                stackB = (AESharedItemStack) b;
-                itemDamageB = stackB.getItemDamage();
-            }
-
-            // When either argument is a damage bound, we just compare the damage values because it is used
-            // only to get a certain damage range out of the map.
-            if (boundA != null || boundB != null) {
-                return Integer.compare(itemDamageB, itemDamageA);
-            }
-
-            ItemStack itemStackA = stackA.getDefinition();
-            ItemStack itemStackB = stackB.getDefinition();
-            Preconditions.checkState(itemStackA.getCount() == 1, "ItemStack#getCount() has to be 1");
-            Preconditions.checkArgument(itemStackB.getCount() == 1, "ItemStack#getCount() has to be 1");
-
-            if (itemStackA == itemStackB) {
-                return 0;
-            }
-
-            // Damaged items are sorted before undamaged items
-            final int damageValue = Integer.compare(itemDamageB, itemDamageA);
-            if (damageValue != 0) {
-                return damageValue;
-            }
-
-            // As a final tie breaker, order by the object identity of the item stack
-            // While this will order seemingly at random, we only need the order of
-            // damage values to be predictable, while still having to satisfy the
-            // complete order requirements of the sorted map
-            return Long.compare(System.identityHashCode(itemStackA), System.identityHashCode(itemStackB));
-        }
-    }
-
-    /**
-     * Minecraft reverses the damage values. So anything with a damage of 0 is undamaged and increases the more damaged
-     * the item is.
-     * <p>
-     * Further the used subMap follows [MAX_DAMAGE, MIN_DAMAGE), so to include undamaged items, we have to start with a
-     * lower damage value than 0, while it is fine to use {@link ItemStack#getMaxDamage()} for the upper bound.
-     */
-    private static final int MIN_DAMAGE_VALUE = -1;
-
-    /*
-     * Keep in mind that the stack order is from most damaged to least damaged, so this lower bound will actually be a
-     * higher number than the upper bound.
-     */
-    static ItemDamageBound makeLowerBound(final ItemStack stack, final FuzzyMode fuzzy) {
-        Preconditions.checkState(((stack.getMaxDamage() == 0 && stack.getItemDamage() > 0 ) || stack.isItemStackDamageable()), "ItemStack#isDamageable() has to be true");
-
-        int damage;
-        if (fuzzy == FuzzyMode.IGNORE_ALL) {
-            damage = stack.getMaxDamage();
-        } else {
-            final int breakpoint = fuzzy.calculateBreakPoint(stack.getMaxDamage());
-            damage = stack.getItemDamage() <= breakpoint ? breakpoint : stack.getMaxDamage();
-        }
-
-        return new ItemDamageBound(damage);
-    }
-
-    /*
-     * Keep in mind that the stack order is from most damaged to least damaged, so this upper bound will actually be a
-     * lower number than the lower bound. It also is exclusive.
-     */
-    static ItemDamageBound makeUpperBound(final ItemStack stack, final FuzzyMode fuzzy) {
-        Preconditions.checkState(((stack.getMaxDamage() == 0 && stack.getItemDamage() > 0 ) || stack.isItemStackDamageable()), "ItemStack#isDamageable() has to be true");
-
-        int damage;
-        if (fuzzy == FuzzyMode.IGNORE_ALL) {
-            damage = MIN_DAMAGE_VALUE;
-        } else {
-            final int breakpoint = fuzzy.calculateBreakPoint(stack.getMaxDamage());
-            damage = stack.getItemDamage() <= breakpoint ? MIN_DAMAGE_VALUE : breakpoint;
-        }
-
-        return new ItemDamageBound(damage);
-    }
-
-}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2020, AlgorithmX2, All rights reserved.
+ * Copyright (c) 2013 - 2015, 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
@@ -18,196 +18,212 @@
 
 package appeng.util.item;
 
+
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.ConcurrentModificationException;
 import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.NavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 
-import net.minecraft.item.Item;
-
-import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
-import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
+import net.minecraftforge.oredict.OreDictionary;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.util.item.AESharedItemStack.Bounds;
 
-public final class ItemList implements IItemList<IAEItemStack> {
 
-    private final Reference2ObjectMap<Item, ItemVariantList> records = new Reference2ObjectOpenHashMap<>();
-    /**
-     * We increment this version field everytime an attempt to mutate this item list (or potentially one of its
-     * sub-lists) is made. Iterators will copy the version when they are created and compare it against the current
-     * version whenever they advance to trigger a {@link ConcurrentModificationException}.
-     */
-    private final AtomicInteger version = new AtomicInteger(0);
+public final class ItemList implements IItemList<IAEItemStack>
+{
 
-    @Override
-    public IAEItemStack findPrecise(final IAEItemStack itemStack) {
-        if (itemStack == null) {
-            return null;
-        }
+	private final NavigableMap<AESharedItemStack, IAEItemStack> records = new ConcurrentSkipListMap<>();
 
-        ItemVariantList record = this.records.get(itemStack.getItem());
-        return record != null ? record.findPrecise(itemStack) : null;
-    }
+	@Override
+	public void add( final IAEItemStack option )
+	{
+		if( option == null )
+		{
+			return;
+		}
 
-    @Override
-    public Collection<IAEItemStack> findFuzzy(final IAEItemStack filter, final FuzzyMode fuzzy) {
-        if (filter == null) {
-            return Collections.emptyList();
-        }
+		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
 
-        ItemVariantList record = this.records.get(filter.getItem());
-        return record != null ? record.findFuzzy(filter, fuzzy) : Collections.emptyList();
-    }
+		if( st != null )
+		{
+			st.add( option );
+			return;
+		}
 
-    @Override
-    public boolean isEmpty() {
-        return !this.iterator().hasNext();
-    }
+		final IAEItemStack opt = option.copy();
 
-    @Override
-    public void add(final IAEItemStack itemStack) {
-        version.incrementAndGet();
+		this.putItemRecord( opt );
+	}
 
-        if (itemStack == null) {
-            return;
-        }
+	@Override
+	public IAEItemStack findPrecise( final IAEItemStack itemStack )
+	{
+		if( itemStack == null )
+		{
+			return null;
+		}
 
-        this.getOrCreateRecord(itemStack.getItem()).add(itemStack);
-    }
+		return this.records.get( ( (AEItemStack) itemStack ).getSharedStack() );
+	}
 
-    @Override
-    public void addStorage(final IAEItemStack itemStack) {
-        version.incrementAndGet();
+	@Override
+	public Collection<IAEItemStack> findFuzzy( final IAEItemStack filter, final FuzzyMode fuzzy )
+	{
+		if( filter == null )
+		{
+			return Collections.emptyList();
+		}
 
-        if (itemStack == null) {
-            return;
-        }
+		final AEItemStack ais = (AEItemStack) filter;
 
-        this.getOrCreateRecord(itemStack.getItem()).addStorage(itemStack);
-    }
+		return ais.getOre().map( or ->
+		{
+			if( or.getAEEquivalents().size() == 1 )
+			{
+				final IAEItemStack is = or.getAEEquivalents().get( 0 );
 
-    @Override
-    public void addCrafting(final IAEItemStack itemStack) {
-        version.incrementAndGet();
+				return this.findFuzzyDamage( is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE );
+			}
+			else
+			{
+				final Collection<IAEItemStack> output = new ArrayList<>();
 
-        if (itemStack == null) {
-            return;
-        }
+				for( final IAEItemStack is : or.getAEEquivalents() )
+				{
+					output.addAll( this.findFuzzyDamage( is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE ) );
+				}
 
-        this.getOrCreateRecord(itemStack.getItem()).addCrafting(itemStack);
-    }
+				return output;
+			}
+		} ).orElse( this.findFuzzyDamage( ais, fuzzy, false ) );
+	}
 
-    @Override
-    public void addRequestable(final IAEItemStack itemStack) {
-        version.incrementAndGet();
+	@Override
+	public boolean isEmpty()
+	{
+		return !this.iterator().hasNext();
+	}
 
-        if (itemStack == null) {
-            return;
-        }
+	@Override
+	public void addStorage( final IAEItemStack option )
+	{
+		if( option == null )
+		{
+			return;
+		}
 
-        this.getOrCreateRecord(itemStack.getItem()).addRequestable(itemStack);
-    }
+		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
 
-    @Override
-    public IAEItemStack getFirstItem() {
-        for (final IAEItemStack stackType : this) {
-            return stackType;
-        }
+		if( st != null )
+		{
+			st.incStackSize( option.getStackSize() );
+			return;
+		}
 
-        return null;
-    }
+		final IAEItemStack opt = option.copy();
 
-    @Override
-    public int size() {
-        int size = 0;
-        for (ItemVariantList entry : records.values()) {
-            size += entry.size();
-        }
+		this.putItemRecord( opt );
+	}
 
-        return size;
-    }
+	/*
+	 * public void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI =
+	 * i.next(); if ( !AEI.isMeaningful() ) i.remove(); } }
+	 */
 
-    @Override
-    public Iterator<IAEItemStack> iterator() {
-        return new ChainedIterator(this.records.values().iterator(), version);
-    }
+	@Override
+	public void addCrafting( final IAEItemStack option )
+	{
+		if( option == null )
+		{
+			return;
+		}
 
-    @Override
-    public void resetStatus() {
-        for (final IAEItemStack i : this) {
-            i.reset();
-        }
-    }
+		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
 
-    private ItemVariantList getOrCreateRecord(Item item) {
-        return this.records.computeIfAbsent(item, this::makeRecordMap);
-    }
+		if( st != null )
+		{
+			st.setCraftable( true );
+			return;
+		}
 
-    private ItemVariantList makeRecordMap(Item item) {
-        if (item.isDamageable()) {
-            return new FuzzyItemVariantList();
-        } else {
-            return new NormalItemVariantList();
-        }
-    }
+		final IAEItemStack opt = option.copy();
+		opt.setStackSize( 0 );
+		opt.setCraftable( true );
 
-    /**
-     * Iterates over multiple item lists as if they were one list.
-     */
-    private static class ChainedIterator implements Iterator<IAEItemStack> {
+		this.putItemRecord( opt );
+	}
 
-        private final AtomicInteger parentVersion;
-        private final int version;
-        private final Iterator<ItemVariantList> parent;
-        private Iterator<IAEItemStack> next;
+	@Override
+	public void addRequestable( final IAEItemStack option )
+	{
+		if( option == null )
+		{
+			return;
+		}
 
-        public ChainedIterator(Iterator<ItemVariantList> iterator, AtomicInteger parentVersion) {
-            this.parent = iterator;
-            this.parentVersion = parentVersion;
-            this.version = parentVersion.get();
-            this.ensureItems();
-        }
+		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
 
-        @Override
-        public boolean hasNext() {
-            return next != null && next.hasNext();
-        }
+		if( st != null )
+		{
+			st.setCountRequestable( st.getCountRequestable() + option.getCountRequestable() );
+			return;
+		}
 
-        @Override
-        public IAEItemStack next() {
-            if (this.next == null) {
-                throw new NoSuchElementException();
-            }
-            if (this.version != this.parentVersion.get()) {
-                throw new ConcurrentModificationException();
-            }
+		final IAEItemStack opt = option.copy();
+		opt.setStackSize( 0 );
+		opt.setCraftable( false );
+		opt.setCountRequestable( option.getCountRequestable() );
 
-            IAEItemStack result = this.next.next();
-            this.ensureItems();
-            return result;
-        }
+		this.putItemRecord( opt );
+	}
 
-        private void ensureItems() {
-            if (hasNext()) {
-                return; // Still items left in the current one
-            }
+	@Override
+	public IAEItemStack getFirstItem()
+	{
+		for( final IAEItemStack stackType : this )
+		{
+			return stackType;
+		}
 
-            // Find the next iterator willing to return some items...
-            while (this.parent.hasNext()) {
-                this.next = this.parent.next().iterator();
+		return null;
+	}
 
-                if (this.next.hasNext()) {
-                    return; // Found one!
-                }
-            }
+	@Override
+	public int size()
+	{
+		return this.records.size();
+	}
 
-            // No more items
-            this.next = null;
-        }
-    }
+	@Override
+	public Iterator<IAEItemStack> iterator()
+	{
+		return new MeaningfulItemIterator<>( this.records.values().iterator() );
+	}
+
+	@Override
+	public void resetStatus()
+	{
+		for( final IAEItemStack i : this )
+		{
+			i.reset();
+		}
+	}
+
+	private IAEItemStack putItemRecord( final IAEItemStack itemStack )
+	{
+		return this.records.put( ( (AEItemStack) itemStack ).getSharedStack(), itemStack );
+	}
+
+	private Collection<IAEItemStack> findFuzzyDamage( final IAEItemStack filter, final FuzzyMode fuzzy, final boolean ignoreMeta )
+	{
+		final AEItemStack itemStack = (AEItemStack) filter;
+		final Bounds bounds = itemStack.getSharedStack().getBounds( fuzzy, ignoreMeta );
+
+		return this.records.subMap( bounds.lower(), true, bounds.upper(), true ).descendingMap().values();
+	}
 }

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

@@ -0,0 +1,87 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, 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.util.item;
+
+
+import java.util.Collection;
+
+import appeng.api.AEApi;
+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IItemContainer;
+
+
+public class ItemModList implements IItemContainer<IAEItemStack>
+{
+
+	private final IItemContainer<IAEItemStack> backingStore;
+	private final IItemContainer<IAEItemStack> overrides = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+
+	public ItemModList( final IItemContainer<IAEItemStack> backend )
+	{
+		this.backingStore = backend;
+	}
+
+	@Override
+	public void add( final IAEItemStack option )
+	{
+		IAEItemStack over = this.overrides.findPrecise( option );
+		if( over == null )
+		{
+			over = this.backingStore.findPrecise( option );
+			if( over == null )
+			{
+				this.overrides.add( option );
+			}
+			else
+			{
+				option.add( over );
+				this.overrides.add( option );
+			}
+		}
+		else
+		{
+			this.overrides.add( option );
+		}
+	}
+
+	@Override
+	public IAEItemStack findPrecise( final IAEItemStack i )
+	{
+		final IAEItemStack over = this.overrides.findPrecise( i );
+		if( over == null )
+		{
+			return this.backingStore.findPrecise( i );
+		}
+		return over;
+	}
+
+	@Override
+	public Collection<IAEItemStack> findFuzzy( final IAEItemStack input, final FuzzyMode fuzzy )
+	{
+		return this.overrides.findFuzzy( input, fuzzy );
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		return this.overrides.isEmpty() && this.backingStore.isEmpty();
+	}
+}

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

@@ -1,118 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2021, TeamAppliedEnergistics, 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.util.item;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.data.IAEItemStack;
-
-/**
- * Stores variants of a single type of {@link net.minecraft.item.Item}, i.e. versions with different durability, or
- * different NBT or capabilities.
- */
-abstract class ItemVariantList {
-
-    public void add(final IAEItemStack option) {
-        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
-
-        if (st != null) {
-            st.add(option);
-            return;
-        }
-
-        final IAEItemStack opt = option.copy();
-
-        this.putItemRecord(opt);
-    }
-
-    public IAEItemStack findPrecise(final IAEItemStack itemStack) {
-        return this.getRecords().get(((AEItemStack) itemStack).getSharedStack());
-    }
-
-    public void addStorage(final IAEItemStack option) {
-        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
-
-        if (st != null) {
-            st.incStackSize(option.getStackSize());
-            return;
-        }
-
-        final IAEItemStack opt = option.copy();
-
-        this.putItemRecord(opt);
-    }
-
-    public void addCrafting(final IAEItemStack option) {
-        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
-
-        if (st != null) {
-            st.setCraftable(true);
-            return;
-        }
-
-        final IAEItemStack opt = option.copy();
-        opt.setStackSize(0);
-        opt.setCraftable(true);
-
-        this.putItemRecord(opt);
-    }
-
-    public void addRequestable(final IAEItemStack option) {
-        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
-
-        if (st != null) {
-            st.setCountRequestable(st.getCountRequestable() + option.getCountRequestable());
-            return;
-        }
-
-        final IAEItemStack opt = option.copy();
-        opt.setStackSize(0);
-        opt.setCraftable(false);
-        opt.setCountRequestable(option.getCountRequestable());
-
-        this.putItemRecord(opt);
-    }
-
-    public int size() {
-        int size = 0;
-        for (IAEItemStack entry : getRecords().values()) {
-            if (entry.isMeaningful()) {
-                size++;
-            }
-        }
-
-        return size;
-    }
-
-    public Iterator<IAEItemStack> iterator() {
-        return new MeaningfulItemIterator<>(this.getRecords().values());
-    }
-
-    private void putItemRecord(final IAEItemStack itemStack) {
-        this.getRecords().put(((AEItemStack) itemStack).getSharedStack(), itemStack);
-    }
-
-    abstract Map<AESharedItemStack, IAEItemStack> getRecords();
-
-    public abstract Collection<IAEItemStack> findFuzzy(final IAEItemStack filter, final FuzzyMode fuzzy);
-
-}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * Copyright (c) 2021, TeamAppliedEnergistics, All rights reserved.
+ * Copyright (c) 2013 - 2015, 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
@@ -18,53 +18,59 @@
 
 package appeng.util.item;
 
-import java.util.Collection;
+
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import appeng.api.storage.data.IAEItemStack;
 
-/**
- * This iterator will only return items from a collection that are meaningful (w.r.t.
- * {@link IAEItemStack#isMeaningful()}. Items that are not meaningful are automatically removed from the collection as
- * it is being iterated.
- */
-public class MeaningfulItemIterator<T extends IAEItemStack> implements Iterator<T> {
-    private final Iterator<T> parent;
-    private T next;
 
-    public MeaningfulItemIterator(final Collection<T> collection) {
-        this.parent = collection.iterator();
-        this.next = seekNext();
-    }
+public class MeaningfulItemIterator<T extends IAEItemStack> implements Iterator<T>
+{
 
-    @Override
-    public boolean hasNext() {
-        return this.next != null;
-    }
+	private final Iterator<T> parent;
+	private T next;
 
-    @Override
-    public T next() {
-        if (this.next == null) {
-            throw new NoSuchElementException();
-        }
+	public MeaningfulItemIterator( final Iterator<T> iterator )
+	{
+		this.parent = iterator;
+	}
 
-        T result = this.next;
-        this.next = this.seekNext();
-        return result;
-    }
+	@Override
+	public boolean hasNext()
+	{
+		while( this.parent.hasNext() )
+		{
+			this.next = this.parent.next();
 
-    private T seekNext() {
-        while (this.parent.hasNext()) {
-            T item = this.parent.next();
+			if( this.next.isMeaningful() )
+			{
+				return true;
+			}
+			else
+			{
+				this.parent.remove(); // self cleaning :3
+			}
+		}
 
-            if (item.isMeaningful()) {
-                return item;
-            } else {
-                this.parent.remove();
-            }
-        }
+		this.next = null;
+		return false;
+	}
 
-        return null;
-    }
+	@Override
+	public T next()
+	{
+		if( this.next == null )
+		{
+			throw new NoSuchElementException();
+		}
+
+		return this.next;
+	}
+
+	@Override
+	public void remove()
+	{
+		this.parent.remove();
+	}
 }

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

@@ -1,51 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2021, TeamAppliedEnergistics, 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.util.item;
-
-import java.util.Collection;
-import java.util.Map;
-
-import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
-import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
-
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.data.IAEItemStack;
-
-/**
- * This variant list is optimized for items that cannot be damaged and thus do not support querying durability ranges
- * via {@link #findFuzzy(IAEItemStack, FuzzyMode)}.
- */
-class NormalItemVariantList extends ItemVariantList {
-
-    private final Reference2ObjectMap<AESharedItemStack, IAEItemStack> records = new Reference2ObjectOpenHashMap<>();
-
-    @Override
-    Map<AESharedItemStack, IAEItemStack> getRecords() {
-        return this.records;
-    }
-
-    /**
-     * For items that do not support durability, we just return all variants to a fuzzy search.
-     */
-    @Override
-    public Collection<IAEItemStack> findFuzzy(IAEItemStack filter, FuzzyMode fuzzy) {
-        return this.getRecords().values();
-    }
-
-}

src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json

@@ -1,25 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 16
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -46,4 +25,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json

@@ -1,11 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:material",
-            "data": 1
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:material",
@@ -32,4 +25,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/charger.json

@@ -1,20 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 1
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:charger"
@@ -39,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/compass.json

@@ -1,10 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:sky_compass"
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:sky_compass"
@@ -29,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/controller.json

@@ -1,35 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 13
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 14
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 15
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 19
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:controller"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:controller"
@@ -54,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json

@@ -1,61 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:crafting_storage_1k"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:crafting_storage_4k"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:crafting_storage_16k"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:crafting_storage_64k"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 13
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 14
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 15
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 19
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:controller"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 360
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 340
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:crafting_storage_64k"
@@ -118,4 +61,4 @@
             "c64k"
         ]
     ]
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json

@@ -1,40 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 13
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 14
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 15
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 19
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:controller"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 360
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -61,4 +25,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/facade.json

@@ -1,33 +1,7 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 16
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:facade"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
-            "item": "appliedenergistics2:facade",
-            "nbt": "{item:\"minecraft:stone\"}"
+            "item": "appliedenergistics2:facade"
         },
         "title": {
             "translate": "achievement.ae2.Facade"
@@ -49,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json

@@ -1,20 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:material",
@@ -41,4 +25,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json

@@ -1,24 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_growth_accelerator"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:quartz_growth_accelerator"
@@ -43,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/interface.json

@@ -1,29 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 16
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:interface"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:interface"
@@ -48,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json

@@ -1,50 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:storage_cell_1k"
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:storage_cell_4k"
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:storage_cell_16k"
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:storage_cell_64k"
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:material",
-            "data": 13
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:material",
-            "data": 14
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:material",
-            "data": 15
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:material",
-            "data": 19
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:controller"
-        },
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:io_port"
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:io_port"
@@ -69,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/network1.json

@@ -1,25 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 16
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -38,4 +17,4 @@
             "trigger": "appliedenergistics2:network_apprentice"
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/network2.json

@@ -1,25 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 16
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -38,4 +17,4 @@
             "trigger": "appliedenergistics2:network_engineer"
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/network3.json

@@ -1,25 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 16
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -38,4 +17,4 @@
             "trigger": "appliedenergistics2:network_admin"
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/network_tool.json

@@ -1,39 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 13
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 14
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 15
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 19
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:controller"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:network_tool"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:network_tool"
@@ -58,4 +23,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/p2p.json

@@ -1,30 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:charger"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 7
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 16
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 460
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -44,11 +18,11 @@
             "conditions": {
                 "items": [
                     {
-                        "item": "appliedenergistics2:part",
-                        "data": 460
+                        "type": "appliedenergistics2:part",
+                        "part": "P2P_TUNNEL_ME"
                     }
                 ]
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/pattern_terminal.json

@@ -1,45 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 13
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 14
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 15
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:material",
-                    "data": 19
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:controller"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 360
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 340
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -66,4 +25,4 @@
             }
         }
     }
-}
+}