dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use modefilter

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-22 01:55:36 +02:00
parent b9099ef6b4
commit 6738e2f8d4
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -12,6 +12,7 @@ import refinedstorage.inventory.InventorySimple;
import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.ICompareConfig;
import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.IModeConfig;
import refinedstorage.tile.config.ModeConstants; import refinedstorage.tile.config.ModeConstants;
import refinedstorage.tile.config.ModeFilter;
public class TileImporter extends TileMachine implements ICompareConfig, IModeConfig { public class TileImporter extends TileMachine implements ICompareConfig, IModeConfig {
public static final String NBT_COMPARE = "Compare"; public static final String NBT_COMPARE = "Compare";
@@ -47,7 +48,7 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
if (stack == null) { if (stack == null) {
currentSlot++; currentSlot++;
} else if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0 && mayImportStack(stack)) { } else if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0 && ModeFilter.respectsMode(inventory, this, compare, stack)) {
ItemStack result = handler.extractItem(currentSlot, 1, true); ItemStack result = handler.extractItem(currentSlot, 1, true);
if (result != null && controller.push(result)) { if (result != null && controller.push(result)) {
@@ -57,28 +58,6 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
} }
} }
private boolean mayImportStack(ItemStack stack) {
int slots = 0;
for (int i = 0; i < inventory.getSizeInventory(); ++i) {
ItemStack slot = inventory.getStackInSlot(i);
if (slot != null) {
slots++;
if (RefinedStorageUtils.compareStack(stack, slot, compare)) {
if (mode == ModeConstants.WHITELIST) {
return true;
} else if (mode == ModeConstants.BLACKLIST) {
return false;
}
}
}
}
return mode == ModeConstants.WHITELIST ? (slots == 0) : true;
}
@Override @Override
public int getCompare() { public int getCompare() {
return compare; return compare;