can now drag encoded patterns on the interface terminal

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;
+public enum FuzzyMode
-    /**
+{
-     * Note this is percentage "damaged". It's the inverse of percentage durability.
+	// Note that percentage damaged, is the inverse of percentage durability.
-     */
+	IGNORE_ALL( -1 ),
-    public final float percentage;
+	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
+	 * Compare the same subtype of {@link IAEStack} with another using a fuzzy comparison.
-	 * 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();
 

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

@@ -526,7 +526,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 
 		if( slot instanceof SlotDisconnected )
 		{
-			if( this.drag_click.size() > 1 )
+			if( this.drag_click.size() > 0 )
 			{
 				return;
 			}

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

@@ -94,7 +94,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		super.initGui();
 
-		this.getScrollBar().setLeft( 189 );
+		this.getScrollBar().setLeft( 190 );
 		this.getScrollBar().setHeight( 106 );
 		this.getScrollBar().setTop( 51 );
 
@@ -137,7 +137,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		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(), offsetX, this.ySize - 96 + 3, 4210752 );
 
 		final int ex = this.getScrollBar().getCurrentScroll();
 
@@ -182,7 +182,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, 22, 6 + offset, 4210752 );
 			}
 			offset += 18;
 		}

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 registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) )
-		{
-			return new BlockDefinition( registryName, null, null );
-		}
-
-		IBlockDefinition stairs = 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/sync/packets/PacketJEIRecipe.java

@@ -171,11 +171,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 ) )
 					{
@@ -215,7 +210,7 @@ public class PacketJEIRecipe extends AppEngPacket
 										IAEItemStack mostDamaged = null;
 										for( IAEItemStack is : outList )
 										{
-											if( !is.isCraftable() && is.getItem().isDamageable() )
+											if( !is.isCraftable() )
 											{
 												if( mostDamaged == null || mostDamaged.getItemDamage() < is.getItemDamage() )
 												{

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( buffer, this.getStackSize() );
-		this.putPacketValue( i, this.getCountRequestable() );
+		this.putPacketValue( buffer, this.getCountRequestable() );
 	}
 
 	private void writeToStream( final ByteBuf buffer ) throws IOException

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

@@ -100,36 +100,50 @@ public class TickManagerCache implements ITickManager
 				this.upcomingTicks.poll();
 
 				final int diff = (int) ( this.currentTick - tt.getLastTick() );
-				final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
 
-				switch ( mod )
+				if( tt.getGridTickable() instanceof PartLevelEmitter )
+				{
+					laterTicker.put( tt.getNode(), tt );
+				} else
 				{
-					case FASTER:
-						tt.setCurrentRate( tt.getCurrentRate() - 2 );
-						break;
-					case IDLE:
-						tt.setCurrentRate( tt.getRequest().maxTickRate );
-						break;
-					case SAME:
-						break;
-					case SLEEP:
-						this.sleepDevice( tt.getNode() );
-						break;
-					case SLOWER:
-						tt.setCurrentRate( tt.getCurrentRate() + 1 );
-						break;
-					case URGENT:
-						tt.setCurrentRate( 0 );
-						break;
-					default:
-						break;
-				}
 
+					final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
+
+					switch ( mod )
+					{
+						case FASTER:
+							tt.setCurrentRate( tt.getCurrentRate() - 2 );
+							break;
+						case IDLE:
+							tt.setCurrentRate( tt.getRequest().maxTickRate );
+							break;
+						case SAME:
+							break;
+						case SLEEP:
+							this.sleepDevice( tt.getNode() );
+							break;
+						case SLOWER:
+							tt.setCurrentRate( tt.getCurrentRate() + 1 );
+							break;
+						case URGENT:
+							tt.setCurrentRate( 0 );
+							break;
+						default:
+							break;
+					}
+				}
 				if( this.awake.containsKey( tt.getNode() ) )
 				{
 					this.addToQueue( tt );
 				}
 			}
+			Iterator<Map.Entry<IGridNode, TickTracker>> ltIterator = laterTicker.entrySet().iterator();
+			while ( ltIterator.hasNext() )
+			{
+				Map.Entry<IGridNode, TickTracker> tickTracker = ltIterator.next();
+				tickTracker.getValue().getGridTickable().tickingRequest( tickTracker.getKey(), 1 );
+				ltIterator.remove();
+			}
 		}
 		catch( final Throwable t )
 		{
@@ -138,7 +152,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/parts/automation/PartLevelEmitter.java

@@ -19,14 +19,15 @@
 package appeng.parts.automation;
 
 
+import javax.annotation.Nonnull;
+
+import java.util.Collection;
 import java.util.Random;
 
-import appeng.me.Grid;
+import appeng.api.networking.IGridNode;
-import appeng.me.GridNode;
+import appeng.api.networking.ticking.IGridTickable;
-import appeng.util.item.AEItemStack;
+import appeng.api.networking.ticking.TickRateModulation;
-import it.unimi.dsi.fastutil.objects.Object2LongMap;
+import appeng.api.networking.ticking.TickingRequest;
-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;
@@ -87,7 +88,7 @@ import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
 
 
-public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider
+public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider, IGridTickable
 {
 
 	@PartModels
@@ -123,9 +124,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	private double centerX;
 	private double centerY;
 	private double centerZ;
-	static Object2LongMap<Grid> gridItemCount = new Object2LongOpenHashMap<>();
+	private IBaseMonitor<IAEItemStack> changedMonitor;
-	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> fuzzyAEItemStackCount = new Object2ObjectOpenHashMap<>();
-	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> preciseAEItemStackCount = new Object2ObjectOpenHashMap<>();
 
 	@Reflected
 	public PartLevelEmitter( final ItemStack is )
@@ -323,91 +322,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( myStack == null )
-
-		if( node != null )
 		{
-
+			this.lastReportedValue = 0;
-			final Grid g = node.getInternalGrid();
+			for( final IAEItemStack st : monitor.getStorageList() )
-
-			if( myStack == null )
 			{
-				if( change != null )
+				this.lastReportedValue += st.getStackSize();
-				{
-					if( gridItemCount.containsKey( g ) )
-					{
-						change.forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-					}
-				}
-				gridItemCount.computeIfAbsent( g, ( aLong ) -> {
-					this.lastReportedValue = 0;
-					monitor.getStorageList().forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-					return ( lastReportedValue );
-				} );
-				this.lastReportedValue = gridItemCount.get( g );
 			}
-
+		}
-			else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+		else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+		{
+			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 );
+				this.lastReportedValue += st.getStackSize();
-				if( change != null )
+			}
-				{
+		}
-					if( fuzzyAEItemStackCount.containsKey( g ) )
+		else
-					{
+		{
-						change.forEach( iaeItemStack -> {
+			final IAEItemStack r = monitor.getStorageList().findPrecise( myStack );
-							if( iaeItemStack.sameOre( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
+			if( r == null )
-						} );
+			{
-					}
+				this.lastReportedValue = 0;
-				}
-
-				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();
-				}
 			}
 			else
 			{
-				if( change != null )
+				this.lastReportedValue = r.getStackSize();
-				{
-					if( preciseAEItemStackCount.containsKey( g ) )
-					{
-						change.forEach( iaeItemStack -> {
-							if( iaeItemStack.isSameType( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
-						} );
-					}
-				}
-				preciseAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
-				preciseAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
-					this.lastReportedValue = 0;
-					IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
-					if( precise != null ) lastReportedValue = precise.getStackSize();
-					return ( lastReportedValue );
-				} ) );
-				this.lastReportedValue = preciseAEItemStackCount.get( g ).get( myStack );
-				if( this.lastReportedValue == 0 )
-				{
-					preciseAEItemStackCount.get( g ).remove( myStack );
-					preciseAEItemStackCount.trim();
-				}
 			}
 		}
