Fixes #3746: Revert OreDict use for cable anchors. Blame Forge for crashes. (#3764)

Fixed missing *

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: You found a bug or encountered a crash? Please report it here.
+
+---
+
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
+
+**Describe the bug**
+<!-- Always use the most recent version from ae-mod.info, it might already be fixed. -->
+
+**To Reproduce**
+<!-- Please provide the steps to reproduce it, otherwise we might not be able to fix it. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Additional context**
+<!-- Screenshots, crashlogs, etc. -->
+<!-- A complete crashlog is required when reporting a crash. No excerpts. -->
+<!-- Please use pastebin or gist for posting the complete crashlog. -->
+
+**Environment**
+<!-- Include as many relevant details about the environment -->
+<!-- Like the used version, SP/MP, other mods and their version -->
+<!-- The following ones are required, please note "latest" is not a version -->
+
+- Minecraft Version: 
+- AE2 Version: 
+- Forge Version:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature Request
+about: A feature request or suggestion to improve Applied Energistics 2
+
+---
+
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
+
+**Describe the feature**
+<!-- Tell us how it should work. -->
+
+**Reasons why it should be considered**
+<!-- This can help us in various degrees, e.g. to determine if it fits our design ideas. -->
+
+**Additional Context**
+<!-- Use this for further details, e.g. screenshots, links to mods for integrations. -->
+<!-- Features will only be considered for the latest/next version. -->

gradle.properties

@@ -9,7 +9,7 @@ aebasename=appliedenergistics2
 #########################################################
 minecraft_version=1.12.2
 mcp_mappings=snapshot_20171003
-forge_version=14.23.3.2655
+forge_version=14.23.5.2768
 
 #########################################################
 # Installable                                           #
@@ -19,7 +19,7 @@ hwyla_version=1.8.26-B41_1.12.2
 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=4.10.0.198
+jei_version=4.13.0.219
 tesla_version=1.0.63
 ic2_version=2.8.73-ex112
 top_version=1.12-1.4.23-16

src/api/java/appeng/api/implementations/items/IStorageCell.java

@@ -24,6 +24,8 @@
 package appeng.api.implementations.items;
 
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.item.ItemStack;
 
 import appeng.api.storage.ICellWorkbenchItem;
@@ -52,7 +54,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return number of bytes
 	 */
-	int getBytes( ItemStack cellItem );
+	int getBytes( @Nonnull ItemStack cellItem );
 
 	/**
 	 * Determines the number of bytes used for any type included on the cell.
@@ -61,7 +63,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return number of bytes
 	 */
-	int getBytesPerType( ItemStack cellItem );
+	int getBytesPerType( @Nonnull ItemStack cellItem );
 
 	/**
 	 * Must be between 1 and 63, indicates how many types you want to store on
@@ -71,7 +73,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return number of types
 	 */
-	int getTotalTypes( ItemStack cellItem );
+	int getTotalTypes( @Nonnull ItemStack cellItem );
 
 	/**
 	 * Allows you to fine tune which items are allowed on a given cell, if you
@@ -83,7 +85,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return true to preventAdditionOfItem
 	 */
-	boolean isBlackListed( ItemStack cellItem, T requestedAddition );
+	boolean isBlackListed( @Nonnull ItemStack cellItem, @Nonnull T requestedAddition );
 
 	/**
 	 * Allows you to specify if this storage cell can be stored inside other
@@ -104,7 +106,7 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	 *
 	 * @return if the ItemStack should behavior as a storage cell.
 	 */
-	boolean isStorageCell( ItemStack i );
+	boolean isStorageCell( @Nonnull ItemStack i );
 
 	/**
 	 * @return drain in ae/t this storage cell will use.
@@ -114,5 +116,6 @@ public interface IStorageCell<T extends IAEStack<T>> extends ICellWorkbenchItem
 	/**
 	 * @return the type of channel your cell should be part of
 	 */
+	@Nonnull
 	IStorageChannel<T> getChannel();
 }

src/main/java/appeng/client/render/cablebus/FacadeBuilder.java

