Small fixes

This commit is contained in:
Raoul Van den Berge
2016-10-01 13:05:21 +02:00
parent 0d99774db5
commit 7a96c273e5
2 changed files with 18 additions and 26 deletions

View File

@@ -56,7 +56,7 @@ public class CraftingTaskProcessing extends CraftingTask {
}
}
if (!isReadyToInsert()) {
if (!hasTakenInputs()) {
return false;
}
@@ -78,10 +78,10 @@ public class CraftingTaskProcessing extends CraftingTask {
tileInUse = null;
}
return isReady();
return hasReceivedOutputs();
}
private boolean isReady() {
private boolean hasReceivedOutputs() {
for (boolean item : satisfiedInsertion) {
if (!item) {
return false;
@@ -91,7 +91,7 @@ public class CraftingTaskProcessing extends CraftingTask {
return true;
}
private boolean isReadyToInsert() {
private boolean hasTakenInputs() {
for (boolean item : satisfied) {
if (!item) {
return false;
@@ -102,13 +102,11 @@ public class CraftingTaskProcessing extends CraftingTask {
}
private boolean isTileInUse(INetworkMaster network) {
if (tileInUse == null) {
for (ICraftingTask task : network.getCraftingTasks()) {
if (isTileInUse(task)) {
return true;
}
}
}
return false;
}
@@ -134,10 +132,7 @@ public class CraftingTaskProcessing extends CraftingTask {
}
public boolean onInserted(ItemStack stack) {
if (isReady()) {
return false;
}
if (!hasReceivedOutputs() && hasTakenInputs()) {
for (int i = 0; i < pattern.getOutputs().size(); ++i) {
ItemStack output = pattern.getOutputs().get(i);
@@ -145,14 +140,11 @@ public class CraftingTaskProcessing extends CraftingTask {
if (CompareUtils.compareStackNoQuantity(output, stack)) {
satisfiedInsertion[i] = true;
if (isReady()) {
tileInUse = null;
}
return true;
}
}
}
}
return false;
}
@@ -206,7 +198,7 @@ public class CraftingTaskProcessing extends CraftingTask {
}
}
if (isReadyToInsert()) {
if (hasTakenInputs()) {
builder.append("I=gui.refinedstorage:crafting_monitor.items_processing\n");
for (int i = 0; i < pattern.getInputs().size(); ++i) {

View File

@@ -556,7 +556,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
break;
}
if (checkProcessing(stack, task)) {
if (onInserted(stack, task)) {
inserted--;
}
}
@@ -566,9 +566,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
return remainder;
}
private boolean checkProcessing(ItemStack stack, ICraftingTask task) {
private boolean onInserted(ItemStack stack, ICraftingTask task) {
if (task.getChild() != null) {
return checkProcessing(stack, task.getChild());
return onInserted(stack, task.getChild());
}
return task instanceof CraftingTaskProcessing && ((CraftingTaskProcessing) task).onInserted(stack);