From c8a42e29b365b1952987703290c0ec1cab11dd20 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 20 Sep 2016 16:16:26 +0200 Subject: [PATCH] Fixes and stuff and things (too lazy to write a commit message but not lazy to write this long sentence) --- .../api/autocrafting/task/CraftingTask.java | 2 -- .../refinedstorage/api/network/INetworkMaster.java | 5 ----- .../autocrafting/task/CraftingTaskNormal.java | 2 -- .../autocrafting/task/CraftingTaskProcessing.java | 14 +------------- .../apiimpl/network/grid/ItemGridHandler.java | 2 -- .../java/refinedstorage/tile/TileController.java | 11 +++-------- 6 files changed, 4 insertions(+), 32 deletions(-) diff --git a/src/main/java/refinedstorage/api/autocrafting/task/CraftingTask.java b/src/main/java/refinedstorage/api/autocrafting/task/CraftingTask.java index 1ea00879d..0f955a4da 100755 --- a/src/main/java/refinedstorage/api/autocrafting/task/CraftingTask.java +++ b/src/main/java/refinedstorage/api/autocrafting/task/CraftingTask.java @@ -89,8 +89,6 @@ public abstract class CraftingTask implements ICraftingTask { child = NetworkUtils.createCraftingTask(network, pattern); childrenCreated[i] = true; - - network.updateCraftingTasks(); } } } diff --git a/src/main/java/refinedstorage/api/network/INetworkMaster.java b/src/main/java/refinedstorage/api/network/INetworkMaster.java index 312a2d520..4d0b81139 100755 --- a/src/main/java/refinedstorage/api/network/INetworkMaster.java +++ b/src/main/java/refinedstorage/api/network/INetworkMaster.java @@ -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 */ diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java index e3aacb804..fc377936c 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java +++ b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java @@ -36,8 +36,6 @@ public class CraftingTaskNormal extends CraftingTask { took.add(received); tookSlots[i] = received; - - network.updateCraftingTasks(); } else { tryCreateChild(network, i); } diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java index ad397798b..f6a64e74e 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java +++ b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java @@ -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(); } } } @@ -257,4 +245,4 @@ public class CraftingTaskProcessing extends CraftingTask { return (int) ((float) satisfiedAmount / (float) (satisfied.length + satisfiedInsertion.length) * 100F); } -} +} \ No newline at end of file diff --git a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java index 431b716de..39bded2ac 100755 --- a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java @@ -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) { diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index e339a389e..f3f6af15c 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -275,10 +275,6 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR craftingTasksToAdd.clear(); - if (!craftingTasks.isEmpty()) { - markDirty(); - } - Iterator 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);