@@ -67,8 +67,8 @@ import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadTinter;
 public class FacadeBuilder
 {
 
-	public static double THICK_THICKNESS = 2D / 16D;
+	public static final double THICK_THICKNESS = 2D / 16D;
-	public static double THIN_THICKNESS = 1D / 16D;
+	public static final double THIN_THICKNESS = 1D / 16D;
 
 	public static final AxisAlignedBB[] THICK_FACADE_BOXES = new AxisAlignedBB[] {
 			new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, THICK_THICKNESS, 1.0 ),
@@ -141,7 +141,7 @@ public class FacadeBuilder
 
 			IBlockState blockState = facadeRenderState.getSourceBlock();
 			// If we aren't forcing transparency let the block decide if it should render.
-			if( !transparent )
+			if( !transparent && layer != null )
 			{
 				if( !blockState.getBlock().canRenderInLayer( blockState, layer ) )
 				{
@@ -224,7 +224,7 @@ public class FacadeBuilder
 
 			List<BakedQuad> modelQuads = new ArrayList<>();
 			// If we are forcing transparent facades, fake the render layer, and grab all quads.
-			if( transparent )
+			if( transparent || layer == null )
 			{
 				for( BlockRenderLayer forcedLayer : BlockRenderLayer.values() )
 				{

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

@@ -100,15 +100,18 @@ class GlassBakedModel implements IBakedModel
 	@Override
 	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
 	{
-
 		if( !( state instanceof IExtendedBlockState ) || side == null )
 		{
 			return Collections.emptyList();
 		}
 
-		IExtendedBlockState extState = (IExtendedBlockState) state;
+		final IExtendedBlockState extState = (IExtendedBlockState) state;
+		final GlassState glassState = extState.getValue( BlockQuartzGlass.GLASS_STATE );
 
-		GlassState glassState = extState.getValue( BlockQuartzGlass.GLASS_STATE );
+		if( glassState == null )
+		{
+			return Collections.emptyList();
+		}
 
 		final int cx = Math.abs( glassState.getX() % 10 );
 		final int cy = Math.abs( glassState.getY() % 10 );
@@ -125,12 +128,12 @@ class GlassBakedModel implements IBakedModel
 			v /= 2;
 		}
 
-		TextureAtlasSprite glassTexture = this.glassTextures[texIdx];
+		final TextureAtlasSprite glassTexture = this.glassTextures[texIdx];
 
 		// Render the glass side
-		List<BakedQuad> quads = new ArrayList<>( 5 ); // At most 5
+		final List<BakedQuad> quads = new ArrayList<>( 5 ); // At most 5
 
-		List<Vec3d> corners = RenderHelper.getFaceCorners( side );
+		final List<Vec3d> corners = RenderHelper.getFaceCorners( side );
 		quads.add( this.createQuad( side, corners, glassTexture, u, v ) );
 
 		/*
@@ -143,8 +146,9 @@ class GlassBakedModel implements IBakedModel
 		 * Converted to a number, this bitmask is 5. So the texture at index 5 is used.
 		 * That texture had "0101" in its filename to indicate this.
 		 */
-		int edgeBitmask = makeBitmask( glassState, side );
+		final int edgeBitmask = makeBitmask( glassState, side );
-		TextureAtlasSprite sideSprite = this.frameTextures[edgeBitmask];
+		final TextureAtlasSprite sideSprite = this.frameTextures[edgeBitmask];
+
 		if( sideSprite != null )
 		{
 			quads.add( this.createQuad( side, corners, sideSprite, 0, 0 ) );

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

@@ -462,7 +462,6 @@ public abstract class AEBaseContainer extends Container
 							else if( destination.isEmpty() )
 							{
 								cs.putStack( tis.copy() );
-								cs.onSlotChanged();
 								this.updateSlot( cs );
 								break;
 							}

src/main/java/appeng/container/slot/AppEngSlot.java

@@ -87,7 +87,7 @@ public class AppEngSlot extends Slot
 	{
 		if( this.isSlotEnabled() )
 		{
-			return ItemHandlerUtil.isItemValidForSlot( this.itemHandler, this.index, par1ItemStack );
+			return this.itemHandler.isItemValid( this.index, par1ItemStack );
 		}
 		return false;
 	}
@@ -121,7 +121,6 @@ public class AppEngSlot extends Slot
 		if( this.isSlotEnabled() )
 		{
 			ItemHandlerUtil.setStackInSlot( this.itemHandler, this.index, stack );
-			this.onSlotChanged();
 
 			if( this.getContainer() != null )
 			{
@@ -138,7 +137,6 @@ public class AppEngSlot extends Slot
 	@Override
 	public void onSlotChanged()
 	{
-		ItemHandlerUtil.markDirty( this.itemHandler, this.index );
 		this.setIsValid( hasCalculatedValidness.NotAvailable );
 	}
 

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

@@ -19,14 +19,17 @@
 package appeng.core.api.definitions;
 
 
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.EntityEntryBuilder;
+import net.minecraftforge.oredict.OreDictionary;
 
 import appeng.api.definitions.IItemDefinition;
 import appeng.api.definitions.IItems;
 import appeng.api.util.AEColoredItemDefinition;
 import appeng.bootstrap.FeatureFactory;
 import appeng.bootstrap.components.IEntityRegistrationComponent;
+import appeng.bootstrap.components.IOreDictComponent;
 import appeng.client.render.crafting.ItemEncodedPatternRendering;
 import appeng.core.CreativeTabFacade;
 import appeng.core.features.AEFeature;
@@ -158,9 +161,13 @@ public final class ApiItems implements IItems
 		this.certusQuartzSword = certusTools.item( "certus_quartz_sword", () -> new ToolQuartzSword( AEFeature.CERTUS_QUARTZ_TOOLS ) )
 				.addFeatures( AEFeature.QUARTZ_SWORD )
 				.build();
-		this.certusQuartzWrench = certusTools.item( "certus_quartz_wrench", ToolQuartzWrench::new ).addFeatures( AEFeature.QUARTZ_WRENCH ).build();
+		this.certusQuartzWrench = certusTools.item( "certus_quartz_wrench", ToolQuartzWrench::new )
+				.addFeatures( AEFeature.QUARTZ_WRENCH )
+				.bootstrap( item -> (IOreDictComponent) side -> OreDictionary.registerOre( "itemQuartzWrench", new ItemStack( item ) ) )
+				.build();
 		this.certusQuartzKnife = certusTools.item( "certus_quartz_cutting_knife", () -> new ToolQuartzCuttingKnife( AEFeature.CERTUS_QUARTZ_TOOLS ) )
 				.addFeatures( AEFeature.QUARTZ_KNIFE )
+				.bootstrap( item -> (IOreDictComponent) side -> OreDictionary.registerOre( "itemQuartzKnife", new ItemStack( item ) ) )
 				.build();
 
 		FeatureFactory netherTools = registry.features( AEFeature.NETHER_QUARTZ_TOOLS );
@@ -179,9 +186,13 @@ public final class ApiItems implements IItems
 		this.netherQuartzSword = netherTools.item( "nether_quartz_sword", () -> new ToolQuartzSword( AEFeature.NETHER_QUARTZ_TOOLS ) )
 				.addFeatures( AEFeature.QUARTZ_SWORD )
 				.build();
-		this.netherQuartzWrench = netherTools.item( "nether_quartz_wrench", ToolQuartzWrench::new ).addFeatures( AEFeature.QUARTZ_WRENCH ).build();
+		this.netherQuartzWrench = netherTools.item( "nether_quartz_wrench", ToolQuartzWrench::new )
+				.addFeatures( AEFeature.QUARTZ_WRENCH )
+				.bootstrap( item -> (IOreDictComponent) side -> OreDictionary.registerOre( "itemQuartzWrench", new ItemStack( item ) ) )
+				.build();
 		this.netherQuartzKnife = netherTools.item( "nether_quartz_cutting_knife", () -> new ToolQuartzCuttingKnife( AEFeature.NETHER_QUARTZ_TOOLS ) )
 				.addFeatures( AEFeature.QUARTZ_KNIFE )
+				.bootstrap( item -> (IOreDictComponent) side -> OreDictionary.registerOre( "itemQuartzKnife", new ItemStack( item ) ) )
 				.build();
 
 		FeatureFactory powerTools = registry.features( AEFeature.POWERED_TOOLS );

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

@@ -85,11 +85,11 @@ public class FluidCellConfig extends CellConfig
 	}
 
 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
 		if( stack.isEmpty() || stack.getItem() instanceof FluidDummyItem )
 		{
-			super.isItemValidForSlot( slot, stack );
+			super.isItemValid( slot, stack );
 		}
 		FluidStack fluid = FluidUtil.getFluidContained( stack );
 		if( fluid == null || !Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() )
@@ -100,7 +100,7 @@ public class FluidCellConfig extends CellConfig
 		ItemStack is = Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).get();
 		FluidDummyItem item = (FluidDummyItem) is.getItem();
 		item.setFluidStack( is, fluid );
-		return super.isItemValidForSlot( slot, is );
+		return super.isItemValid( slot, is );
 	}
 
 }

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

@@ -32,6 +32,7 @@ import net.minecraft.item.ItemStack;
 import mezz.jei.api.IJeiRuntime;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
+import mezz.jei.api.ISubtypeRegistry;
 import mezz.jei.api.recipe.IRecipeCategoryRegistration;
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
 
@@ -54,6 +55,12 @@ import appeng.items.parts.ItemFacade;
 @mezz.jei.api.JEIPlugin
 public class JEIPlugin implements IModPlugin
 {
+	@Override
+	public void registerItemSubtypes( ISubtypeRegistry subtypeRegistry )
+	{
+		final Optional<Item> maybeFacade = AEApi.instance().definitions().items().facade().maybeItem();
+		maybeFacade.ifPresent( subtypeRegistry::useNbtForSubtypes );
+	}
 
 	@Override
 	public void registerCategories( IRecipeCategoryRegistration registry )

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

@@ -64,52 +64,44 @@ public class BasicCellInventory<T extends IAEStack<T>> extends AbstractCellInven
 		}
 	}
 
-	public static <T extends AEStack<T>> boolean isCellOfType( final ItemStack input, IStorageChannel channel )
+	public static <T extends AEStack<T>> boolean isCellOfType( final ItemStack input, IStorageChannel<?> channel )
 	{
-		if( input == null )
+		final IStorageCell<?> type = getStorageCell( input );
-		{
-			return false;
-		}
 
-		final Item type = input.getItem();
+		return type != null && type.getChannel() == channel;
-		if( type instanceof IStorageCell )
-		{
-			return ( (IStorageCell) type ).getChannel() == channel;
-		}
-
-		return false;
 	}
 
 	public static boolean isCell( final ItemStack input )
 	{
-		if( input == null )
+		return getStorageCell( input ) != null;
-		{
+	}
-			return false;
-		}
 
-		try
+	private boolean isStorageCell( final T input )
+	{
+		if( input instanceof IAEItemStack )
 		{
-			final Item type = input.getItem();
+			final IAEItemStack stack = (IAEItemStack) input;
-			if( type instanceof IStorageCell )
+			final IStorageCell<?> type = getStorageCell( stack.getDefinition() );
-			{
+
-				return !( (IStorageCell) type ).storableInStorageCell();
+			return type != null && !type.storableInStorageCell();
-			}
-		}
-		catch( final Throwable err )
-		{
-			return true;
 		}
 
 		return false;
 	}
 
-	private boolean isStorageCell( final T input )
+	private static IStorageCell<?> getStorageCell( final ItemStack input )
 	{
-		if( !input.isItem() )
+		if( input != null )
 		{
-			return false;
+			final Item type = input.getItem();
+
+			if( type instanceof IStorageCell )
+			{
+				return (IStorageCell<?>) type;
+			}
 		}
-		return isCell( ( (IAEItemStack) input ).getDefinition() );
+
+		return null;
 	}
 
 	@SuppressWarnings( { "rawtypes", "unchecked" } )

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

@@ -288,7 +288,18 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
 		{
-			this.resetCache( false );
+			final TileEntity te = w.getTileEntity( neighbor );
+
+			// In case the TE was destroyed, we have to do a full reset immediately.
+			if( te == null )
+			{
+				this.resetCache( true );
+				this.resetCache();
+			}
+			else
+			{
+				this.resetCache( false );
+			}
 		}
 	}
 

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

@@ -3,15 +3,15 @@ package appeng.tile.inventory;
 
 
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import appeng.api.storage.ICellInventory;
 import appeng.api.storage.ICellInventoryHandler;
 import appeng.util.inv.IAEAppEngInventory;
-import appeng.util.inv.IInternalItemHandler;
 import appeng.util.inv.filter.IAEItemFilter;
 
 
-public class AppEngCellInventory implements IInternalItemHandler
+public class AppEngCellInventory implements IItemHandlerModifiable
 {
 	private final AppEngInternalInventory inv;
 	private final ICellInventoryHandler handlerForSlot[];
@@ -78,17 +78,9 @@ public class AppEngCellInventory implements IInternalItemHandler
 	}
 
 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
-		return this.inv.isItemValidForSlot( slot, stack );
+		return this.inv.isItemValid( slot, stack );
-	}
-
-	@Override
-	public void markDirty( int slot )
-	{
-		this.persist( slot );
-		this.inv.markDirty( slot );
-		this.cleanup( slot );
 	}
 
 	public void persist()

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

@@ -25,6 +25,7 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemHandlerHelper;
 
 import appeng.api.AEApi;
@@ -33,14 +34,13 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.core.AELog;
 import appeng.util.Platform;
 import appeng.util.inv.IAEAppEngInventory;
-import appeng.util.inv.IInternalItemHandler;
 import appeng.util.inv.InvOperation;
 import appeng.util.item.AEItemStack;
 import appeng.util.iterators.AEInvIterator;
 import appeng.util.iterators.InvIterator;
 
 
-public class AppEngInternalAEInventory implements IInternalItemHandler, Iterable<ItemStack>
+public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterable<ItemStack>
 {
 	private final IAEAppEngInventory te;
 	private final IAEItemStack[] inv;
@@ -254,7 +254,7 @@ public class AppEngInternalAEInventory implements IInternalItemHandler, Iterable
 
 	private void fireOnChangeInventory( int slot, InvOperation op, ItemStack removed, ItemStack inserted )
 	{
-		if( this.te != null && Platform.isServer() )
+		if( this.te != null && Platform.isServer() && !this.dirtyFlag )
 		{
 			this.dirtyFlag = true;
 			this.te.onChangeInventory( this, slot, op, removed, inserted );
@@ -281,17 +281,8 @@ public class AppEngInternalAEInventory implements IInternalItemHandler, Iterable
 	}
 
 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
 		return true;
 	}
-
-	@Override
-	public void markDirty( int slot )
-	{
-		if( !this.dirtyFlag )
-		{
-			this.fireOnChangeInventory( slot, InvOperation.DIRTY, ItemStack.EMPTY, ItemStack.EMPTY );
-		}
-	}
 }

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

@@ -31,12 +31,11 @@ import net.minecraftforge.items.ItemStackHandler;
 
 import appeng.util.Platform;
 import appeng.util.inv.IAEAppEngInventory;
-import appeng.util.inv.IInternalItemHandler;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.filter.IAEItemFilter;
 
 
-public class AppEngInternalInventory extends ItemStackHandler implements IInternalItemHandler, Iterable<ItemStack>
+public class AppEngInternalInventory extends ItemStackHandler implements Iterable<ItemStack>
 {
 	private boolean enableClientEvents = false;
 	private IAEAppEngInventory te;
@@ -117,7 +116,7 @@ public class AppEngInternalInventory extends ItemStackHandler implements IIntern
 	@Override
 	protected void onContentsChanged( int slot )
 	{
-		if( this.getTileEntity() != null && this.eventsEnabled() )
+		if( this.getTileEntity() != null && this.eventsEnabled() && !this.dirtyFlag )
 		{
 			this.dirtyFlag = true;
 			ItemStack newStack = this.getStackInSlot( slot ).copy();
@@ -159,19 +158,7 @@ public class AppEngInternalInventory extends ItemStackHandler implements IIntern
 	}
 
 	@Override
-	public void markDirty( final int slot )
+	public boolean isItemValid( int slot, ItemStack stack )
-	{
-		if( this.getTileEntity() != null && this.eventsEnabled() && !this.dirtyFlag )
-		{
-			this.dirtyFlag = true;
-			this.getTileEntity().onChangeInventory( this, slot, InvOperation.DIRTY, ItemStack.EMPTY, ItemStack.EMPTY );
-			this.getTileEntity().saveChanges();
-			this.dirtyFlag = false;
-		}
-	}
-
-	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
 	{
 		if( this.maxStack[slot] == 0 )
 		{

src/main/java/appeng/util/helpers/ItemHandlerUtil.java

@@ -24,8 +24,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
-import appeng.util.inv.IInternalItemHandler;
-
 
 public class ItemHandlerUtil
 {
@@ -66,37 +64,6 @@ public class ItemHandlerUtil
 		return true;
 	}
 
-	public static void markDirty( final IItemHandler inv, final int slot )
-	{
-		if( inv instanceof IInternalItemHandler )
-		{
-			( (IInternalItemHandler) inv ).markDirty( slot );
-		}
-	}
-
-	public static boolean isItemValidForSlot( final IItemHandler inv, int slot, ItemStack stack )
-	{
-		if( stack.isEmpty() )
-		{
-			return false;
-		}
-
-		if( inv instanceof IInternalItemHandler )
-		{
-			return ( (IInternalItemHandler) inv ).isItemValidForSlot( slot, stack );
-		}
-
-		// empty slot
-		ItemStack currentStack = inv.getStackInSlot( slot );
-		setStackInSlot( inv, slot, ItemStack.EMPTY );
-		// test insert
-		ItemStack remainder = inv.insertItem( slot, stack, true );
-		// restore slot
-		setStackInSlot( inv, slot, currentStack );
-
-		return remainder.isEmpty() || remainder.getCount() < stack.getCount();
-	}
-
 	public static void copy( final IItemHandler from, final IItemHandler to, boolean deepCopy )
 	{
 		for( int i = 0; i < Math.min( from.getSlots(), to.getSlots() ); ++i )

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

@@ -1,31 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2017, 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.inv;
-
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandlerModifiable;
-
-
-public interface IInternalItemHandler extends IItemHandlerModifiable
-{
-	boolean isItemValidForSlot( int slot, ItemStack stack );
-
-	void markDirty( int slot );
-}

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

@@ -21,5 +21,5 @@ package appeng.util.inv;
 
 public enum InvOperation
 {
-	EXTRACT, INSERT, SET, DIRTY
+	EXTRACT, INSERT, SET
 }

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

@@ -25,12 +25,13 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.wrapper.EmptyHandler;
 
 import appeng.util.helpers.ItemHandlerUtil;
 
 
-public class WrapperChainedItemHandler implements IInternalItemHandler
+public class WrapperChainedItemHandler implements IItemHandlerModifiable
 {
 	private IItemHandler[] itemHandler; // the handlers
 	private int[] baseIndex; // index-offsets of the different handlers
@@ -159,20 +160,11 @@ public class WrapperChainedItemHandler implements IInternalItemHandler
 	}
 
 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
 		int index = this.getIndexForSlot( slot );
 		IItemHandler handler = this.getHandlerFromIndex( index );
 		int targetSlot = this.getSlotFromIndex( slot, index );
-		return ItemHandlerUtil.isItemValidForSlot( handler, targetSlot, stack );
+		return handler.isItemValid( targetSlot, stack );
-	}
-
-	@Override
-	public void markDirty( int slot )
-	{
-		int index = this.getIndexForSlot( slot );
-		IItemHandler handler = this.getHandlerFromIndex( index );
-		int targetSlot = this.getSlotFromIndex( slot, index );
-		ItemHandlerUtil.markDirty( handler, targetSlot );
 	}
 }

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

@@ -23,12 +23,13 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.filter.IAEItemFilter;
 
 
-public class WrapperFilteredItemHandler implements IInternalItemHandler
+public class WrapperFilteredItemHandler implements IItemHandlerModifiable
 {
 	private final IItemHandler handler;
 	private final IAEItemFilter filter;
@@ -86,18 +87,12 @@ public class WrapperFilteredItemHandler implements IInternalItemHandler
 	}
 
 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
 		if( !this.filter.allowInsert( this.handler, slot, stack ) )
 		{
 			return false;
 		}
-		return ItemHandlerUtil.isItemValidForSlot( this.handler, slot, stack );
+		return this.handler.isItemValid( slot, stack );
-	}
-
-	@Override
-	public void markDirty( int slot )
-	{
-		ItemHandlerUtil.markDirty( this.handler, slot );
 	}
 }

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

@@ -105,7 +105,7 @@ public class WrapperInvItemHandler implements IInventory
 	@Override
 	public void markDirty()
 	{
-		ItemHandlerUtil.markDirty( this.inv, -1 );
+		// NOP
 	}
 
 	@Override
@@ -129,7 +129,7 @@ public class WrapperInvItemHandler implements IInventory
 	@Override
 	public boolean isItemValidForSlot( int index, ItemStack stack )
 	{
-		return ItemHandlerUtil.isItemValidForSlot( this.inv, index, stack );
+		return this.inv.isItemValid( index, stack );
 	}
 
 	@Override

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

@@ -23,12 +23,13 @@ import java.util.function.Supplier;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import appeng.util.Lazy;
 import appeng.util.helpers.ItemHandlerUtil;
 
 
-public class WrapperLazyItemHandler implements IInternalItemHandler
+public class WrapperLazyItemHandler implements IItemHandlerModifiable
 {
 	private final Lazy<IItemHandler> sourceHandler;
 
@@ -74,14 +75,8 @@ public class WrapperLazyItemHandler implements IInternalItemHandler
 	}
 
 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
-		return ItemHandlerUtil.isItemValidForSlot( this.sourceHandler.get(), slot, stack );
+		return this.sourceHandler.get().isItemValid( slot, stack );
-	}
-
-	@Override
-	public void markDirty( int slot )
-	{
-		ItemHandlerUtil.markDirty( this.sourceHandler.get(), slot );
 	}
 }

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

