Revert "Anoter go at fixing #389, Part 2"
This reverts commit c126234f2c
.
This commit is contained in:
@@ -78,16 +78,6 @@ public abstract class CraftingTask implements ICraftingTask {
|
||||
this.satisfied = satisfied;
|
||||
}
|
||||
|
||||
protected boolean hasReceivedInputs() {
|
||||
for (boolean item : satisfied) {
|
||||
if (!item) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean[] getChecked() {
|
||||
return checked;
|
||||
}
|
||||
@@ -108,11 +98,6 @@ public abstract class CraftingTask implements ICraftingTask {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFinished() {
|
||||
return hasReceivedInputs();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public ICraftingTask getChild() {
|
||||
|
@@ -32,12 +32,7 @@ public interface ICraftingTask {
|
||||
* @param network the network
|
||||
* @return true if the crafting task is done, false otherwise
|
||||
*/
|
||||
void update(World world, INetworkMaster network);
|
||||
|
||||
/**
|
||||
* @return whether this crafting task is finished
|
||||
*/
|
||||
boolean isFinished();
|
||||
boolean update(World world, INetworkMaster network);
|
||||
|
||||
/**
|
||||
* Gets called when the crafting task is cancelled.
|
||||
|
@@ -13,7 +13,7 @@ public class CraftingTaskNormal extends CraftingTask {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(World world, INetworkMaster network) {
|
||||
public boolean update(World world, INetworkMaster network) {
|
||||
for (int i = 0; i < pattern.getInputs().size(); ++i) {
|
||||
checked[i] = true;
|
||||
|
||||
@@ -34,8 +34,10 @@ public class CraftingTaskNormal extends CraftingTask {
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasReceivedInputs()) {
|
||||
return;
|
||||
for (boolean item : satisfied) {
|
||||
if (!item) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
for (ItemStack output : pattern.getOutputs()) {
|
||||
@@ -47,6 +49,8 @@ public class CraftingTaskNormal extends CraftingTask {
|
||||
// @TODO: Handle remainder
|
||||
network.insertItem(byproduct, byproduct.stackSize, false);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -35,7 +35,7 @@ public class CraftingTaskProcessing extends CraftingTask {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(World world, INetworkMaster network) {
|
||||
public boolean update(World world, INetworkMaster network) {
|
||||
for (int i = 0; i < pattern.getInputs().size(); ++i) {
|
||||
checked[i] = true;
|
||||
|
||||
@@ -56,8 +56,8 @@ public class CraftingTaskProcessing extends CraftingTask {
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasReceivedInputs()) {
|
||||
return;
|
||||
if (!hasTakenInputs()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ICraftingPatternContainer container = pattern.getContainer();
|
||||
@@ -77,11 +77,8 @@ public class CraftingTaskProcessing extends CraftingTask {
|
||||
} else {
|
||||
tileInUse = null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFinished() {
|
||||
return super.isFinished() && hasReceivedOutputs();
|
||||
return hasReceivedOutputs();
|
||||
}
|
||||
|
||||
private boolean hasReceivedOutputs() {
|
||||
@@ -94,6 +91,16 @@ 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)) {
|
||||
@@ -125,7 +132,7 @@ public class CraftingTaskProcessing extends CraftingTask {
|
||||
}
|
||||
|
||||
public boolean onInserted(ItemStack stack) {
|
||||
if (!hasReceivedOutputs() && hasReceivedInputs()) {
|
||||
if (!hasReceivedOutputs() && hasTakenInputs()) {
|
||||
for (int i = 0; i < pattern.getOutputs().size(); ++i) {
|
||||
ItemStack output = pattern.getOutputs().get(i);
|
||||
|
||||
@@ -191,7 +198,7 @@ public class CraftingTaskProcessing extends CraftingTask {
|
||||
}
|
||||
}
|
||||
|
||||
if (hasReceivedInputs()) {
|
||||
if (hasTakenInputs()) {
|
||||
builder.append("I=gui.refinedstorage:crafting_monitor.items_processing\n");
|
||||
|
||||
for (int i = 0; i < pattern.getInputs().size(); ++i) {
|
||||
|
@@ -275,12 +275,22 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
|
||||
|
||||
craftingTasksToAdd.clear();
|
||||
|
||||
updateCraftingTasks(CraftingTaskUpdateType.NORMAL);
|
||||
Iterator<ICraftingTask> craftingTaskIterator = craftingTasks.iterator();
|
||||
|
||||
while (craftingTaskIterator.hasNext()) {
|
||||
ICraftingTask task = craftingTaskIterator.next();
|
||||
|
||||
if (updateCraftingTask(task)) {
|
||||
craftingTaskIterator.remove();
|
||||
|
||||
craftingTasksChanged = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!craftingTasks.isEmpty() || craftingTasksChanged) {
|
||||
markDirty();
|
||||
|
||||
updateCraftingMonitors();
|
||||
updateCraftingTasks();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -314,26 +324,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
|
||||
super.update();
|
||||
}
|
||||
|
||||
enum CraftingTaskUpdateType {
|
||||
NORMAL,
|
||||
DELETION
|
||||
}
|
||||
|
||||
private void updateCraftingTasks(CraftingTaskUpdateType type) {
|
||||
Iterator<ICraftingTask> craftingTaskIterator = craftingTasks.iterator();
|
||||
|
||||
while (craftingTaskIterator.hasNext()) {
|
||||
ICraftingTask task = craftingTaskIterator.next();
|
||||
|
||||
if (updateCraftingTask(task, type)) {
|
||||
craftingTaskIterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean updateCraftingTask(ICraftingTask task, CraftingTaskUpdateType type) {
|
||||
private boolean updateCraftingTask(ICraftingTask task) {
|
||||
if (task.getChild() != null) {
|
||||
if (updateCraftingTask(task.getChild(), type)) {
|
||||
if (updateCraftingTask(task.getChild())) {
|
||||
task.setChild(null);
|
||||
}
|
||||
|
||||
@@ -342,18 +335,10 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
|
||||
|
||||
ICraftingPatternContainer container = task.getPattern().getContainer();
|
||||
|
||||
if (container != null && (ticks % container.getSpeed() == 0 || type == CraftingTaskUpdateType.DELETION)) {
|
||||
if (type == CraftingTaskUpdateType.NORMAL) {
|
||||
task.update(worldObj, this);
|
||||
return container != null && ticks % container.getSpeed() == 0 && task.update(worldObj, this);
|
||||
}
|
||||
|
||||
return task.isFinished();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void updateCraftingMonitors() {
|
||||
public void updateCraftingTasks() {
|
||||
for (INetworkNode node : nodeGraph.all()) {
|
||||
if (node instanceof TileCraftingMonitor) {
|
||||
((TileCraftingMonitor) node).dataManager.sendParameterToWatchers(TileCraftingMonitor.TASKS);
|
||||
@@ -566,17 +551,13 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
|
||||
itemStorage.add(ItemHandlerHelper.copyStackWithSize(stack, inserted), false);
|
||||
|
||||
for (int i = 0; i < inserted; ++i) {
|
||||
for (int j = 0; j < craftingTasks.size(); ++j) {
|
||||
ICraftingTask task = craftingTasks.get(j);
|
||||
|
||||
for (ICraftingTask task : craftingTasks) {
|
||||
if (inserted == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (onInserted(stack, task)) {
|
||||
inserted--;
|
||||
|
||||
updateCraftingTasks(CraftingTaskUpdateType.DELETION);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user