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

improve style

Browse Source 
begone comments
This commit is contained in:
way2muchnoise
2016-09-18 15:21:57 +02:00
parent 423ecee099
commit 9cfb33c805
2 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/main/java/refinedstorage/tile/TileDiskManipulator.java
View File

@@ -51,7 +51,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
private static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
private static final String NBT_MODE = "Mode"; private static final String NBT_MODE = "Mode";
private static final String NBT_TYPE = "Type"; private static final String NBT_TYPE = "Type";
private static final String NBT_IO_MOD = "IOMode"; private static final String NBT_IO_MODE = "IOMode";
private int compare = 0; private int compare = 0;
private int mode = IFilterable.WHITELIST; private int mode = IFilterable.WHITELIST;
@@ -193,23 +193,23 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
return; return;
} }
ItemStack extracted = null; ItemStack extracted = null;
int ii = 0; int i = 0;
do { do {
ItemStack stack = null; ItemStack stack = null;
while (storage.getItems().size() > ii && stack == null) { while (storage.getItems().size() > i && stack == null) {
stack = storage.getItems().get(ii++); stack = storage.getItems().get(i++);
} }
if (stack != null) { if (stack != null) {
extracted = storage.extractItem(stack, 1, compare); extracted = storage.extractItem(stack, 1, compare);
} }
} while (storage.getItems().size() > ii && extracted == null); } while (storage.getItems().size() > i && extracted == null);
if (extracted == null) { if (extracted == null) {
moveDriveToOutput(slot); moveDriveToOutput(slot);
return; return;
} }
ItemStack leftOver = network.insertItem(extracted, extracted.stackSize, false); ItemStack remainder = network.insertItem(extracted, extracted.stackSize, false);
if (leftOver != null) { if (remainder != null) {
storage.insertItem(leftOver, leftOver.stackSize, false); storage.insertItem(remainder, remainder.stackSize, false);
} }
} }
@@ -219,7 +219,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
return; return;
} }
ItemStack extracted = null; ItemStack extracted = null;
int ii = 0; int i = 0;
if (IFilterable.isEmpty(itemFilters)) { if (IFilterable.isEmpty(itemFilters)) {
ItemStack toExtract = null; ItemStack toExtract = null;
ArrayList<ItemStack> networkItems = new ArrayList<>(network.getItemStorage().getStacks()); ArrayList<ItemStack> networkItems = new ArrayList<>(network.getItemStorage().getStacks());
@@ -231,10 +231,10 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
extracted = network.extractItem(toExtract, 1, compare); extracted = network.extractItem(toExtract, 1, compare);
} }
} else { } else {
while (itemFilters.getSlots() > ii && extracted == null) { while (itemFilters.getSlots() > i && extracted == null) {
ItemStack stack = null; ItemStack stack = null;
while (itemFilters.getSlots() > ii && stack == null) { while (itemFilters.getSlots() > i && stack == null) {
stack = itemFilters.getStackInSlot(ii++); stack = itemFilters.getStackInSlot(i++);
} }
if (stack != null) { if (stack != null) {
extracted = network.extractItem(stack, 1, compare); extracted = network.extractItem(stack, 1, compare);
@@ -246,9 +246,9 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
moveDriveToOutput(slot); moveDriveToOutput(slot);
return; return;
} }
ItemStack leftOver = storage.insertItem(extracted, extracted.stackSize, false); ItemStack remainder = storage.insertItem(extracted, extracted.stackSize, false);
if (leftOver != null) { if (remainder != null) {
network.insertItem(leftOver, leftOver.stackSize, false); network.insertItem(remainder, remainder.stackSize, false);
} }
} }
@@ -258,23 +258,23 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
return; return;
} }
FluidStack extracted = null; FluidStack extracted = null;
int ii = 0; int i = 0;
do { do {
FluidStack stack = storage.getStacks().get(ii); FluidStack stack = storage.getStacks().get(i);
while (stack == null && storage.getStacks().size() > ii) { while (stack == null && storage.getStacks().size() > i) {
ii++; i++;
} }
if (stack != null) { if (stack != null) {
extracted = storage.extractFluid(stack, 1, compare); extracted = storage.extractFluid(stack, 1, compare);
} }
} while (extracted == null && storage.getStacks().size() > ii); } while (extracted == null && storage.getStacks().size() > i);
if (extracted == null) { if (extracted == null) {
moveDriveToOutput(slot); moveDriveToOutput(slot);
return; return;
} }
FluidStack leftOver = network.insertFluid(extracted, extracted.amount, false); FluidStack remainder = network.insertFluid(extracted, extracted.amount, false);
if (leftOver != null) { if (remainder != null) {
storage.insertFluid(leftOver, leftOver.amount, false); storage.insertFluid(remainder, remainder.amount, false);
} }
} }
@@ -284,22 +284,22 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
return; return;
} }
FluidStack extracted = null; FluidStack extracted = null;
int ii = 0; int i = 0;
if (IFilterable.isEmpty(itemFilters)) { if (IFilterable.isEmpty(itemFilters)) {
FluidStack toExtract = null; FluidStack toExtract = null;
ArrayList<FluidStack> networkFluids = new ArrayList<>(network.getFluidStorage().getStacks()); ArrayList<FluidStack> networkFluids = new ArrayList<>(network.getFluidStorage().getStacks());
int iii = 0; int j = 0;
while ((toExtract == null || toExtract.amount == 0) && iii < networkFluids.size()) { while ((toExtract == null || toExtract.amount == 0) && j < networkFluids.size()) {
toExtract = networkFluids.get(iii++); toExtract = networkFluids.get(j++);
} }
if (toExtract != null) { if (toExtract != null) {
extracted = network.extractFluid(toExtract, 1, compare); extracted = network.extractFluid(toExtract, 1, compare);
} }
} else { } else {
while (fluidFilters.getSlots() > ii && extracted == null) { while (fluidFilters.getSlots() > i && extracted == null) {
FluidStack stack = null; FluidStack stack = null;
while (fluidFilters.getSlots() > ii && stack == null) { while (fluidFilters.getSlots() > i && stack == null) {
stack = fluidFilters.getFluidStackInSlot(ii++); stack = fluidFilters.getFluidStackInSlot(i++);
} }
if (stack != null) { if (stack != null) {
extracted = network.extractFluid(stack, 1, compare); extracted = network.extractFluid(stack, 1, compare);
@@ -311,9 +311,9 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
moveDriveToOutput(slot); moveDriveToOutput(slot);
return; return;
} }
FluidStack leftOver = storage.insertFluid(extracted, extracted.amount, false); FluidStack remainder = storage.insertFluid(extracted, extracted.amount, false);
if (leftOver != null) { if (remainder != null) {
network.insertFluid(leftOver, leftOver.amount, false); network.insertFluid(remainder, remainder.amount, false);
} }
} }
@@ -401,8 +401,8 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
type = tag.getInteger(NBT_TYPE); type = tag.getInteger(NBT_TYPE);
} }
if (tag.hasKey(NBT_IO_MOD)) { if (tag.hasKey(NBT_IO_MODE)) {
ioMode = tag.getInteger(NBT_IO_MOD); ioMode = tag.getInteger(NBT_IO_MODE);
} }
} }
@@ -417,7 +417,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
tag.setInteger(NBT_COMPARE, compare); tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode); tag.setInteger(NBT_MODE, mode);
tag.setInteger(NBT_TYPE, type); tag.setInteger(NBT_TYPE, type);
tag.setInteger(NBT_IO_MOD, ioMode); tag.setInteger(NBT_IO_MODE, ioMode);
return tag; return tag;
} }

6
src/main/java/refinedstorage/tile/config/IFilterable.java
View File

@@ -96,9 +96,11 @@ public interface IFilterable {
} }
static boolean isEmpty(IItemHandler filter) { static boolean isEmpty(IItemHandler filter) {
for (int i = 0; i < filter.getSlots(); i++) for (int i = 0; i < filter.getSlots(); i++) {
if (filter.getStackInSlot(i) != null) if (filter.getStackInSlot(i) != null) {
return false; return false;
}
}
return true; return true;
} }