Merge pull request #8 from Ongy/Ticket1133
Fix for item #1133 Fixes #133
This commit is contained in:
+1
-1
Submodule src/api/java/appeng/api updated: da4cad25b5...74e4e50c76
@@ -345,4 +345,9 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
|
|||||||
{
|
{
|
||||||
this.priority = priority;
|
this.priority = priority;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getPriority() {
|
||||||
|
return priority;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-1
@@ -10,6 +10,7 @@ import java.util.Iterator;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.TreeSet;
|
||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
@@ -286,6 +287,14 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
|
|||||||
details.add( medium );
|
details.add( medium );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Comparator<ICraftingPatternDetails> comp = new Comparator<ICraftingPatternDetails>(){
|
||||||
|
@Override
|
||||||
|
public int compare(ICraftingPatternDetails o1,
|
||||||
|
ICraftingPatternDetails o2) {
|
||||||
|
return o2.getPriority() - o1.getPriority();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
private void updatePatterns()
|
private void updatePatterns()
|
||||||
{
|
{
|
||||||
HashMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = craftableItems;
|
HashMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = craftableItems;
|
||||||
@@ -316,7 +325,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
|
|||||||
Set<ICraftingPatternDetails> methods = tmpCraft.get( out );
|
Set<ICraftingPatternDetails> methods = tmpCraft.get( out );
|
||||||
|
|
||||||
if ( methods == null )
|
if ( methods == null )
|
||||||
tmpCraft.put( out, methods = new HashSet() );
|
tmpCraft.put( out, methods = new TreeSet<ICraftingPatternDetails>(comp) );
|
||||||
|
|
||||||
methods.add( details );
|
methods.add( details );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user