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

Fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-05 15:10:43 +02:00
parent 4984e713e4
commit d5fd30548c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -25,14 +25,14 @@ import refinedstorage.tile.config.*;
import java.util.List; import java.util.List;
public class TileDiskDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig { public class TileDiskDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig {
public class DiskStorage extends NBTStorage { public class Storage extends NBTStorage {
public DiskStorage(ItemStack disk) { public Storage(ItemStack disk) {
super(disk.getTagCompound(), EnumStorageType.getById(disk.getItemDamage()).getCapacity()); super(disk.getTagCompound(), EnumStorageType.getById(disk.getItemDamage()).getCapacity());
} }
@Override @Override
public int getPriority() { public int getPriority() {
return TileDiskDrive.this.getPriority(); return priority;
} }
@Override @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 disks = new BasicItemHandler(8, this, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK));
private BasicItemHandler filters = new BasicItemHandler(9, this); 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 priority = 0;
private int compare = 0; private int compare = 0;
private int mode = ModeConstants.WHITELIST; private int mode = ModeConstants.WHITELIST;
public NBTStorage getStorage(int slot) { public Storage getStorage(int slot) {
if (disks.getStackInSlot(slot) == null) { if (disks.getStackInSlot(slot) == null) {
storages[slot] = null; storages[slot] = null;
} else if (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]; return storages[slot];
@@ -84,7 +84,7 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
@Override @Override
public void updateMachine() { public void updateMachine() {
for (int i = 0; i < disks.getSlots(); ++i) { for (int i = 0; i < disks.getSlots(); ++i) {
NBTStorage storage = getStorage(i); Storage storage = getStorage(i);
if (storage != null && storage.isDirty()) { if (storage != null && storage.isDirty()) {
storage.writeToNBT(disks.getStackInSlot(i).getTagCompound()); storage.writeToNBT(disks.getStackInSlot(i).getTagCompound());
@@ -98,7 +98,7 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
@Override @Override
public void provide(List<IStorage> storages) { public void provide(List<IStorage> storages) {
for (int i = 0; i < disks.getSlots(); ++i) { for (int i = 0; i < disks.getSlots(); ++i) {
NBTStorage storage = getStorage(i); Storage storage = getStorage(i);
if (storage != null) { if (storage != null) {
storages.add(storage); storages.add(storage);

10
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -24,14 +24,14 @@ import refinedstorage.tile.config.*;
import java.util.List; import java.util.List;
public class TileStorage extends TileMachine implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig { public class TileStorage extends TileMachine implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig {
class StorageBlockStorage extends NBTStorage { class Storage extends NBTStorage {
public StorageBlockStorage() { public Storage() {
super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity()); super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity());
} }
@Override @Override
public int getPriority() { public int getPriority() {
return storage.getPriority(); return priority;
} }
@Override @Override
@@ -53,7 +53,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
private NBTTagCompound storageTag = NBTStorage.createNBT(); private NBTTagCompound storageTag = NBTStorage.createNBT();
private StorageBlockStorage storage; private Storage storage;
private EnumStorageType type; private EnumStorageType type;
@@ -70,7 +70,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
@Override @Override
public void updateMachine() { public void updateMachine() {
if (storage == null && storageTag != null) { if (storage == null && storageTag != null) {
storage = new StorageBlockStorage(); storage = new Storage();
} }
if (storage != null && storage.isDirty()) { if (storage != null && storage.isDirty()) {