Renames of the inventory classes

src/main/java/refinedstorage/container/ContainerGridFilter.java

@@ -4,15 +4,15 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import refinedstorage.container.slot.SlotSpecimen;
-import refinedstorage.inventory.GridFilterItemHandler;
+import refinedstorage.inventory.ItemHandlerGridFilter;
 
 public class ContainerGridFilter extends ContainerBase {
-    private GridFilterItemHandler filter;
+    private ItemHandlerGridFilter filter;
 
     public ContainerGridFilter(EntityPlayer player, ItemStack stack) {
         super(player);
 
-        this.filter = new GridFilterItemHandler(stack);
+        this.filter = new ItemHandlerGridFilter(stack);
 
         int x = 8;
         int y = 20;

src/main/java/refinedstorage/inventory/ItemHandlerBasic.java

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

src/main/java/refinedstorage/inventory/ItemHandlerGridFilter.java

@@ -5,10 +5,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.items.ItemStackHandler;
 import refinedstorage.tile.TileBase;
 
-public class GridFilterItemHandler extends ItemStackHandler {
+public class ItemHandlerGridFilter extends ItemStackHandler {
     private ItemStack stack;
 
-    public GridFilterItemHandler(ItemStack stack) {
+    public ItemHandlerGridFilter(ItemStack stack) {
         super(9 * 3);
 
         this.stack = stack;

src/main/java/refinedstorage/inventory/ItemHandlerGridFilterInGrid.java

@@ -6,11 +6,11 @@ import refinedstorage.tile.TileBase;
 
 import java.util.List;
 
-public class GridFilterInGridItemHandler extends BasicItemHandler {
+public class ItemHandlerGridFilterInGrid extends ItemHandlerBasic {
     private List<ItemStack> filteredItems;
 
-    public GridFilterInGridItemHandler(List<ItemStack> filteredItems) {
+    public ItemHandlerGridFilterInGrid(List<ItemStack> filteredItems) {
-        super(1, new BasicItemValidator(RefinedStorageItems.GRID_FILTER));
+        super(1, new ItemValidatorBasic(RefinedStorageItems.GRID_FILTER));
 
         this.filteredItems = filteredItems;
     }
@@ -24,7 +24,7 @@ public class GridFilterInGridItemHandler extends BasicItemHandler {
         ItemStack stack = getStackInSlot(slot);
 
         if (stack != null && stack.hasTagCompound()) {
-            BasicItemHandler items = new BasicItemHandler(9 * 3);
+            ItemHandlerBasic items = new ItemHandlerBasic(9 * 3);
 
             TileBase.readItems(items, 0, stack.getTagCompound());
 

src/main/java/refinedstorage/inventory/ItemHandlerInterface.java

@@ -3,11 +3,11 @@ package refinedstorage.inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.ItemStackHandler;
 
-public class InterfaceItemHandler extends ItemStackHandler {
+public class ItemHandlerInterface extends ItemStackHandler {
-    private BasicItemHandler importItems;
+    private ItemHandlerBasic importItems;
-    private BasicItemHandler exportItems;
+    private ItemHandlerBasic exportItems;
 
-    public InterfaceItemHandler(BasicItemHandler importItems, BasicItemHandler exportItems) {
+    public ItemHandlerInterface(ItemHandlerBasic importItems, ItemHandlerBasic exportItems) {
         this.importItems = importItems;
         this.exportItems = exportItems;
     }

src/main/java/refinedstorage/inventory/ItemHandlerProxy.java

@@ -6,10 +6,10 @@ import net.minecraftforge.common.util.INBTSerializable;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
-public class ProxyItemHandler implements IItemHandler, IItemHandlerModifiable, INBTSerializable<NBTTagCompound> {
+public class ItemHandlerProxy implements IItemHandler, IItemHandlerModifiable, INBTSerializable<NBTTagCompound> {
-    private BasicItemHandler proxy;
+    private ItemHandlerBasic proxy;
 
-    public ProxyItemHandler(BasicItemHandler proxy) {
+    public ItemHandlerProxy(ItemHandlerBasic proxy) {
         this.proxy = proxy;
     }
 

src/main/java/refinedstorage/inventory/ItemHandlerSolderer.java

@@ -4,11 +4,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import refinedstorage.tile.TileSolderer;
 
-public class SoldererItemHandler extends ProxyItemHandler {
+public class ItemHandlerSolderer extends ItemHandlerProxy {
     private TileSolderer solderer;
     private EnumFacing side;
 
-    public SoldererItemHandler(TileSolderer solderer, EnumFacing side) {
+    public ItemHandlerSolderer(TileSolderer solderer, EnumFacing side) {
         super(solderer.getItems());
 
         this.solderer = solderer;

src/main/java/refinedstorage/inventory/ItemHandlerUpgrade.java

@@ -4,12 +4,12 @@ import net.minecraft.tileentity.TileEntity;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.item.ItemUpgrade;
 
-public class UpgradeItemHandler extends BasicItemHandler {
+public class ItemHandlerUpgrade extends ItemHandlerBasic {
-    public UpgradeItemHandler(int size, TileEntity tile, int... supportedUpgrades) {
+    public ItemHandlerUpgrade(int size, TileEntity tile, int... supportedUpgrades) {
         super(size, tile, new IItemValidator[supportedUpgrades.length]);
 
         for (int i = 0; i < supportedUpgrades.length; ++i) {
-            this.validators[i] = new BasicItemValidator(RefinedStorageItems.UPGRADE, supportedUpgrades[i]);
+            this.validators[i] = new ItemValidatorBasic(RefinedStorageItems.UPGRADE, supportedUpgrades[i]);
         }
     }
 

src/main/java/refinedstorage/inventory/ItemValidatorBasic.java

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

src/main/java/refinedstorage/jei/RecipeTransferHandlerGrid.java

@@ -21,7 +21,7 @@ import java.util.Map;
 /**
  * @link https://github.com/zerofall/EZStorage/blob/master/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java
  */
-public class GridRecipeTransferHandler implements IRecipeTransferHandler {
+public class RecipeTransferHandlerGrid implements IRecipeTransferHandler {
     @Override
     public Class<? extends Container> getContainerClass() {
         return ContainerGrid.class;

src/main/java/refinedstorage/jei/RefinedStorageJEIPlugin.java

@@ -17,7 +17,7 @@ public class RefinedStorageJEIPlugin implements IModPlugin {
     public void register(IModRegistry registry) {
         INSTANCE = this;
 
-        registry.getRecipeTransferRegistry().addRecipeTransferHandler(new GridRecipeTransferHandler());
+        registry.getRecipeTransferRegistry().addRecipeTransferHandler(new RecipeTransferHandlerGrid());
 
         registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper()));
 

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

@@ -16,8 +16,8 @@ import refinedstorage.RefinedStorage;
 import refinedstorage.apiimpl.autocrafting.CraftingTaskScheduler;
 import refinedstorage.container.ContainerConstructor;
 import refinedstorage.container.slot.SlotSpecimen;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 
@@ -26,7 +26,7 @@ public class TileConstructor extends TileNode implements ICompareConfig {
 
     private static final int BASE_SPEED = 20;
 
-    private BasicItemHandler filter = new BasicItemHandler(1, this) {
+    private ItemHandlerBasic filter = new ItemHandlerBasic(1, this) {
         @Override
         protected void onContentsChanged(int slot) {
             super.onContentsChanged(slot);
@@ -34,7 +34,7 @@ public class TileConstructor extends TileNode implements ICompareConfig {
             block = SlotSpecimen.getBlockState(worldObj, pos.offset(getDirection()), getStackInSlot(0));
         }
     };
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING);
 
     private int compare = 0;
     private IBlockState block;

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

@@ -14,14 +14,14 @@ import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.container.ContainerCrafter;
-import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.inventory.IItemValidator;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.item.ItemUpgrade;
 
 public class TileCrafter extends TileNode implements ICraftingPatternContainer {
-    private BasicItemHandler patterns = new BasicItemHandler(9, this, new IItemValidator() {
+    private ItemHandlerBasic patterns = new ItemHandlerBasic(9, this, new IItemValidator() {
         @Override
         public boolean isValid(ItemStack stack) {
             return stack.getItem() == RefinedStorageItems.PATTERN && ItemPattern.isValid(stack);
@@ -37,7 +37,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
         }
     };
 
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_SPEED);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED);
 
     @Override
     public int getEnergyUsage() {

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

@@ -14,8 +14,8 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorage;
 import refinedstorage.container.ContainerDestructor;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.IModeConfig;
@@ -30,8 +30,8 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon
 
     private static final int BASE_SPEED = 20;
 
-    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_SPEED);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED);
 
     private int compare = 0;
     private int mode = ModeConstants.WHITELIST;

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

@@ -9,7 +9,7 @@ import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.container.ContainerDetector;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.RedstoneMode;
 
@@ -25,7 +25,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
     private static final String NBT_AMOUNT = "Amount";
     private static final String NBT_POWERED = "Powered";
 
-    private BasicItemHandler filter = new BasicItemHandler(1, this);
+    private ItemHandlerBasic filter = new ItemHandlerBasic(1, this);
 
     private int compare = 0;
     private int mode = MODE_EQUAL;

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

@@ -19,8 +19,8 @@ import refinedstorage.api.storage.IStorageProvider;
 import refinedstorage.apiimpl.storage.NBTStorage;
 import refinedstorage.block.EnumStorageType;
 import refinedstorage.container.ContainerDiskDrive;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.BasicItemValidator;
+import refinedstorage.inventory.ItemValidatorBasic;
 import refinedstorage.network.MessagePriorityUpdate;
 import refinedstorage.tile.config.*;
 
@@ -52,7 +52,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
     private static final String NBT_MODE = "Mode";
     private static final String NBT_STORED = "Stored";
 
-    private BasicItemHandler disks = new BasicItemHandler(8, this, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK) {
+    private ItemHandlerBasic disks = new ItemHandlerBasic(8, this, new ItemValidatorBasic(RefinedStorageItems.STORAGE_DISK) {
         @Override
         public boolean isValid(ItemStack disk) {
             return super.isValid(disk) && NBTStorage.isValid(disk);
@@ -89,7 +89,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
             return super.extractItem(slot, amount, simulate);
         }
     };
-    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
 
     private Storage storages[] = new Storage[8];
 

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

@@ -12,16 +12,16 @@ import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorage;
 import refinedstorage.apiimpl.autocrafting.CraftingTaskScheduler;
 import refinedstorage.container.ContainerExporter;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 
 public class TileExporter extends TileNode implements ICompareConfig {
     private static final String NBT_COMPARE = "Compare";
 
-    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING, ItemUpgrade.TYPE_STACK);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING, ItemUpgrade.TYPE_STACK);
 
     private int compare = 0;
 

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

@@ -10,8 +10,8 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorage;
 import refinedstorage.container.ContainerImporter;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.IModeConfig;
@@ -22,8 +22,8 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
 
-    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
 
     private int compare = 0;
     private int mode = ModeConstants.WHITELIST;

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

@@ -11,20 +11,20 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import refinedstorage.RefinedStorage;
 import refinedstorage.container.ContainerInterface;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.InterfaceItemHandler;
+import refinedstorage.inventory.ItemHandlerInterface;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.ICompareConfig;
 
 public class TileInterface extends TileNode implements ICompareConfig {
     private static final String NBT_COMPARE = "Compare";
 
-    private BasicItemHandler importItems = new BasicItemHandler(9, this);
+    private ItemHandlerBasic importItems = new ItemHandlerBasic(9, this);
-    private BasicItemHandler exportSpecimenItems = new BasicItemHandler(9, this);
+    private ItemHandlerBasic exportSpecimenItems = new ItemHandlerBasic(9, this);
-    private BasicItemHandler exportItems = new BasicItemHandler(9, this);
+    private ItemHandlerBasic exportItems = new ItemHandlerBasic(9, this);
-    private InterfaceItemHandler itemHandler = new InterfaceItemHandler(importItems, exportItems);
+    private ItemHandlerInterface itemHandler = new ItemHandlerInterface(importItems, exportItems);
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
 
     private int compare = 0;
 

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

@@ -7,13 +7,13 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageItems;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.BasicItemValidator;
+import refinedstorage.inventory.ItemValidatorBasic;
 import refinedstorage.item.ItemPattern;
 
 public class TileProcessingPatternEncoder extends TileBase {
-    private BasicItemHandler patterns = new BasicItemHandler(2, this, new BasicItemValidator(RefinedStorageItems.PATTERN));
+    private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RefinedStorageItems.PATTERN));
-    private BasicItemHandler configuration = new BasicItemHandler(9 * 2, this);
+    private ItemHandlerBasic configuration = new ItemHandlerBasic(9 * 2, this);
 
     @Override
     public NBTTagCompound write(NBTTagCompound tag) {
@@ -72,11 +72,11 @@ public class TileProcessingPatternEncoder extends TileBase {
         return inputsFilled > 0 && outputsFilled > 0 && patterns.getStackInSlot(0) != null && patterns.getStackInSlot(1) == null;
     }
 
-    public BasicItemHandler getPatterns() {
+    public ItemHandlerBasic getPatterns() {
         return patterns;
     }
 
-    public BasicItemHandler getConfiguration() {
+    public ItemHandlerBasic getConfiguration() {
         return configuration;
     }
 

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

@@ -14,18 +14,18 @@ import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerSolderer;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.SoldererItemHandler;
+import refinedstorage.inventory.ItemHandlerSolderer;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 
 public class TileSolderer extends TileNode {
     private static final String NBT_WORKING = "Working";
     private static final String NBT_PROGRESS = "Progress";
 
-    private BasicItemHandler items = new BasicItemHandler(4, this);
+    private ItemHandlerBasic items = new ItemHandlerBasic(4, this);
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_SPEED);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED);
-    private SoldererItemHandler[] itemsFacade = new SoldererItemHandler[EnumFacing.values().length];
+    private ItemHandlerSolderer[] itemsFacade = new ItemHandlerSolderer[EnumFacing.values().length];
 
     private ISoldererRecipe recipe;
 
@@ -186,7 +186,7 @@ public class TileSolderer extends TileNode {
         return (int) ((float) progress / (float) duration * (float) i);
     }
 
-    public BasicItemHandler getItems() {
+    public ItemHandlerBasic getItems() {
         return items;
     }
 
@@ -209,7 +209,7 @@ public class TileSolderer extends TileNode {
             int i = facing.ordinal();
 
             if (itemsFacade[i] == null) {
-                itemsFacade[i] = new SoldererItemHandler(this, facing);
+                itemsFacade[i] = new ItemHandlerSolderer(this, facing);
             }
 
             return (T) itemsFacade[i];

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

@@ -15,7 +15,7 @@ import refinedstorage.apiimpl.storage.NBTStorage;
 import refinedstorage.block.BlockStorage;
 import refinedstorage.block.EnumStorageType;
 import refinedstorage.container.ContainerStorage;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.network.MessagePriorityUpdate;
 import refinedstorage.tile.config.*;
 
@@ -48,7 +48,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
 
-    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
 
     private NBTTagCompound storageTag = NBTStorage.createNBT();
 

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

@@ -10,12 +10,12 @@ import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorage;
 import refinedstorage.api.network.IWirelessTransmitter;
 import refinedstorage.container.ContainerWirelessTransmitter;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.UpgradeItemHandler;
+import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 
 public class TileWirelessTransmitter extends TileNode implements IWirelessTransmitter {
-    private UpgradeItemHandler upgrades = new UpgradeItemHandler(4, this, ItemUpgrade.TYPE_RANGE);
+    private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_RANGE);
 
     @Override
     public int getEnergyUsage() {
@@ -52,7 +52,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
         return pos;
     }
 
-    public BasicItemHandler getUpgrades() {
+    public ItemHandlerBasic getUpgrades() {
         return upgrades;
     }
 

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

@@ -13,7 +13,7 @@ import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.storage.IStorage;
 import refinedstorage.api.storage.IStorageProvider;
 import refinedstorage.container.ContainerStorage;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.network.MessagePriorityUpdate;
 import refinedstorage.tile.IStorageGui;
 import refinedstorage.tile.TileNode;
@@ -30,7 +30,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
 
-    private BasicItemHandler filters = new BasicItemHandler(9, this);
+    private ItemHandlerBasic filters = new ItemHandlerBasic(9, this);
 
     private int priority = 0;
     private int compare = 0;

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

@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import refinedstorage.api.network.IGridHandler;
 import refinedstorage.block.EnumGridType;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 
 import java.util.List;
@@ -34,7 +34,7 @@ public interface IGrid {
 
     List<ItemStack> getFilteredItems();
 
-    BasicItemHandler getFilter();
+    ItemHandlerBasic getFilter();
 
     IRedstoneModeConfig getRedstoneModeConfig();
 

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

@@ -19,9 +19,9 @@ import refinedstorage.apiimpl.network.NetworkUtils;
 import refinedstorage.block.BlockGrid;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.container.ContainerGrid;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.BasicItemValidator;
+import refinedstorage.inventory.ItemHandlerGridFilterInGrid;
-import refinedstorage.inventory.GridFilterInGridItemHandler;
+import refinedstorage.inventory.ItemValidatorBasic;
 import refinedstorage.item.ItemPattern;
 import refinedstorage.network.MessageGridSettingsUpdate;
 import refinedstorage.tile.TileNode;
@@ -65,9 +65,9 @@ public class TileGrid extends TileNode implements IGrid {
     private InventoryCrafting matrix = new InventoryCrafting(craftingContainer, 3, 3);
     private InventoryCraftResult result = new InventoryCraftResult();
 
-    private BasicItemHandler patterns = new BasicItemHandler(2, this, new BasicItemValidator(RefinedStorageItems.PATTERN));
+    private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RefinedStorageItems.PATTERN));
     private List<ItemStack> filteredItems = new ArrayList<ItemStack>();
-    private GridFilterInGridItemHandler filter = new GridFilterInGridItemHandler(filteredItems);
+    private ItemHandlerGridFilterInGrid filter = new ItemHandlerGridFilterInGrid(filteredItems);
 
     private EnumGridType type;
 
@@ -131,7 +131,7 @@ public class TileGrid extends TileNode implements IGrid {
     }
 
     @Override
-    public BasicItemHandler getFilter() {
+    public ItemHandlerBasic getFilter() {
         return filter;
     }
 

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

@@ -10,8 +10,8 @@ import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.api.network.IGridHandler;
 import refinedstorage.block.EnumGridType;
-import refinedstorage.inventory.BasicItemHandler;
+import refinedstorage.inventory.ItemHandlerBasic;
-import refinedstorage.inventory.GridFilterInGridItemHandler;
+import refinedstorage.inventory.ItemHandlerGridFilterInGrid;
 import refinedstorage.item.ItemWirelessGrid;
 import refinedstorage.network.MessageWirelessGridSettingsUpdate;
 import refinedstorage.tile.TileBase;
@@ -35,7 +35,7 @@ public class WirelessGrid implements IGrid {
     private int searchBoxMode;
 
     private List<ItemStack> filteredItems = new ArrayList<ItemStack>();
-    private GridFilterInGridItemHandler filter = new GridFilterInGridItemHandler(filteredItems) {
+    private ItemHandlerGridFilterInGrid filter = new ItemHandlerGridFilterInGrid(filteredItems) {
         @Override
         protected void onContentsChanged(int slot) {
             super.onContentsChanged(slot);
@@ -139,7 +139,7 @@ public class WirelessGrid implements IGrid {
     }
 
     @Override
-    public BasicItemHandler getFilter() {
+    public ItemHandlerBasic getFilter() {
         return filter;
     }