tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan C. Brady 2014-02-19 23:21:58 -05:00
parent 2ec88debdf 3d4e01400f
commit 656a1a8baa
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
common/mekanism/common/miner/ThreadMinerSearch.java
View file

@ -1,8 +1,11 @@
package mekanism.common.miner;
import java.util.BitSet;
import java.util.HashMap;
import java.util.Map;
import mekanism.api.Coord4D;
import mekanism.api.ItemInfo;
import mekanism.common.IBoundingBlock;
import mekanism.common.tile.TileEntityDigitalMiner;
import mekanism.common.util.MekanismUtils;
@ -17,6 +20,8 @@ public class ThreadMinerSearch extends Thread
public BitSet oresToMine = new BitSet();
public Map<ItemInfo, Boolean> acceptedItems = new HashMap<ItemInfo, Boolean>();
public int found = 0;
public ThreadMinerSearch(TileEntityDigitalMiner tile)
@ -70,24 +75,36 @@ public class ThreadMinerSearch extends Thread
if(blockID != 0 && blockID != Block.bedrock.blockID)
{
ItemStack stack = new ItemStack(blockID, 1, meta);
ItemInfo info = new ItemInfo(blockID, meta);
boolean canFilter = false;
if(tileEntity.replaceStack != null && tileEntity.replaceStack.isItemEqual(stack))
if(acceptedItems.containsKey(info))
{
continue;
canFilter = acceptedItems.get(info);
}
boolean hasFilter = false;
for(MinerFilter filter : tileEntity.filters)
{
if(filter.canFilter(stack))
else {
ItemStack stack = new ItemStack(blockID, 1, meta);
if(tileEntity.replaceStack != null && tileEntity.replaceStack.isItemEqual(stack))
{
hasFilter = true;
continue;
}
boolean hasFilter = false;
for(MinerFilter filter : tileEntity.filters)
{
if(filter.canFilter(stack))
{
hasFilter = true;
}
}
canFilter = tileEntity.inverse ? !hasFilter : hasFilter;
acceptedItems.put(info, canFilter);
}
if(tileEntity.inverse ? !hasFilter : hasFilter)
if(canFilter)
{
oresToMine.set(i);
found++;