From 637255058c3184f05018fa1e7f2543367b29d8c5 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 22 May 2016 03:00:47 +0200 Subject: [PATCH] Some bugfixes --- .../java/refinedstorage/gui/sidebutton/SideButtonMode.java | 2 +- src/main/java/refinedstorage/tile/TileDestructor.java | 2 +- src/main/java/refinedstorage/tile/TileDiskDrive.java | 2 +- src/main/java/refinedstorage/tile/TileExternalStorage.java | 2 +- src/main/java/refinedstorage/tile/TileImporter.java | 6 +++--- src/main/java/refinedstorage/tile/TileStorage.java | 2 +- src/main/java/refinedstorage/tile/config/ModeConstants.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java index e2b770510..d54fbd567 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -27,7 +27,7 @@ public class SideButtonMode extends SideButton { if (config.getMode() == ModeConstants.WHITELIST) { tx = 0; - } else if (config.getMode() == ModeConstants.WHITELIST) { + } else if (config.getMode() == ModeConstants.BLACKLIST) { tx = 16; } diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index 9f57bfc01..af081a536 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -30,7 +30,7 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode private InventorySimple upgradesInventory = new InventorySimple("upgrades", 4, this); private int compare = 0; - private int mode = ModeConstants.BLACKLIST; + private int mode = ModeConstants.WHITELIST; @Override public int getEnergyUsage() { diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 402c49140..2dd683c15 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -34,7 +34,7 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto private int priority = 0; private int compare = 0; - private int mode = ModeConstants.BLACKLIST; + private int mode = ModeConstants.WHITELIST; public NBTStorage getStorage(int slot) { if (inventory.getStackInSlot(slot) == null) { diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index ad4ebf808..d85ecc019 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -30,7 +30,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider private int priority = 0; private int compare = 0; - private int mode = ModeConstants.BLACKLIST; + private int mode = ModeConstants.WHITELIST; private int stored = 0; diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 730507f97..2dd75ccb9 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -22,7 +22,7 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo private InventorySimple upgradesInventory = new InventorySimple("upgrades", 4, this); private int compare = 0; - private int mode = ModeConstants.BLACKLIST; + private int mode = ModeConstants.WHITELIST; private int currentSlot; @@ -46,9 +46,9 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo if (handler.getSlots() > 0) { ItemStack stack = handler.getStackInSlot(currentSlot); - if (stack == null) { + if (stack == null || !ModeFilter.respectsMode(inventory, this, compare, stack)) { currentSlot++; - } else if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0 && ModeFilter.respectsMode(inventory, this, compare, stack)) { + } else if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) { ItemStack result = handler.extractItem(currentSlot, 1, true); if (result != null && controller.push(result)) { diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index b52d137e0..dda5cb05d 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -34,7 +34,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora private int priority = 0; private int compare = 0; - private int mode = ModeConstants.BLACKLIST; + private int mode = ModeConstants.WHITELIST; private int stored; @Override diff --git a/src/main/java/refinedstorage/tile/config/ModeConstants.java b/src/main/java/refinedstorage/tile/config/ModeConstants.java index a46c3d6e6..169e52494 100755 --- a/src/main/java/refinedstorage/tile/config/ModeConstants.java +++ b/src/main/java/refinedstorage/tile/config/ModeConstants.java @@ -1,6 +1,6 @@ package refinedstorage.tile.config; public class ModeConstants { - public static final int BLACKLIST = 0; - public static final int WHITELIST = 1; + public static final int WHITELIST = 0; + public static final int BLACKLIST = 1; }