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

Merge remote-tracking branch 'origin/mc1.12' into mc1.12

Browse Source
This commit is contained in:
raoulvdberge
2018-03-17 15:48:17 +01:00
parent 964a5c66ef 727be6c6ec
commit b3afbab1ba
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
View File

@@ -195,19 +195,24 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
// We need to check if the stack was inserted
storage.insert(((extracted == remainder) ? remainder.copy() : remainder), remainder.getCount(), false);
}
if (storage.getStacks().size() == 0) {
moveDriveToOutput(slot);
}
}
//Iterate through disk stacks, if none can be inserted, return that it is done processing and can be output.
private boolean checkItemDiskDone(IStorageDisk<ItemStack> storage, int slot) {
if (storage.getStored() == 0) {
if (ioMode == IO_MODE_INSERT && storage.getStored() == 0) {
moveDriveToOutput(slot);
return true;
}
//In Extract mode, we just need to check if the disk is full or not.
if (ioMode == IO_MODE_EXTRACT)
if (storage.getStored() == storage.getCapacity()) {
moveDriveToOutput(slot);
return true;
} else {
return false;
}
List<ItemStack> stacks = new ArrayList<>(storage.getStacks());
for (int i = 0; i < stacks.size(); ++i) {
ItemStack stack = stacks.get(i);
@@ -226,11 +231,6 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
}
private void extractItemFromNetwork(IStorageDisk<ItemStack> storage, int slot) {
if (storage.getStored() == storage.getCapacity()) {
moveDriveToOutput(slot);
return;
}
ItemStack extracted = null;
int i = 0;
@@ -298,11 +298,20 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
}
private boolean checkFluidDiskDone(IStorageDisk<FluidStack> storage, int slot) {
if (storage.getStored() == 0) {
if (ioMode == IO_MODE_INSERT && storage.getStored() == 0) {
moveDriveToOutput(slot);
return true;
}
//In Extract mode, we just need to check if the disk is full or not.
if (ioMode == IO_MODE_EXTRACT)
if (storage.getStored() == storage.getCapacity()) {
moveDriveToOutput(slot);
return true;
} else {
return false;
}
List<FluidStack> stacks = new ArrayList<>(storage.getStacks());
for (int i = 0; i < stacks.size(); ++i) {
FluidStack stack = stacks.get(i);
@@ -321,11 +330,6 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
}
private void extractFluidFromNetwork(IStorageDisk<FluidStack> storage, int slot) {
if (storage.getStored() == storage.getCapacity()) {
moveDriveToOutput(slot);
return;
}
FluidStack extracted = null;
int i = 0;