+
 		this.updateState();
 	}
 
@@ -459,7 +407,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.changedMonitor = monitor;
 	}
 
 	@Override
@@ -636,9 +584,21 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
-	public static void wipeCache(){
+	@Nonnull
-		fuzzyAEItemStackCount.clear();
+	@Override
-		preciseAEItemStackCount.clear();
+	public TickingRequest getTickingRequest( @Nonnull IGridNode node )
-		gridItemCount.clear();
+	{
+		return new TickingRequest( 1,1,false,false );
+	}
+
+	@Nonnull
+	@Override
+	public TickRateModulation tickingRequest( @Nonnull IGridNode node, int ticksSinceLastCall )
+	{
+		if (this.changedMonitor != null)
+		{
+			this.updateReportingValue((IMEMonitor<IAEItemStack>) changedMonitor);
+		}
+		return TickRateModulation.URGENT;
 	}
 }

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/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;
+public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack
-    private Optional<OreReference> oreReference;
+{
+	private AESharedItemStack sharedStack;
+	private Optional<OreReference> oreReference;
 
-    @SideOnly( Side.CLIENT )
+	@SideOnly( Side.CLIENT )
-    private String displayName;
+	private String displayName;
-    @SideOnly( Side.CLIENT )
+	@SideOnly( Side.CLIENT )
-    private List<String> tooltip;
+	private List<String> tooltip;
+	@SideOnly( Side.CLIENT )
+	private ResourceLocation uniqueID;
 
-    private AEItemStack(final AEItemStack is) {
+	private AEItemStack( final AEItemStack is )
-        this.setStackSize(is.getStackSize());
+	{
-        this.setCraftable(is.isCraftable());
+		this.setStackSize( is.getStackSize() );
-        this.setCountRequestable(is.getCountRequestable());
+		this.setCraftable( is.isCraftable() );
-        this.sharedStack = is.sharedStack;
+		this.setCountRequestable( is.getCountRequestable() );
-        this.oreReference = is.oreReference;
+		this.sharedStack = is.sharedStack;
-    }
+		this.oreReference = is.oreReference;
+	}
 
-    private AEItemStack(final AESharedItemStack is, long size) {
+	private AEItemStack( final AESharedItemStack is, long size )
-        this.sharedStack = is;
+	{
-        this.setStackSize(size);
+		this.sharedStack = is;
-        this.setCraftable(false);
+		this.setStackSize( size );
-        this.setCountRequestable(0);
+		this.setCraftable( false );
-        this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
+		this.setCountRequestable( 0 );
-    }
+		this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
+	}
 
-    @Nullable
+	@Nullable
-    public static AEItemStack fromItemStack(@Nonnull final ItemStack stack) {
+	public static AEItemStack fromItemStack( @Nonnull final ItemStack stack )
-        if (stack.isEmpty()) {
+	{
-            return null;
+		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 )
+	public static IAEItemStack fromNBT( final NBTTagCompound i )
-    {
+	{
-        if( i == null )
+		if( i == null )
-        {
+		{
-            return null;
+			return null;
-        }
+		}
 
-        final ItemStack itemstack = new ItemStack( i );
+		final ItemStack itemstack = new ItemStack( i );
-        if( itemstack.isEmpty() )
+		if( itemstack.isEmpty() )
-        {
+		{
-            return null;
+			return null;
-        }
+		}
 
-        final AEItemStack item = AEItemStack.fromItemStack( itemstack );
+		final AEItemStack item = AEItemStack.fromItemStack( itemstack );
-        item.setStackSize( i.getLong( "Cnt" ) );
+		item.setStackSize( i.getLong( "Cnt" ) );
-        item.setCountRequestable( i.getLong( "Req" ) );
+		item.setCountRequestable( i.getLong( "Req" ) );
-        item.setCraftable( i.getBoolean( "Craft" ) );
+		item.setCraftable( i.getBoolean( "Craft" ) );
-        return item;
+		return item;
-    }
+	}
 
-    @Override
+	@Override
-    public void writeToNBT( final NBTTagCompound i )
+	public void writeToNBT( final NBTTagCompound i )
-    {
+	{
-        this.getDefinition().writeToNBT( i );
+		this.getDefinition().writeToNBT( i );
-        i.setLong( "Cnt", this.getStackSize() );
+		i.setLong( "Cnt", this.getStackSize() );
-        i.setLong( "Req", this.getCountRequestable() );
+		i.setLong( "Req", this.getCountRequestable() );
-        i.setBoolean( "Craft", this.isCraftable() );
+		i.setBoolean( "Craft", this.isCraftable() );
-    }
+	}
 
-    public static AEItemStack fromPacket( final ByteBuf data )
+	public static AEItemStack fromPacket( final ByteBuf data )
-    {
+	{
-        final byte mask = data.readByte();
+		final byte mask = data.readByte();
-        final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
+		final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
-        final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
+		final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
-        final boolean isCraftable = ( mask & 0x40 ) > 0;
+		final boolean isCraftable = ( mask & 0x40 ) > 0;
 
-        final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
+		final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
-        final long stackSize = getPacketValue( stackType, data );
+		final long stackSize = getPacketValue( stackType, data );
-        final long countRequestable = getPacketValue( countReqType, data );
+		final long countRequestable = getPacketValue( countReqType, data );
 
-        if( itemstack.isEmpty() )
+		if( itemstack.isEmpty() )
-        {
+		{
-            return null;
+			return null;
-        }
+		}
 
-        final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
+		final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
-        item.setCountRequestable( countRequestable );
+		item.setCountRequestable( countRequestable );
-        item.setCraftable( isCraftable );
+		item.setCraftable( isCraftable );
-        return item;
+		return item;
-    }
+	}
 
-    @Override
+	@Override
-    public void writeToPacket( final ByteBuf i )
+	public void writeToPacket( final ByteBuf i )
-    {
+	{
-        final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
+		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 );
+				.getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
 
-        i.writeByte( mask );
+		i.writeByte( mask );
-        ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
+		ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
-        this.putPacketValue( i, this.getStackSize() );
+		this.putPacketValue( i, this.getStackSize() );
-        this.putPacketValue( i, this.getCountRequestable() );
+		this.putPacketValue( i, this.getCountRequestable() );
-    }
+	}
 
-    /**
+	@Override
-     * We're assuming that using capNBT here is safe, because {@link #getDefinition()} should have been created by
+	public void add( final IAEItemStack option )
-     * {@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
+		if( option == null )
-     * reusing here.
+		{
-     */
+			return;
+		}
 
-    @Override
+		this.incStackSize( option.getStackSize() );
-    public void add(final IAEItemStack option) {
+		this.setCountRequestable( this.getCountRequestable() + option.getCountRequestable() );
-        if (option == null) {
+		this.setCraftable( this.isCraftable() || option.isCraftable() );
-            return;
+	}
-        }
 
-        this.incStackSize(option.getStackSize());
+	@Override
-        this.setCountRequestable(this.getCountRequestable() + option.getCountRequestable());
+	public boolean fuzzyComparison( final IAEItemStack other, final FuzzyMode mode )
-        this.setCraftable(this.isCraftable() || option.isCraftable());
+	{
-    }
+		if( mode == FuzzyMode.IGNORE_ALL && OreHelper.INSTANCE.sameOre( this, other ) )
+		{
+			return true;
+		}
 
-    @Override
+		final ItemStack itemStack = this.getDefinition();
-    public boolean fuzzyComparison(final IAEItemStack other, final FuzzyMode mode) {
+		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
+	@Override
-    public IAEItemStack copy() {
+	public IAEItemStack copy()
-        return new AEItemStack(this);
+	{
-    }
+		return new AEItemStack( this );
+	}
 
-    @Override
+	@Override
-    public IStorageChannel<IAEItemStack> getChannel() {
+	public boolean isItem()
-        return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
+	{
-    }
+		return true;
+	}
 
-    @Override
+	@Override
-    public ItemStack createItemStack() {
+	public boolean isFluid()
-        return ItemHandlerHelper.copyStackWithSize(this.getDefinition(),
+	{
-                (int) Math.min(Integer.MAX_VALUE, this.getStackSize()));
+		return false;
-    }
+	}
 
-    @Override
+	@Override
-    public Item getItem() {
+	public IStorageChannel<IAEItemStack> getChannel()
-        return this.getDefinition().getItem();
+	{
-    }
+		return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
+	}
 
-    @Override
+	@Override
-    public int getItemDamage() {
+	public ItemStack createItemStack()
-        return this.sharedStack.getItemDamage();
+	{
-    }
+		return ItemHandlerHelper.copyStackWithSize( this.getDefinition(), (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ) );
+	}
 
-    public Optional<OreReference> getOre()
+	@Override
-    {
+	public Item getItem()
-        return this.oreReference;
+	{
-    }
+		return this.getDefinition().getItem();
+	}
 
-    @Override
+	@Override
-    public boolean sameOre( final IAEItemStack is )
+	public int getItemDamage()
-    {
+	{
-        return OreHelper.INSTANCE.sameOre( this, is );
+		return this.sharedStack.getItemDamage();
-    }
+	}
 
-    @Override
+	@Override
-    public boolean isSameType(final IAEItemStack otherStack) {
+	public boolean sameOre( final IAEItemStack is )
-        if (otherStack == null) {
+	{
-            return false;
+		return OreHelper.INSTANCE.sameOre( this, is );
-        }
+	}
 
-        return Objects.equals(this.sharedStack, ((AEItemStack) otherStack).sharedStack);
+	@Override
-    }
+	public boolean isSameType( final IAEItemStack otherStack )
+	{
+		if( otherStack == null )
+		{
+			return false;
+		}
 
-    @Override
+		return Objects.equals( this.sharedStack, ( (AEItemStack) otherStack ).sharedStack );
-    public boolean isSameType(final ItemStack otherStack) {
+	}
-        if (otherStack.isEmpty()) {
-            return false;
-        }
-        int oldSize = otherStack.getCount();
 
-        otherStack.setCount(1);
+	@Override
-        boolean ret = ItemStack.areItemStacksEqual(this.getDefinition(), otherStack);
+	public boolean isSameType( final ItemStack otherStack )
-        otherStack.setCount(oldSize);
+	{
+		if( otherStack.isEmpty() )
+		{
+			return false;
+		}
+		int oldSize = otherStack.getCount();
 
-        return ret;
+		otherStack.setCount( 1 );
-    }
+		boolean ret = ItemStack.areItemStacksEqual( this.getDefinition(), otherStack );
+		otherStack.setCount( oldSize );
 
-    @Override
+		return ret;
-    public int hashCode() {
+	}
-        return this.sharedStack.hashCode();
-    }
 
-    @Override
+	@Override
-    public boolean equals(final Object ia) {
+	public int hashCode()
-        if (ia instanceof AEItemStack) {
+	{
-            return this.isSameType((AEItemStack) ia);
+		return this.sharedStack.hashCode();
-        } else if (ia instanceof ItemStack) {
+	}
-            // this actually breaks the equals contract (being equals to unrelated classes)
-            return equals((ItemStack) ia);
-        }
-        return false;
-    }
 
-    @Override
+	@Override
-    public String toString() {
+	public boolean equals( final Object ia )
-        return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName();
+	{
-    }
+		if( ia instanceof AEItemStack )
+		{
+			return this.isSameType( (AEItemStack) ia );
+		}
+		else if( ia instanceof ItemStack )
+		{
+			return this.isSameType( (ItemStack) ia );
+		}
+		return false;
+	}
 
-    @SideOnly( Side.CLIENT )
+	@Override
-    public List<String> getToolTip() {
+	public String toString()
-        if (this.tooltip == null) {
+	{
-            this.tooltip = Platform.getTooltip(this.asItemStackRepresentation());
+		return this.getStackSize() + "x" + this.getDefinition().getItem().getUnlocalizedName() + "@" + this.getDefinition().getItemDamage();
-        }
+	}
-        return this.tooltip;
-    }
 
-    @SideOnly( Side.CLIENT )
+	@SideOnly( Side.CLIENT )
-    public String getDisplayName() {
+	public List<String> getToolTip()
-        if (this.displayName == null) {
+	{
-            this.displayName = Platform.getItemDisplayName(this.asItemStackRepresentation());
+		if( this.tooltip == null )
-        }
+		{
-        return this.displayName;
+			this.tooltip = Platform.getTooltip( this.asItemStackRepresentation() );
-    }
+		}
+		return this.tooltip;
+	}
 
-    @SideOnly( Side.CLIENT )
+	@SideOnly( Side.CLIENT )
-    public String getModID() {
+	public String getDisplayName()
-        return this.getDefinition().getItem().getRegistryName().getResourceDomain();
+	{
-    }
+		if( this.displayName == null )
+		{
+			this.displayName = Platform.getItemDisplayName( this.asItemStackRepresentation() );
+		}
+		return this.displayName;
+	}
 
-    @Override
+	@SideOnly( Side.CLIENT )
-    public boolean hasTagCompound() {
+	public String getModID()
-        return this.getDefinition().hasTagCompound();
+	{
-    }
+		if( this.uniqueID == null )
+		{
+			this.uniqueID = Item.REGISTRY.getNameForObject( this.getDefinition().getItem() );
+		}
 
-    @Override
+		if( this.uniqueID == null )
-    public ItemStack asItemStackRepresentation() {
+		{
-        return this.getDefinition().copy();
+			return "** Null";
-    }
+		}
 
-    @Override
+		return this.uniqueID.getResourceDomain() == null ? "** Null" : this.uniqueID.getResourceDomain();
-    public ItemStack getDefinition() {
+	}
-        return this.sharedStack.getDefinition();
-    }
 
-    public boolean equals(final ItemStack is) {
+	public Optional<OreReference> getOre()
-        return this.isSameType(is);
+	{
-    }
+		return this.oreReference;
+	}
 
-    AESharedItemStack getSharedStack() {
+	@Override
-        return this.sharedStack;
+	public boolean hasTagCompound()
-    }
+	{
+		return this.getDefinition().hasTagCompound();
+	}
 
-    private boolean fuzzyItemStackComparison(ItemStack a, ItemStack b, FuzzyMode mode) {
+	@Override
-        if (a.getItem() == b.getItem()) {
+	public ItemStack asItemStackRepresentation()
-            if (a.getItem().isDamageable()) {
+	{
-                if (mode == FuzzyMode.IGNORE_ALL) {
+		return this.getDefinition().copy();
-                    return true;
+	}
-                } else if (mode == FuzzyMode.PERCENT_99) {
-                    return (a.getItemDamage() > 1) == (b.getItemDamage() > 1);
-                } else {
-                    final float percentDamageOfA = (float) a.getItemDamage() / a.getMaxDamage();
-                    final float percentDamageOfB = (float) b.getItemDamage() / b.getMaxDamage();
 
-                    return (percentDamageOfA > mode.breakPoint) == (percentDamageOfB > mode.breakPoint);
+	@Override
-                }
+	public 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 {
+import appeng.util.Platform;
-    private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> REGISTRY = new WeakHashMap<>();
 
-    private AEItemStackRegistry() {
-    }
 
-    static synchronized AESharedItemStack getRegisteredStack(final @Nonnull ItemStack itemStack) {
+public final class AEItemStackRegistry
-        if (itemStack.isEmpty()) {
+{
-            throw new IllegalArgumentException("stack cannot be empty");
+	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();
+	private AEItemStackRegistry()
-        itemStack.setCount(1);
+	{
+	}
 
-        AESharedItemStack search = new AESharedItemStack(itemStack);
+	private static WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> registry()
-        WeakReference<AESharedItemStack> weak = REGISTRY.get(search);
+	{
-        AESharedItemStack ret = null;
+		if( Platform.isClient() )
+		{
+			return CLIENT_REGISTRY;
+		}
+		else
+		{
+			return SERVER_REGISTRY;
+		}
+	}
 
-        if (weak != null) {
+	static synchronized AESharedItemStack getRegisteredStack( final @Nonnull ItemStack itemStack )
-            ret = weak.get();
+	{
-        }
+		if( itemStack.isEmpty() )
+		{
+			throw new IllegalArgumentException( "stack cannot be empty" );
+		}
 
-        if (ret == null) {
+		int oldStackSize = itemStack.getCount();
-            ret = new AESharedItemStack(itemStack.copy());
+		itemStack.setCount( 1 );
-            REGISTRY.put(ret, new WeakReference<>(ret));
-        }
-        itemStack.setCount(oldStackSize);
 
-        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,263 @@
 
 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) {
+final class AESharedItemStack implements Comparable<AESharedItemStack>
-        this(itemStack, itemStack.getItemDamage());
+{
-    }
+	private static final NBTTagCompound LOW_TAG = new NBTTagCompound();
+	private static final NBTTagCompound HIGH_TAG = new NBTTagCompound();
 
-    /**
+	private final ItemStack itemStack;
-     * A constructor to explicitly set the damage value and not fetch it from the {@link ItemStack}
+	private final int itemId;
-     * 
+	private final int itemDamage;
-     * @param itemStack The {@link ItemStack} to filter
+	private final int hashCode;
-     * @param damage    The damage of the item
-     */
-    private AESharedItemStack(ItemStack itemStack, int damage) {
-        this.itemStack = itemStack;
-        this.itemId = Item.getIdFromItem(itemStack.getItem());
-        this.itemDamage = damage;
 
-        // Ensure this is always called last.
+	public AESharedItemStack( final ItemStack itemStack )
-        this.hashCode = this.makeHashCode();
+	{
-    }
+		this.itemStack = itemStack;
+		this.itemId = Item.getIdFromItem( itemStack.getItem() );
+		this.itemDamage = itemStack.getItemDamage();
+		this.hashCode = this.makeHashCode();
+	}
 
-    ItemStack getDefinition() {
+	Bounds getBounds( final FuzzyMode fuzzy, final boolean ignoreMeta )
-        return this.itemStack;
+	{
-    }
+		return new Bounds( this.itemStack, fuzzy, ignoreMeta );
+	}
 
-    int getItemDamage() {
+	ItemStack getDefinition()
-        return this.itemDamage;
+	{
-    }
+		return this.itemStack;
+	}
 
-    @Override
+	int getItemDamage()
-    public int hashCode() {
+	{
-        return this.hashCode;
+		return this.itemDamage;
-    }
+	}
 
-    @Override
+	int getItemID()
-    public boolean equals(final Object obj) {
+	{
-        if (this == obj) {
+		return this.itemId;
-            return true;
+	}
-        }
-        if (!(obj instanceof AESharedItemStack)) {
-            return false;
-        }
 
-        final AESharedItemStack other = (AESharedItemStack) obj;
+	@Override
-        Preconditions.checkState(this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1");
+	public int hashCode()
-        Preconditions.checkArgument(other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1");
+	{
+		return this.hashCode;
+	}
 
-        if (this.itemStack == other.itemStack) {
+	@Override
-            return true;
+	public boolean equals( final Object obj )
-        }
+	{
-        return ItemStack.areItemStacksEqual(this.itemStack, other.itemStack);
+		if( obj instanceof AESharedItemStack )
-    }
+		{
+			final AESharedItemStack other = (AESharedItemStack) obj;
 
-    private int makeHashCode() {
+			Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
-        return Objects.hash(
+			Preconditions.checkArgument( other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
-                this.itemId,
-                this.itemDamage,
-                this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0);
-    }
 
+			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 (itemStack.getMaxDamage() == 0)
+					{
+						newDef.setItemDamage(itemStack.getItemDamage() );
+					}
+					else 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 (itemStack.getMaxDamage() == 0)
+					{
+						newDef.setItemDamage(itemStack.getItemDamage() );
+					}
+					else 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;
+public abstract class AEStack<StackType extends IAEStack<StackType>> implements IAEStack<StackType>
-    private long stackSize;
+{
-    private long countRequestable;
 
-    @Override
+	private boolean isCraftable;
-    public long getStackSize() {
+	private long stackSize;
-        return this.stackSize;
+	private long countRequestable;
-    }
 
-    @Override
+	protected static long getPacketValue( final byte type, final ByteBuf tag )
-    public T setStackSize(final long ss) {
+	{
-        this.stackSize = ss;
+		if( type == 0 )
-        return (T) this;
+		{
-    }
+			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
+		return tag.readLong();
-    public long getCountRequestable() {
+	}
-        return this.countRequestable;
-    }
 
-    @Override
+	@Override
-    public T setCountRequestable(final long countRequestable) {
+	public long getStackSize()
-        this.countRequestable = countRequestable;
+	{
-        return (T) this;
+		return this.stackSize;
-    }
+	}
 
-    @Override
+	@Override
-    public boolean isCraftable() {
+	public StackType setStackSize( final long ss )
-        return this.isCraftable;
+	{
-    }
+		this.stackSize = ss;
+		return (StackType) this;
+	}
 
-    @Override
+	@Override
-    public T setCraftable(final boolean isCraftable) {
+	public long getCountRequestable()
-        this.isCraftable = isCraftable;
+	{
-        return (T) this;
+		return this.countRequestable;
-    }
+	}
 
-    @Override
+	@Override
-    public T reset() {
+	public StackType setCountRequestable( final long countRequestable )
-        this.stackSize = 0;
+	{
-        this.setCountRequestable(0);
+		this.countRequestable = countRequestable;
-        this.setCraftable(false);
+		return (StackType) this;
-        return (T) this;
+	}
-    }
 
-    @Override
+	@Override
-    public T empty() {
+	public boolean isCraftable()
-        final T dup = this.copy();
+	{
-        dup.reset();
+		return this.isCraftable;
-        return dup;
+	}
-    }
 
-    @Override
+	@Override
-    public boolean isMeaningful() {
+	public StackType setCraftable( final boolean isCraftable )
-        return this.stackSize != 0 || this.countRequestable > 0 || this.isCraftable;
+	{
-    }
+		this.isCraftable = isCraftable;
+		return (StackType) this;
+	}
 
-    @Override
+	@Override
-    public void incStackSize(final long i) {
+	public StackType reset()
-        this.stackSize += i;
+	{
-    }
+		this.stackSize = 0;
+		// priority = Integer.MIN_VALUE;
+		this.setCountRequestable( 0 );
+		this.setCraftable( false );
+		return (StackType) this;
+	}
 
-    @Override
+	@Override
-    public void decStackSize(final long i) {
+	public StackType empty()
-        this.stackSize -= i;
+	{
-    }
+		final StackType dup = this.copy();
+		dup.reset();
+		return dup;
+	}
 
-    @Override
+	@Override
-    public void incCountRequestable(final long i) {
+	public boolean isMeaningful()
-        this.countRequestable += i;
+	{
-    }
+		return this.stackSize != 0 || this.countRequestable > 0 || this.isCraftable;
+	}
 
-    @Override
+	@Override
-    public void decCountRequestable(final long i) {
+	public void incStackSize( final long i )
-        this.countRequestable -= 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 )
+	@Override
-    {
+	public void incCountRequestable( final long i )
-        if( type == 0 )
+	{
-        {
+		this.countRequestable += i;
-            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;
-        }
 
-        return tag.readLong();
+	@Override
-    }
+	public void decCountRequestable( final long i )
+	{
+		this.countRequestable -= i;
+	}
 
-    protected void putPacketValue( final ByteBuf tag, final long num )
+	protected byte getType( final long num )
-    {
+	{
-        if( num <= 255 )
+		if( num <= 255 )
-        {
+		{
-            tag.writeByte( (byte) ( num + Byte.MIN_VALUE ) );
+			return 0;
-        }
+		}
-        else if( num <= 65535 )
+		else if( num <= 65535 )
-        {
+		{
-            tag.writeShort( (short) ( num + Short.MIN_VALUE ) );
+			return 1;
-        }
+		}
-        else if( num <= 4294967295L )
+		else if( num <= 4294967295L )
-        {
+		{
-            tag.writeInt( (int) ( num + Integer.MIN_VALUE ) );
+			return 2;
-        }
+		}
-        else
+		else
-        {
+		{
-            tag.writeLong( num );
+			return 3;
-        }
+		}
-    }
+	}
 
-    protected byte getType( final long num )
+	protected abstract boolean hasTagCompound();
-    {
+
-        if( num <= 255 )
+	protected void putPacketValue( final ByteBuf tag, final long num )
-        {
+	{
-            return 0;
+		if( num <= 255 )
-        }
+		{
-        else if( num <= 65535 )
+			tag.writeByte( (byte) ( num + Byte.MIN_VALUE ) );
-        {
+		}
-            return 1;
+		else if( num <= 65535 )
-        }
+		{
-        else if( num <= 4294967295L )
+			tag.writeShort( (short) ( num + Short.MIN_VALUE ) );
-        {
+		}
-            return 2;
+		else if( num <= 4294967295L )
-        }
+		{
-        else
+			tag.writeInt( (int) ( num + Integer.MIN_VALUE ) );
-        {
+		}
-            return 3;
+		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.NavigableMap;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ConcurrentSkipListMap;
 
-import net.minecraft.item.Item;
+import net.minecraftforge.oredict.OreDictionary;
-
-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;
 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<>();
+public final class ItemList implements IItemList<IAEItemStack>
-    /**
+{
-     * 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);
 
-    @Override
+	private final NavigableMap<AESharedItemStack, IAEItemStack> records = new ConcurrentSkipListMap<>();
-    public IAEItemStack findPrecise(final IAEItemStack itemStack) {
-        if (itemStack == null) {
-            return null;
-        }
 
-        ItemVariantList record = this.records.get(itemStack.getItem());
+	@Override
-        return record != null ? record.findPrecise(itemStack) : null;
+	public void add( final IAEItemStack option )
-    }
+	{
+		if( option == null )
+		{
+			return;
+		}
 
-    @Override
+		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
-    public Collection<IAEItemStack> findFuzzy(final IAEItemStack filter, final FuzzyMode fuzzy) {
-        if (filter == null) {
-            return Collections.emptyList();
-        }
 
-        ItemVariantList record = this.records.get(filter.getItem());
+		if( st != null )
-        return record != null ? record.findFuzzy(filter, fuzzy) : Collections.emptyList();
+		{
-    }
+			st.add( option );
+			return;
+		}
 
-    @Override
+		final IAEItemStack opt = option.copy();
-    public boolean isEmpty() {
-        return !this.iterator().hasNext();
-    }
 
-    @Override
+		this.putItemRecord( opt );
-    public void add(final IAEItemStack itemStack) {
+	}
-        version.incrementAndGet();
 
-        if (itemStack == null) {
+	@Override
-            return;
+	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
+	@Override
-    public void addStorage(final IAEItemStack itemStack) {
+	public Collection<IAEItemStack> findFuzzy( final IAEItemStack filter, final FuzzyMode fuzzy )
-        version.incrementAndGet();
+	{
+		if( filter == null )
+		{
+			return Collections.emptyList();
+		}
 
-        if (itemStack == null) {
+		final AEItemStack ais = (AEItemStack) filter;
-            return;
-        }
 
-        this.getOrCreateRecord(itemStack.getItem()).addStorage(itemStack);
+		return ais.getOre().map( or ->
-    }
+		{
+			if( or.getAEEquivalents().size() == 1 )
+			{
+				final IAEItemStack is = or.getAEEquivalents().get( 0 );
 
-    @Override
+				return this.findFuzzyDamage( is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE );
-    public void addCrafting(final IAEItemStack itemStack) {
+			}
-        version.incrementAndGet();
+			else
+			{
+				final Collection<IAEItemStack> output = new ArrayList<>();
 
-        if (itemStack == null) {
+				for( final IAEItemStack is : or.getAEEquivalents() )
-            return;
+				{
-        }
+					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
+	@Override
-    public void addRequestable(final IAEItemStack itemStack) {
+	public boolean isEmpty()
-        version.incrementAndGet();
+	{
+		return !this.iterator().hasNext();
+	}
 
-        if (itemStack == null) {
+	@Override
-            return;
+	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
+		if( st != null )
-    public IAEItemStack getFirstItem() {
+		{
-        for (final IAEItemStack stackType : this) {
+			st.incStackSize( option.getStackSize() );
-            return stackType;
+			return;
-        }
+		}
 
-        return null;
+		final IAEItemStack opt = option.copy();
-    }
 
-    @Override
+		this.putItemRecord( opt );
-    public int size() {
+	}
-        int size = 0;
-        for (ItemVariantList entry : records.values()) {
-            size += entry.size();
-        }
 
-        return size;
+	/*
-    }
+	 * public void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI =
+	 * i.next(); if ( !AEI.isMeaningful() ) i.remove(); } }
+	 */
 
-    @Override
+	@Override
-    public Iterator<IAEItemStack> iterator() {
+	public void addCrafting( final IAEItemStack option )
-        return new ChainedIterator(this.records.values().iterator(), version);
+	{
-    }
+		if( option == null )
+		{
+			return;
+		}
 
-    @Override
+		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
-    public void resetStatus() {
-        for (final IAEItemStack i : this) {
-            i.reset();
-        }
-    }
 
-    private ItemVariantList getOrCreateRecord(Item item) {
+		if( st != null )
-        return this.records.computeIfAbsent(item, this::makeRecordMap);
+		{
-    }
+			st.setCraftable( true );
+			return;
+		}
 
-    private ItemVariantList makeRecordMap(Item item) {
+		final IAEItemStack opt = option.copy();
-        if (item.isDamageable()) {
+		opt.setStackSize( 0 );
-            return new FuzzyItemVariantList();
+		opt.setCraftable( true );
-        } else {
-            return new NormalItemVariantList();
-        }
-    }
 
-    /**
+		this.putItemRecord( opt );
-     * Iterates over multiple item lists as if they were one list.
+	}
-     */
-    private static class ChainedIterator implements Iterator<IAEItemStack> {
 
-        private final AtomicInteger parentVersion;
+	@Override
-        private final int version;
+	public void addRequestable( final IAEItemStack option )
-        private final Iterator<ItemVariantList> parent;
+	{
-        private Iterator<IAEItemStack> next;
+		if( option == null )
+		{
+			return;
+		}
 
-        public ChainedIterator(Iterator<ItemVariantList> iterator, AtomicInteger parentVersion) {
+		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
-            this.parent = iterator;
-            this.parentVersion = parentVersion;
-            this.version = parentVersion.get();
-            this.ensureItems();
-        }
 
-        @Override
+		if( st != null )
-        public boolean hasNext() {
+		{
-            return next != null && next.hasNext();
+			st.setCountRequestable( st.getCountRequestable() + option.getCountRequestable() );
-        }
+			return;
+		}
 
-        @Override
+		final IAEItemStack opt = option.copy();
-        public IAEItemStack next() {
+		opt.setStackSize( 0 );
-            if (this.next == null) {
+		opt.setCraftable( false );
-                throw new NoSuchElementException();
+		opt.setCountRequestable( option.getCountRequestable() );
-            }
-            if (this.version != this.parentVersion.get()) {
-                throw new ConcurrentModificationException();
-            }
 
-            IAEItemStack result = this.next.next();
+		this.putItemRecord( opt );
-            this.ensureItems();
+	}
-            return result;
-        }
 
-        private void ensureItems() {
+	@Override
-            if (hasNext()) {
+	public IAEItemStack getFirstItem()
-                return; // Still items left in the current one
+	{
-            }
+		for( final IAEItemStack stackType : this )
+		{
+			return stackType;
+		}
 
-            // Find the next iterator willing to return some items...
+		return null;
-            while (this.parent.hasNext()) {
+	}
-                this.next = this.parent.next().iterator();
 
-                if (this.next.hasNext()) {
+	@Override
-                    return; // Found one!
+	public int size()
-                }
+	{
-            }
+		return this.records.size();
+	}
 
-            // No more items
+	@Override
-            this.next = null;
+	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) {
+public class MeaningfulItemIterator<T extends IAEItemStack> implements Iterator<T>
-        this.parent = collection.iterator();
+{
-        this.next = seekNext();
-    }
 
-    @Override
+	private final Iterator<T> parent;
-    public boolean hasNext() {
+	private T next;
-        return this.next != null;
-    }
 
-    @Override
+	public MeaningfulItemIterator( final Iterator<T> iterator )
-    public T next() {
+	{
-        if (this.next == null) {
+		this.parent = iterator;
-            throw new NoSuchElementException();
+	}
-        }
 
-        T result = this.next;
+	@Override
-        this.next = this.seekNext();
+	public boolean hasNext()
-        return result;
+	{
-    }
+		while( this.parent.hasNext() )
+		{
+			this.next = this.parent.next();
 
-    private T seekNext() {
+			if( this.next.isMeaningful() )
-        while (this.parent.hasNext()) {
+			{
-            T item = this.parent.next();
+				return true;
+			}
+			else
+			{
+				this.parent.remove(); // self cleaning :3
+			}
+		}
 
-            if (item.isMeaningful()) {
+		this.next = null;
-                return item;
+		return false;
-            } else {
+	}
-                this.parent.remove();
-            }
-        }
 
-        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",

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",

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"

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"

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"

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"

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",

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",
+            "item": "appliedenergistics2:facade"
-            "nbt": "{item:\"minecraft:stone\"}"
         },
         "title": {
             "translate": "achievement.ae2.Facade"

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",

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"

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"

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"

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",

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",

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",

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"

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,8 +18,8 @@
             "conditions": {
                 "items": [
                     {
-                        "item": "appliedenergistics2:part",
+                        "type": "appliedenergistics2:part",
-                        "data": 460
+                        "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",

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

@@ -1,55 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "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:portable_cell"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:portable_cell"

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

@@ -1,31 +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
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:material",

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

@@ -1,34 +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
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quantum_link"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:quantum_link"

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

@@ -1,59 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "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"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:spatial_io_port"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:spatial_storage_cell_128_cubed"

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

@@ -1,59 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "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"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:spatial_io_port"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:spatial_io_port"

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

@@ -1,34 +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"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:part",
-                    "data": 220
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",

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

@@ -1,51 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "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"
-                }
-            ]
-        }
-    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:storage_cell_64k"

src/main/resources/assets/appliedenergistics2/aerecipes/grinder/fluix_dust.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "appliedenergistics2:material_exists",
-			"material": "material.fluix_dust"
-		}
-	],
 	"type": "appliedenergistics2:grinder",
 	"input": {
 		"type": "forge:ore_dict",

src/main/resources/assets/appliedenergistics2/aerecipes/grinder/sky_dust.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "minecraft:item_exists",
-			"item": "appliedenergistics2:sky_stone_block"
-		}
-	],
 	"type": "appliedenergistics2:grinder",
 	"input": {
 		"item": "appliedenergistics2:sky_stone_block"

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor.json

@@ -1,23 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.engineering_processor"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.engineering_processor_print"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.silicon_print"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "press",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_press.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "appliedenergistics2:material_exists",
-			"material": "material.calculation_processor_press"
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/calculation_processor_print.json

@@ -1,23 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.calculation_processor_print"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.calculation_processor_press"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.purified_certus_quartz_crystal"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor.json

@@ -1,23 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.calculation_processor"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.calculation_processor_print"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.silicon_print"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "press",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_press.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "appliedenergistics2:material_exists",
-			"material": "material.engineering_processor_press"
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/engineering_processor_print.json

@@ -1,19 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.engineering_processor_print"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.engineering_processor_press"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor.json

@@ -1,23 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.logic_processor"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.logic_processor_print"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.silicon_print"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "press",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_press.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "appliedenergistics2:material_exists",
-			"material": "material.logic_processor_press"
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/logic_processor_print.json

@@ -1,19 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.logic_processor_print"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.logic_processor_press"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_press.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "appliedenergistics2:material_exists",
-			"material": "material.silicon_press"
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/inscriber/silicon_print.json

@@ -1,19 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.silicon_print"
-				},
-				{
-					"type": "appliedenergistics2:material_exists",
-					"material": "material.silicon_press"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:inscriber",
 	"mode": "inscribe",
 	"result": {

src/main/resources/assets/appliedenergistics2/aerecipes/smelting/bread.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "appliedenergistics2:material_exists",
-			"material": "material.flour"
-		}
-	],
 	"type": "appliedenergistics2:smelt",
 	"result": {
 		"item": "minecraft:bread"

src/main/resources/assets/appliedenergistics2/aerecipes/smelting/silicon.json

@@ -1,10 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "appliedenergistics2:material_exists",
-			"material": "material.silicon"
-		}
-	],
 	"type": "appliedenergistics2:smelt",
 	"result": {
 		"part": "material.silicon"

src/main/resources/assets/appliedenergistics2/aerecipes/smelting/smooth_sky_stone_block.json

@@ -1,19 +1,4 @@
 {
-	"conditions": [
-		{
-			"type": "forge:and",
-			"values": [
-				{
-					"type": "minecraft:item_exists",
-					"item": "appliedenergistics2:smooth_sky_stone_block"
-				},
-				{
-					"type": "minecraft:item_exists",
-					"item": "appliedenergistics2:sky_stone_block"
-				}
-			]
-		}
-	],
 	"type": "appliedenergistics2:smelt",
 	"result": {
 		"item": "appliedenergistics2:smooth_sky_stone_block"

src/main/resources/assets/appliedenergistics2/recipes/_factories.json

@@ -1,8 +1,7 @@
 {
     "conditions": {
         "material_exists": "appeng.recipes.factories.conditions.MaterialExists",
-        "features": "appeng.recipes.factories.conditions.Features",
+        "features": "appeng.recipes.factories.conditions.Features"
-        "part_exists": "appeng.recipes.factories.conditions.PartExists"
     },
     "ingredients": {
         "part": "appeng.recipes.factories.ingredients.PartIngredientFactory"

src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block.json

@@ -1,10 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:quartz_block"
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_block"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_block"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.purified_certus_quartz_crystal"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_block"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_pillar"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_pillar",
         "count": 2

src/main/resources/assets/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:chiseled_quartz_block"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:chiseled_quartz_block",
         "count": 2

src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block.json

@@ -1,10 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:fluix_block"
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:fluix_block"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/fluix_block_pure.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:fluix_block"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.purified_fluix_crystal"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:fluix_block"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/light_detector.json

@@ -1,10 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:light_detector"
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:light_detector"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_block_pure.json

@@ -1,10 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "appliedenergistics2:material_exists",
-            "material": "material.purified_nether_quartz_crystal"
-        }
-    ],
     "result": {
         "item": "minecraft:quartz_block",
         "data": 0

src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_fixture.json

@@ -1,20 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_fixture"
-                },
-
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.certus_quartz_crystal_charged"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_fixture",
         "count": 2

src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_glass.json

@@ -1,10 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "minecraft:item_exists",
-            "item": "appliedenergistics2:quartz_glass"
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_glass",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_vibrant_glass"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_glass"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_vibrant_glass"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_brick.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_brick"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:smooth_sky_stone_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_brick"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_small_brick"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_brick"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_small_brick"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/sky_stone_smooth.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:smooth_sky_stone_block"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_small_brick"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:smooth_sky_stone_block"
     },

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:chiseled_quartz_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:chiseled_quartz_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:chiseled_quartz_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_fluix.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:fluix_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:fluix_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:fluix_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_pillar_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_pillar"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_pillar_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_brick_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_brick"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_brick_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_small_brick_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_small_brick"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_small_brick_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:smooth_sky_stone_slab"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:smooth_sky_stone_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:smooth_sky_stone_slab",
         "data": 0,

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:chiseled_quartz_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:chiseled_quartz_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:chiseled_quartz_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_fluix.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:fluix_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:fluix_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:fluix_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_pillar_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:quartz_pillar"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:quartz_pillar_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_brick_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_brick"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_brick_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_small_brick_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:sky_stone_small_brick"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:sky_stone_small_brick_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json

@@ -1,19 +1,4 @@
 {
-    "conditions": [
-        {
-            "type": "forge:and",
-            "values": [
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:smooth_sky_stone_stairs"
-                },
-                {
-                    "type": "minecraft:item_exists",
-                    "item": "appliedenergistics2:smooth_sky_stone_block"
-                }
-            ]
-        }
-    ],
     "result": {
         "item": "appliedenergistics2:smooth_sky_stone_stairs",
         "count": 4

src/main/resources/assets/appliedenergistics2/recipes/materials/advancedcard.json

@@ -1,17 +1,8 @@
 {
     "conditions": [
         {
-            "type": "forge:and",
+            "type": "appliedenergistics2:material_exists",
-            "values": [
+            "material": "material.advanced_card"
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.advanced_card"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.calculation_processor"
-                }
-            ]
         }
     ],
     "result": {

src/main/resources/assets/appliedenergistics2/recipes/materials/annihilationcore.json

@@ -1,17 +1,8 @@
 {
     "conditions": [
         {
-            "type": "forge:and",
+            "type": "appliedenergistics2:material_exists",
-            "values": [
+            "material": "material.annihilation_core"
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.annihilation_core"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.logic_processor"
-                }
-            ]
         }
     ],
     "result": {

src/main/resources/assets/appliedenergistics2/recipes/materials/basiccard.json

@@ -1,17 +1,8 @@
 {
     "conditions": [
         {
-            "type": "forge:and",
+            "type": "appliedenergistics2:material_exists",
-            "values": [
+            "material": "material.basic_card"
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.calculation_processor"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.basic_card"
-                }
-            ]
         }
     ],
     "result": {

src/main/resources/assets/appliedenergistics2/recipes/materials/cardcapacity.json

@@ -1,17 +1,8 @@
 {
     "conditions": [
         {
-            "type": "forge:and",
+            "type": "appliedenergistics2:material_exists",
-            "values": [
+            "material": "material.card_capacity"
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.card_capacity"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.basic_card"
-                }
-            ]
         }
     ],
     "result": {

src/main/resources/assets/appliedenergistics2/recipes/materials/cardcrafting.json

@@ -1,17 +1,8 @@
 {
     "conditions": [
         {
-            "type": "forge:and",
+            "type": "appliedenergistics2:material_exists",
-            "values": [
+            "material": "material.card_crafting"
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.card_crafting"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.basic_card"
-                }
-            ]
         }
     ],
     "result": {

src/main/resources/assets/appliedenergistics2/recipes/materials/cardfuzzy.json

@@ -1,17 +1,8 @@
 {
     "conditions": [
         {
-            "type": "forge:and",
+            "type": "appliedenergistics2:material_exists",
-            "values": [
+            "material": "material.card_fuzzy"
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.card_fuzzy"
-                },
-                {
-                    "type": "appliedenergistics2:material_exists",
-                    "material": "material.advanced_card"
-                }
-            ]
         }
     ],
     "result": {

src/main/resources/assets/appliedenergistics2/recipes/materials/cardinverter.json

@@ -1,17 +1,8 @@
 {
   "conditions": [
     {
-      "type": "forge:and",
+      "type": "appliedenergistics2:material_exists",
-      "values": [
+      "material": "material.card_inverter"
-        {
-          "type": "appliedenergistics2:material_exists",
-          "material": "material.card_inverter"
-        },
-        {
-          "type": "appliedenergistics2:material_exists",
-          "material": "material.advanced_card"
-        }
-      ]
     }
   ],
   "result": {