From 2af3575427d9627ff13360468df12b0ba4f3027e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 6 May 2016 18:12:33 +0200 Subject: [PATCH] Cancel all --- src/main/java/refinedstorage/gui/GuiCraftingMonitor.java | 5 +++++ src/main/java/refinedstorage/tile/TileController.java | 4 ++++ src/main/resources/assets/refinedstorage/lang/en_US.lang | 1 + src/main/resources/assets/refinedstorage/lang/nl_NL.lang | 1 + 4 files changed, 11 insertions(+) diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index c66c4c5d4..24534554e 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -23,6 +23,7 @@ public class GuiCraftingMonitor extends GuiBase { private TileCraftingMonitor craftingMonitor; private GuiButton cancelButton; + private GuiButton cancelAllButton; private int itemSelected = -1; private int itemSelectedX; @@ -41,6 +42,7 @@ public class GuiCraftingMonitor extends GuiBase { addSideButton(new SideButtonRedstoneMode(craftingMonitor)); cancelButton = addButton(x + 7, y + 113, 50, 20, t("misc.refinedstorage:cancel")); + cancelAllButton = addButton(x + 7 + 50 + 4, y + 113, 60, 20, t("misc.refinedstorage:cancel_all")); } @Override @@ -53,6 +55,7 @@ public class GuiCraftingMonitor extends GuiBase { } cancelButton.enabled = itemSelected != -1; + cancelAllButton.enabled = craftingMonitor.getTasks().size() > 0; } @Override @@ -152,6 +155,8 @@ public class GuiCraftingMonitor extends GuiBase { if (button == cancelButton && itemSelected != -1) { RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, itemSelected)); + } else if (button == cancelAllButton && craftingMonitor.getTasks().size() > 0) { + RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1)); } } diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 813c13bd8..ff897ed9c 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -754,6 +754,10 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor public void onCraftingTaskCancelRequested(int id) { if (id >= 0 && id < craftingTasks.size()) { cancelCraftingTask(craftingTasks.get(id)); + } else if (id == -1) { + for (ICraftingTask task : craftingTasks) { + cancelCraftingTask(task); + } } } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index bcace7a30..9d63a1f2e 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -52,6 +52,7 @@ misc.refinedstorage:start=Start misc.refinedstorage:clear=Clear misc.refinedstorage:none=None misc.refinedstorage:cancel=Cancel +misc.refinedstorage:cancel_all=Cancel All misc.refinedstorage:priority=Priority misc.refinedstorage:processing=Processing diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 9beea496b..e52ac6ee1 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -52,6 +52,7 @@ misc.refinedstorage:start=Start misc.refinedstorage:clear=Legen misc.refinedstorage:none=Geen misc.refinedstorage:cancel=Annuleer +misc.refinedstorage:cancel_all=Annuleer alles misc.refinedstorage:priority=Prioriteit misc.refinedstorage:processing=Verwerking