From d5fd30548c6d8b5885f85c5a56276534961b30bb Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 5 Jun 2016 15:10:43 +0200
Subject: [PATCH] Fixes

---
 .../java/refinedstorage/tile/TileDiskDrive.java  | 16 ++++++++--------
 .../java/refinedstorage/tile/TileStorage.java    | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
index 5f6fbd13d..4a345f41b 100755
--- a/src/main/java/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -25,14 +25,14 @@ import refinedstorage.tile.config.*;
 import java.util.List;
 
 public class TileDiskDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig {
-    public class DiskStorage extends NBTStorage {
-        public DiskStorage(ItemStack disk) {
+    public class Storage extends NBTStorage {
+        public Storage(ItemStack disk) {
             super(disk.getTagCompound(), EnumStorageType.getById(disk.getItemDamage()).getCapacity());
         }
 
         @Override
         public int getPriority() {
-            return TileDiskDrive.this.getPriority();
+            return priority;
         }
 
         @Override
@@ -52,17 +52,17 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
     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];
+    private Storage storages[] = new Storage[8];
 
     private int priority = 0;
     private int compare = 0;
     private int mode = ModeConstants.WHITELIST;
 
-    public NBTStorage getStorage(int slot) {
+    public Storage getStorage(int slot) {
         if (disks.getStackInSlot(slot) == null) {
             storages[slot] = null;
         } else if (storages[slot] == null) {
-            storages[slot] = new DiskStorage(disks.getStackInSlot(slot));
+            storages[slot] = new Storage(disks.getStackInSlot(slot));
         }
 
         return storages[slot];
@@ -84,7 +84,7 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
     @Override
     public void updateMachine() {
         for (int i = 0; i < disks.getSlots(); ++i) {
-            NBTStorage storage = getStorage(i);
+            Storage storage = getStorage(i);
 
             if (storage != null && storage.isDirty()) {
                 storage.writeToNBT(disks.getStackInSlot(i).getTagCompound());
@@ -98,7 +98,7 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
     @Override
     public void provide(List<IStorage> storages) {
         for (int i = 0; i < disks.getSlots(); ++i) {
-            NBTStorage storage = getStorage(i);
+            Storage storage = getStorage(i);
 
             if (storage != null) {
                 storages.add(storage);
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index b7307e802..dc26df2a4 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -24,14 +24,14 @@ import refinedstorage.tile.config.*;
 import java.util.List;
 
 public class TileStorage extends TileMachine implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig {
-    class StorageBlockStorage extends NBTStorage {
-        public StorageBlockStorage() {
+    class Storage extends NBTStorage {
+        public Storage() {
             super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity());
         }
 
         @Override
         public int getPriority() {
-            return storage.getPriority();
+            return priority;
         }
 
         @Override
@@ -53,7 +53,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
 
     private NBTTagCompound storageTag = NBTStorage.createNBT();
 
-    private StorageBlockStorage storage;
+    private Storage storage;
 
     private EnumStorageType type;
 
@@ -70,7 +70,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
     @Override
     public void updateMachine() {
         if (storage == null && storageTag != null) {
-            storage = new StorageBlockStorage();
+            storage = new Storage();
         }
 
         if (storage != null && storage.isDirty()) {