@@ -23,11 +23,12 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import appeng.util.helpers.ItemHandlerUtil;
 
 
-public class WrapperRangeItemHandler implements IInternalItemHandler
+public class WrapperRangeItemHandler implements IItemHandlerModifiable
 {
 	private final IItemHandler compose;
 	private final int minSlot;
@@ -108,22 +109,12 @@ public class WrapperRangeItemHandler implements IInternalItemHandler
 	}
 
 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
 		if( this.checkSlot( slot ) )
 		{
-			return ItemHandlerUtil.isItemValidForSlot( this.compose, slot + this.minSlot, stack );
+			return this.compose.isItemValid( slot + this.minSlot, stack );
 		}
 		return false;
 	}
-
-	@Override
-	public void markDirty( int slot )
-	{
-		if( this.checkSlot( slot ) )
-		{
-			ItemHandlerUtil.markDirty( this.compose, slot + this.minSlot );
-		}
-	}
-
 }

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

@@ -19,6 +19,26 @@
             }
         ]
     },
+    {
+        "name": "appliedenergistics2:fluid_interface",
+        "conditions": [
+            {
+                "type": "appliedenergistics2:features",
+                "features": [
+                    "fluid_interface"
+                ]
+            }
+        ],
+        "ingredient": [
+            {
+                "item": "appliedenergistics2:fluid_interface"
+            },
+            {
+                "type": "appliedenergistics2:part",
+                "part": "part.fluid_interface"
+            }
+        ]
+    },
     {
         "name": "appliedenergistics2:knife",
         "conditions": [
@@ -38,25 +58,6 @@
             }
         ]
     },
