fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #3411: Limit patterns without substitute to precise operations. (#3413)

Browse Source 
This will no longer ignore NBT data when searching for an itemstack,
thus less likely to trigger the CraftingManager fallback.
This commit is contained in:
yueh
2018-03-08 16:35:13 +01:00
committed by GitHub
parent 6c7cbb7ee1
commit b32834e2b3
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+22 -3
View File
@@ -19,6 +19,7 @@
package appeng.me.cluster.implementations; package appeng.me.cluster.implementations;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@@ -227,7 +228,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
{ {
if( input instanceof IAEItemStack ) if( input instanceof IAEItemStack )
{ {
final IAEItemStack is = this.waitingFor.findPrecise( (IAEItemStack) input ); final IAEItemStack is = this.waitingFor.findPrecise( input );
if( is != null && is.getStackSize() > 0 ) if( is != null && is.getStackSize() > 0 )
{ {
return true; return true;
@@ -243,7 +244,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
return input; return input;
} }
final IAEItemStack what = (IAEItemStack) input.copy(); final IAEItemStack what = input.copy();
final IAEItemStack is = this.waitingFor.findPrecise( what ); final IAEItemStack is = this.waitingFor.findPrecise( what );
if( type == Actionable.SIMULATE )// causes crafting to lock up? if( type == Actionable.SIMULATE )// causes crafting to lock up?
@@ -684,7 +685,25 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
if( details.isCraftable() ) if( details.isCraftable() )
{ {
for( IAEItemStack fuzz : this.inventory.getItemList().findFuzzy( input[x], FuzzyMode.IGNORE_ALL ) ) final Collection<IAEItemStack> itemList;
if( details.canSubstitute() )
{
itemList = this.inventory.getItemList().findFuzzy( input[x], FuzzyMode.IGNORE_ALL );
}
else
{
itemList = new ArrayList<>( 1 );
final IAEItemStack item = this.inventory.getItemList().findPrecise( input[x] );
if( item != null )
{
itemList.add( item );
}
}
for( IAEItemStack fuzz : itemList )
{ {
fuzz = fuzz.copy(); fuzz = fuzz.copy();
fuzz.setStackSize( input[x].getStackSize() ); fuzz.setStackSize( input[x].getStackSize() );