Update changelog, small fixes

This commit is contained in:
Raoul Van den Berge
2016-10-02 22:37:59 +02:00
parent 33f770b4b3
commit 54d60ea927
4 changed files with 17 additions and 19 deletions

View File

@@ -74,6 +74,16 @@ public abstract class CraftingTask implements ICraftingTask {
return satisfied;
}
protected boolean hasReceivedInputs() {
for (boolean item : satisfied) {
if (!item) {
return false;
}
}
return true;
}
public void setSatisfied(boolean[] satisfied) {
this.satisfied = satisfied;
}

View File

@@ -34,10 +34,8 @@ public class CraftingTaskNormal extends CraftingTask {
}
}
for (boolean item : satisfied) {
if (!item) {
return false;
}
if (!hasReceivedInputs()) {
return false;
}
for (ItemStack output : pattern.getOutputs()) {

View File

@@ -56,7 +56,7 @@ public class CraftingTaskProcessing extends CraftingTask {
}
}
if (!hasTakenInputs()) {
if (!hasReceivedInputs()) {
return false;
}
@@ -91,16 +91,6 @@ public class CraftingTaskProcessing extends CraftingTask {
return true;
}
private boolean hasTakenInputs() {
for (boolean item : satisfied) {
if (!item) {
return false;
}
}
return true;
}
private boolean isTileInUse(INetworkMaster network) {
for (ICraftingTask task : network.getCraftingTasks()) {
if (isTileInUse(task)) {
@@ -132,7 +122,7 @@ public class CraftingTaskProcessing extends CraftingTask {
}
public boolean onInserted(ItemStack stack) {
if (!hasReceivedOutputs() && hasTakenInputs()) {
if (!hasReceivedOutputs() && hasReceivedInputs()) {
for (int i = 0; i < pattern.getOutputs().size(); ++i) {
ItemStack output = pattern.getOutputs().get(i);
@@ -198,7 +188,7 @@ public class CraftingTaskProcessing extends CraftingTask {
}
}
if (hasTakenInputs()) {
if (hasReceivedInputs()) {
builder.append("I=gui.refinedstorage:crafting_monitor.items_processing\n");
for (int i = 0; i < pattern.getInputs().size(); ++i) {