Fixes and stuff and things (too lazy to write a commit message but not lazy to write this long sentence)

This commit is contained in:
Raoul Van den Berge
2016-09-20 16:16:26 +02:00
parent d3d3381620
commit c8a42e29b3
6 changed files with 4 additions and 32 deletions

View File

@@ -89,8 +89,6 @@ public abstract class CraftingTask implements ICraftingTask {
child = NetworkUtils.createCraftingTask(network, pattern);
childrenCreated[i] = true;
network.updateCraftingTasks();
}
}
}

View File

@@ -91,11 +91,6 @@ public interface INetworkMaster {
*/
void cancelCraftingTask(@Nonnull ICraftingTask task);
/**
* Sends a update packet to all crafting monitors with the crafting task status.
*/
void updateCraftingTasks();
/**
* @return a list of crafting patterns in this network, do NOT modify this list
*/

View File

@@ -36,8 +36,6 @@ public class CraftingTaskNormal extends CraftingTask {
took.add(received);
tookSlots[i] = received;
network.updateCraftingTasks();
} else {
tryCreateChild(network, i);
}

View File

@@ -50,8 +50,6 @@ public class CraftingTaskProcessing extends CraftingTask {
satisfied[i] = true;
took.add(received);
network.updateCraftingTasks();
} else {
tryCreateChild(network, i);
}
@@ -70,19 +68,11 @@ public class CraftingTaskProcessing extends CraftingTask {
tileInUse = null;
waitingOnTileInUse = false;
network.updateCraftingTasks();
}
if (!took.isEmpty() && container.getFacingTile() != null) {
boolean wasWaitingOnTileInUse = waitingOnTileInUse;
waitingOnTileInUse = isTileInUse(network);
if (wasWaitingOnTileInUse != waitingOnTileInUse) {
network.updateCraftingTasks();
}
if (!waitingOnTileInUse) {
tileInUse = pattern.getContainer().getFacingTile().getPos();
@@ -92,8 +82,6 @@ public class CraftingTaskProcessing extends CraftingTask {
ItemHandlerHelper.insertItem(container.getFacingInventory(), toInsert, false);
took.remove(0);
network.updateCraftingTasks();
}
}
}

View File

@@ -162,8 +162,6 @@ public class ItemGridHandler implements IItemGridHandler {
if (task != null) {
task.getChild().onCancelled(network);
task.setChild(null);
network.updateCraftingTasks();
}
}
} else if (id == -1) {

View File

@@ -275,10 +275,6 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
craftingTasksToAdd.clear();
if (!craftingTasks.isEmpty()) {
markDirty();
}
Iterator<ICraftingTask> craftingTaskIterator = craftingTasks.iterator();
while (craftingTaskIterator.hasNext()) {
@@ -291,7 +287,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
}
}
if (craftingTasksChanged) {
if (!craftingTasks.isEmpty() || craftingTasksChanged) {
markDirty();
updateCraftingTasks();
}
}
@@ -340,10 +338,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
return container != null && ticks % container.getSpeed() == 0 && task.update(worldObj, this);
}
@Override
public void updateCraftingTasks() {
markDirty();
for (INetworkNode node : nodeGraph.all()) {
if (node instanceof TileCraftingMonitor) {
((TileCraftingMonitor) node).dataManager.sendParameterToWatchers(TileCraftingMonitor.TASKS);