-    {
-        "name": "appliedenergistics2:wrench",
-        "conditions": [
-            {
-                "type": "appliedenergistics2:features",
-                "features": [
-                    "quartz_wrench"
-                ]
-            }
-        ],
-        "ingredient": [
-            {
-                "item": "appliedenergistics2:certus_quartz_wrench"
-            },
-            {
-                "item": "appliedenergistics2:nether_quartz_wrench"
-            }
-        ]
-    },
     {
         "name": "appliedenergistics2:cable",
         "ingredient": [

src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json

@@ -12,7 +12,7 @@
     "key": {
         "b": {
             "type": "appliedenergistics2:part",
-            "part": "material.engineering_processor"
+            "part": "material.calculation_processor"
         },
         "d": {
             "item": "appliedenergistics2:quartz_glass"

src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json

@@ -12,7 +12,7 @@
     "key": {
         "b": {
             "type": "appliedenergistics2:part",
-            "part": "material.engineering_processor"
+            "part": "material.calculation_processor"
         },
         "c": {
             "type": "appliedenergistics2:part",

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

@@ -9,7 +9,7 @@
             "item": "minecraft:sticky_piston"
         },
         {
-            "item": "#appliedenergistics2:interface"
+            "item": "#appliedenergistics2:fluid_interface"
         },
         {
             "item": "minecraft:piston"

src/main/resources/assets/appliedenergistics2/recipes/tools/network_tool.json

@@ -13,7 +13,8 @@
             "ore": "chestWood"
         },
         {
-            "item": "#appliedenergistics2:wrench"
+            "type": "forge:ore_dict",
+            "ore": "itemQuartzWrench"
         },
         {
             "type": "appliedenergistics2:part",