Cancel all

This commit is contained in:
Raoul Van den Berge
2016-05-06 18:12:33 +02:00
parent a1e80e9686
commit 2af3575427
4 changed files with 11 additions and 0 deletions

View File

@@ -23,6 +23,7 @@ public class GuiCraftingMonitor extends GuiBase {
private TileCraftingMonitor craftingMonitor; private TileCraftingMonitor craftingMonitor;
private GuiButton cancelButton; private GuiButton cancelButton;
private GuiButton cancelAllButton;
private int itemSelected = -1; private int itemSelected = -1;
private int itemSelectedX; private int itemSelectedX;
@@ -41,6 +42,7 @@ public class GuiCraftingMonitor extends GuiBase {
addSideButton(new SideButtonRedstoneMode(craftingMonitor)); addSideButton(new SideButtonRedstoneMode(craftingMonitor));
cancelButton = addButton(x + 7, y + 113, 50, 20, t("misc.refinedstorage:cancel")); 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 @Override
@@ -53,6 +55,7 @@ public class GuiCraftingMonitor extends GuiBase {
} }
cancelButton.enabled = itemSelected != -1; cancelButton.enabled = itemSelected != -1;
cancelAllButton.enabled = craftingMonitor.getTasks().size() > 0;
} }
@Override @Override
@@ -152,6 +155,8 @@ public class GuiCraftingMonitor extends GuiBase {
if (button == cancelButton && itemSelected != -1) { if (button == cancelButton && itemSelected != -1) {
RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, itemSelected)); RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, itemSelected));
} else if (button == cancelAllButton && craftingMonitor.getTasks().size() > 0) {
RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1));
} }
} }

View File

@@ -754,6 +754,10 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
public void onCraftingTaskCancelRequested(int id) { public void onCraftingTaskCancelRequested(int id) {
if (id >= 0 && id < craftingTasks.size()) { if (id >= 0 && id < craftingTasks.size()) {
cancelCraftingTask(craftingTasks.get(id)); cancelCraftingTask(craftingTasks.get(id));
} else if (id == -1) {
for (ICraftingTask task : craftingTasks) {
cancelCraftingTask(task);
}
} }
} }
} }

View File

@@ -52,6 +52,7 @@ misc.refinedstorage:start=Start
misc.refinedstorage:clear=Clear misc.refinedstorage:clear=Clear
misc.refinedstorage:none=None misc.refinedstorage:none=None
misc.refinedstorage:cancel=Cancel misc.refinedstorage:cancel=Cancel
misc.refinedstorage:cancel_all=Cancel All
misc.refinedstorage:priority=Priority misc.refinedstorage:priority=Priority
misc.refinedstorage:processing=Processing misc.refinedstorage:processing=Processing

View File

@@ -52,6 +52,7 @@ misc.refinedstorage:start=Start
misc.refinedstorage:clear=Legen misc.refinedstorage:clear=Legen
misc.refinedstorage:none=Geen misc.refinedstorage:none=Geen
misc.refinedstorage:cancel=Annuleer misc.refinedstorage:cancel=Annuleer
misc.refinedstorage:cancel_all=Annuleer alles
misc.refinedstorage:priority=Prioriteit misc.refinedstorage:priority=Prioriteit
misc.refinedstorage:processing=Verwerking misc.refinedstorage:processing=Verwerking