Use craftinggrid to check existing patterns for JEI recipe transfer. (#…

…3202)
AppliedEnergistics · Nov 12, 2017 · fab42cc · fab42cc
1 parent f5dd2c8
commit fab42cc
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java b/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java
@@ -41,6 +41,7 @@
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
+import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.security.ISecurityGrid;
 import appeng.api.networking.storage.IStorageGrid;
@@ -132,6 +133,7 @@ public void serverPacketData( final INetworkInfo manager, final AppEngPacket pac
 		final IStorageGrid inv = grid.getCache( IStorageGrid.class );
 		final IEnergyGrid energy = grid.getCache( IEnergyGrid.class );
 		final ISecurityGrid security = grid.getCache( ISecurityGrid.class );
+		final ICraftingGrid crafting = grid.getCache( ICraftingGrid.class );
 		final IItemHandler craftMatrix = cct.getInventoryByName( "crafting" );
 		final IItemHandler playerInventory = cct.getInventoryByName( "player" );
 
@@ -179,13 +181,23 @@ public void serverPacketData( final INetworkInfo manager, final AppEngPacket pac
 							{
 								request.setStackSize( 1 );
 								IAEItemStack out;
+
 								if( cct.useRealItems() )
 								{
 									out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() );
 								}
 								else
 								{
-									out = storage.extractItems( request, Actionable.SIMULATE, cct.getActionSource() );
+									// Query the crafting grid if there is a pattern providing the item
+									if( !crafting.getCraftingFor( request, null, 0, null ).isEmpty() )
+									{
+										out = request;
+									}
+									else
+									{
+										// Fall back using an existing item
+										out = storage.extractItems( request, Actionable.SIMULATE, cct.getActionSource() );
+									}
 								}
 
 								if( out != null )