Better naming

src/main/java/refinedstorage/inventory/BasicItemHandler.java

@@ -4,18 +4,18 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.items.ItemStackHandler;
 
-public class SimpleItemHandler extends ItemStackHandler {
+public class BasicItemHandler extends ItemStackHandler {
     private TileEntity tile;
     private IItemValidator[] validators;
 
-    public SimpleItemHandler(int size, TileEntity tile, IItemValidator... validators) {
+    public BasicItemHandler(int size, TileEntity tile, IItemValidator... validators) {
         super(size);
 
         this.tile = tile;
         this.validators = validators;
     }
 
-    public SimpleItemHandler(int size, IItemValidator... validators) {
+    public BasicItemHandler(int size, IItemValidator... validators) {
         this(size, null, validators);
     }
 

src/main/java/refinedstorage/inventory/BasicItemValidator.java

@@ -3,15 +3,15 @@ package refinedstorage.inventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-public class SimpleItemValidator implements IItemValidator {
+public class BasicItemValidator implements IItemValidator {
     private Item item;
     private int damage = -1;
 
-    public SimpleItemValidator(Item item) {
+    public BasicItemValidator(Item item) {
         this.item = item;
     }
 
-    public SimpleItemValidator(Item item, int damage) {
+    public BasicItemValidator(Item item, int damage) {
         this.item = item;
         this.damage = damage;
     }

src/main/java/refinedstorage/inventory/InventorySimple.java

@@ -1,138 +0,0 @@
-package refinedstorage.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.text.ITextComponent;
-
-public class InventorySimple implements IInventory {
-    private TileEntity tile;
-    private ItemStack[] inventory;
-    private int size;
-    private String name;
-
-    public InventorySimple(String name, int size) {
-        this.name = name;
-        this.size = size;
-        this.inventory = new ItemStack[size];
-    }
-
-    public InventorySimple(String name, int size, TileEntity tile) {
-        this(name, size);
-
-        this.tile = tile;
-    }
-
-    @Override
-    public int getSizeInventory() {
-        return size;
-    }
-
-    @Override
-    public ItemStack getStackInSlot(int slotIndex) {
-        return inventory[slotIndex];
-    }
-
-    @Override
-    public ItemStack decrStackSize(int slot, int amount) {
-        ItemStack stack = getStackInSlot(slot);
-
-        if (stack != null) {
-            if (stack.stackSize <= amount) {
-                setInventorySlotContents(slot, null);
-            } else {
-                stack = stack.splitStack(amount);
-
-                if (stack.stackSize == 0) {
-                    setInventorySlotContents(slot, null);
-                }
-            }
-        }
-
-        return stack;
-    }
-
-    @Override
-    public ItemStack removeStackFromSlot(int slot) {
-        ItemStack stack = getStackInSlot(slot);
-
-        if (stack != null) {
-            setInventorySlotContents(slot, null);
-        }
-
-        return stack;
-    }
-
-    @Override
-    public void setInventorySlotContents(int slot, ItemStack stack) {
-        if (stack != null && stack.stackSize > getInventoryStackLimit()) {
-            stack.stackSize = getInventoryStackLimit();
-        }
-
-        inventory[slot] = stack;
-    }
-
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return true;
-    }
-
-    @Override
-    public int getInventoryStackLimit() {
-        return 64;
-    }
-
-    @Override
-    public boolean isUseableByPlayer(EntityPlayer player) {
-        return true;
-    }
-
-    @Override
-    public boolean isItemValidForSlot(int slot, ItemStack stack) {
-        return true;
-    }
-
-    @Override
-    public void markDirty() {
-        if (tile != null) {
-            tile.markDirty();
-        }
-    }
-
-    @Override
-    public void openInventory(EntityPlayer player) {
-    }
-
-    @Override
-    public void closeInventory(EntityPlayer player) {
-    }
-
-    @Override
-    public int getField(int id) {
-        return 0;
-    }
-
-    @Override
-    public void setField(int id, int value) {
-    }
-
-    @Override
-    public int getFieldCount() {
-        return 0;
-    }
-
-    @Override
-    public void clear() {
-    }
-
-    @Override
-    public ITextComponent getDisplayName() {
-        return null;
-    }
-}

src/main/java/refinedstorage/tile/TileConstructor.java

@@ -13,8 +13,8 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerConstructor;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 
@@ -23,12 +23,12 @@ public class TileConstructor extends TileMachine implements ICompareConfig {
 
     public static final int BASE_SPEED = 20;
 
-    private SimpleItemHandler filter = new SimpleItemHandler(1, this);
-    private SimpleItemHandler upgrades = new SimpleItemHandler(
+    private BasicItemHandler filter = new BasicItemHandler(1, this);
+    private BasicItemHandler upgrades = new BasicItemHandler(
         4,
         this,
-        new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED),
-        new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_CRAFTING)
+        new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED),
+        new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_CRAFTING)
     );
 
     private int compare = 0;

src/main/java/refinedstorage/tile/TileDestructor.java

@@ -13,8 +13,8 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerDestructor;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.IModeConfig;
@@ -29,8 +29,8 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode
 
     public static final int BASE_SPEED = 20;
 
-    private SimpleItemHandler filters = new SimpleItemHandler(9, this);
-    private SimpleItemHandler upgrades = new SimpleItemHandler(4, this, new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
+    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
 
     private int compare = 0;
     private int mode = ModeConstants.WHITELIST;

src/main/java/refinedstorage/tile/TileDetector.java

@@ -9,7 +9,7 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerDetector;
-import refinedstorage.inventory.SimpleItemHandler;
+import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.storage.ItemGroup;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.RedstoneMode;
@@ -24,7 +24,7 @@ public class TileDetector extends TileMachine implements ICompareConfig {
     public static final String NBT_AMOUNT = "Amount";
     public static final String NBT_DESC_POWERED = "Powered";
 
-    private SimpleItemHandler filter = new SimpleItemHandler(1, this);
+    private BasicItemHandler filter = new BasicItemHandler(1, this);
 
     private int compare = 0;
     private int mode = MODE_EQUAL;

src/main/java/refinedstorage/tile/TileDiskDrive.java

@@ -10,8 +10,8 @@ import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.block.EnumStorageType;
 import refinedstorage.container.ContainerDiskDrive;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.network.MessagePriorityUpdate;
 import refinedstorage.storage.*;
 import refinedstorage.tile.config.ICompareConfig;
@@ -26,8 +26,8 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
     public static final String NBT_COMPARE = "Compare";
     public static final String NBT_MODE = "Mode";
 
-    private SimpleItemHandler disks = new SimpleItemHandler(8, this, new SimpleItemValidator(RefinedStorageItems.STORAGE_DISK));
-    private SimpleItemHandler filters = new SimpleItemHandler(9, this);
+    private BasicItemHandler disks = new BasicItemHandler(8, this, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK));
+    private BasicItemHandler filters = new BasicItemHandler(9, this);
 
     private NBTStorage storages[] = new NBTStorage[8];
 

src/main/java/refinedstorage/tile/TileExporter.java

@@ -9,20 +9,20 @@ import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerExporter;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 
 public class TileExporter extends TileMachine implements ICompareConfig {
     public static final String NBT_COMPARE = "Compare";
 
-    private SimpleItemHandler filters = new SimpleItemHandler(9, this);
-    private SimpleItemHandler upgrades = new SimpleItemHandler(
+    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private BasicItemHandler upgrades = new BasicItemHandler(
         4,
         this,
-        new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED),
-        new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_CRAFTING)
+        new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED),
+        new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_CRAFTING)
     );
 
     private int compare = 0;

src/main/java/refinedstorage/tile/TileExternalStorage.java

@@ -10,7 +10,7 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerStorage;
-import refinedstorage.inventory.SimpleItemHandler;
+import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.network.MessagePriorityUpdate;
 import refinedstorage.storage.IStorage;
 import refinedstorage.storage.IStorageGui;
@@ -25,7 +25,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
     public static final String NBT_COMPARE = "Compare";
     public static final String NBT_MODE = "Mode";
 
-    private SimpleItemHandler filters = new SimpleItemHandler(9, this);
+    private BasicItemHandler filters = new BasicItemHandler(9, this);
 
     private int priority = 0;
     private int compare = 0;

src/main/java/refinedstorage/tile/TileImporter.java

@@ -8,8 +8,8 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerImporter;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.IModeConfig;
@@ -20,8 +20,8 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
     public static final String NBT_COMPARE = "Compare";
     public static final String NBT_MODE = "Mode";
 
-    private SimpleItemHandler filters = new SimpleItemHandler(9, this);
-    private SimpleItemHandler upgrades = new SimpleItemHandler(4, this, new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
+    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
 
     private int compare = 0;
     private int mode = ModeConstants.WHITELIST;
@@ -53,7 +53,6 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
             } else if (ticks % RefinedStorageUtils.getSpeed(upgrades) == 0) {
                 ItemStack result = handler.extractItem(currentSlot, 1, true);
 
-                // @TODO: Sometimes this pushes twice
                 if (result != null && controller.push(result)) {
                     handler.extractItem(currentSlot, 1, false);
                 }

src/main/java/refinedstorage/tile/TileInterface.java

@@ -9,16 +9,16 @@ import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerInterface;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 
 public class TileInterface extends TileMachine implements ICompareConfig {
     public static final String NBT_COMPARE = "Compare";
 
-    private SimpleItemHandler items = new SimpleItemHandler(9 * 3, this);
-    private SimpleItemHandler upgrades = new SimpleItemHandler(4, this, new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
+    private BasicItemHandler items = new BasicItemHandler(9 * 3, this);
+    private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
 
     private int compare = 0;
 
@@ -156,7 +156,7 @@ public class TileInterface extends TileMachine implements ICompareConfig {
 
     @Override
     public IItemHandler getDroppedItems() {
-        SimpleItemHandler dummy = new SimpleItemHandler(9 + 9 + 4);
+        BasicItemHandler dummy = new BasicItemHandler(9 + 9 + 4);
 
         for (int i = 0; i < 9; ++i) {
             dummy.setStackInSlot(i, items.getStackInSlot(i));

src/main/java/refinedstorage/tile/TileStorage.java

@@ -10,7 +10,7 @@ import refinedstorage.RefinedStorageUtils;
 import refinedstorage.block.BlockStorage;
 import refinedstorage.block.EnumStorageType;
 import refinedstorage.container.ContainerStorage;
-import refinedstorage.inventory.SimpleItemHandler;
+import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.network.MessagePriorityUpdate;
 import refinedstorage.storage.*;
 import refinedstorage.tile.config.ICompareConfig;
@@ -26,7 +26,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
     public static final String NBT_COMPARE = "Compare";
     public static final String NBT_MODE = "Mode";
 
-    private SimpleItemHandler filters = new SimpleItemHandler(9, this);
+    private BasicItemHandler filters = new BasicItemHandler(9, this);
 
     private NBTTagCompound storageTag = NBTStorage.createNBT();
 

src/main/java/refinedstorage/tile/TileWirelessTransmitter.java

@@ -6,14 +6,14 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerWirelessTransmitter;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemUpgrade;
 
 public class TileWirelessTransmitter extends TileMachine {
     public static final int RANGE_PER_UPGRADE = 8;
 
-    private SimpleItemHandler upgrades = new SimpleItemHandler(4, this, new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE));
+    private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE));
 
     @Override
     public int getEnergyUsage() {
@@ -42,7 +42,7 @@ public class TileWirelessTransmitter extends TileMachine {
         return 16 + (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_RANGE) * RANGE_PER_UPGRADE);
     }
 
-    public SimpleItemHandler getUpgrades() {
+    public BasicItemHandler getUpgrades() {
         return upgrades;
     }
 

src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java

@@ -8,23 +8,23 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerCrafter;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.inventory.IItemValidator;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileMachine;
 import refinedstorage.tile.autocrafting.task.ICraftingTask;
 
 public class TileCrafter extends TileMachine {
-    private SimpleItemHandler patterns = new SimpleItemHandler(PATTERN_SLOTS, this, new IItemValidator() {
+    private BasicItemHandler patterns = new BasicItemHandler(PATTERN_SLOTS, this, new IItemValidator() {
         @Override
         public boolean valid(ItemStack stack) {
             return stack.getItem() == RefinedStorageItems.PATTERN && ItemPattern.isValid(stack);
         }
     });
 
-    private SimpleItemHandler upgrades = new SimpleItemHandler(4, this, new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
+    private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
 
     public static final int PATTERN_SLOTS = 6;
 
@@ -83,7 +83,7 @@ public class TileCrafter extends TileMachine {
 
     @Override
     public IItemHandler getDroppedItems() {
-        SimpleItemHandler dummy = new SimpleItemHandler(PATTERN_SLOTS + 4);
+        BasicItemHandler dummy = new BasicItemHandler(PATTERN_SLOTS + 4);
 
         for (int i = 0; i < PATTERN_SLOTS; ++i) {
             dummy.setStackInSlot(i, patterns.getStackInSlot(i));

src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java

@@ -5,14 +5,14 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.tile.TileBase;
 
 public class TileProcessingPatternEncoder extends TileBase {
-    private SimpleItemHandler patterns = new SimpleItemHandler(2, this, new SimpleItemValidator(RefinedStorageItems.PATTERN));
-    private SimpleItemHandler configuration = new SimpleItemHandler(9 * 2, this);
+    private BasicItemHandler patterns = new BasicItemHandler(2, this, new BasicItemValidator(RefinedStorageItems.PATTERN));
+    private BasicItemHandler configuration = new BasicItemHandler(9 * 2, this);
 
     @Override
     public void writeToNBT(NBTTagCompound nbt) {
@@ -69,11 +69,11 @@ public class TileProcessingPatternEncoder extends TileBase {
         return inputsFilled > 0 && outputsFilled > 0 && patterns.getStackInSlot(0) != null && patterns.getStackInSlot(1) == null;
     }
 
-    public SimpleItemHandler getPatterns() {
+    public BasicItemHandler getPatterns() {
         return patterns;
     }
 
-    public SimpleItemHandler getConfiguration() {
+    public BasicItemHandler getConfiguration() {
         return configuration;
     }
 

src/main/java/refinedstorage/tile/grid/TileGrid.java

@@ -15,8 +15,8 @@ import refinedstorage.RefinedStorageUtils;
 import refinedstorage.block.BlockGrid;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.container.ContainerGrid;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.network.MessageGridCraftingStart;
 import refinedstorage.network.MessageGridSettingsUpdate;
@@ -59,7 +59,7 @@ public class TileGrid extends TileMachine implements IGrid {
     private InventoryCrafting matrix = new InventoryCrafting(craftingContainer, 3, 3);
     private InventoryCraftResult result = new InventoryCraftResult();
 
-    private SimpleItemHandler patterns = new SimpleItemHandler(2, this, new SimpleItemValidator(RefinedStorageItems.PATTERN));
+    private BasicItemHandler patterns = new BasicItemHandler(2, this, new BasicItemValidator(RefinedStorageItems.PATTERN));
 
     private int sortingDirection = SORTING_DIRECTION_DESCENDING;
     private int sortingType = SORTING_TYPE_NAME;

src/main/java/refinedstorage/tile/solderer/TileSolderer.java

@@ -8,8 +8,8 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.ContainerSolderer;
-import refinedstorage.inventory.SimpleItemHandler;
-import refinedstorage.inventory.SimpleItemValidator;
+import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.TileMachine;
 
@@ -17,8 +17,8 @@ public class TileSolderer extends TileMachine {
     public static final String NBT_WORKING = "Working";
     public static final String NBT_PROGRESS = "Progress";
 
-    private SimpleItemHandler items = new SimpleItemHandler(4, this);
-    private SimpleItemHandler upgrades = new SimpleItemHandler(4, this, new SimpleItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
+    private BasicItemHandler items = new BasicItemHandler(4, this);
+    private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));
 
     private ISoldererRecipe recipe;
 
@@ -175,7 +175,7 @@ public class TileSolderer extends TileMachine {
 
     @Override
     public IItemHandler getDroppedItems() {
-        SimpleItemHandler dummy = new SimpleItemHandler(4 + 4);
+        BasicItemHandler dummy = new BasicItemHandler(4 + 4);
 
         for (int i = 0; i < 4; ++i) {
             dummy.setStackInSlot(i, items.getStackInSlot(i));