From 7c7071ec36d83afcec12c20c5e247f033ff69d9d Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 11 Jun 2016 23:36:39 +0200 Subject: [PATCH] Changes to monitor --- .../autocrafting/task/BasicCraftingTask.java | 35 ++++++------- .../task/ProcessingCraftingTask.java | 51 ++++++++----------- .../gui/GuiCraftingMonitor.java | 30 +++++------ .../assets/refinedstorage/lang/en_US.lang | 8 +-- .../assets/refinedstorage/lang/fr_FR.lang | 8 +-- .../assets/refinedstorage/lang/nl_NL.lang | 8 +-- 6 files changed, 62 insertions(+), 78 deletions(-) diff --git a/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java b/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java index a5dc3c32d..113eb1f83 100755 --- a/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java +++ b/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java @@ -3,7 +3,6 @@ package refinedstorage.autocrafting.task; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.Constants; import refinedstorage.RefinedStorageUtils; import refinedstorage.autocrafting.CraftingPattern; @@ -135,47 +134,43 @@ public class BasicCraftingTask implements ICraftingTask { @Override public String getInfo() { if (!updatedOnce) { - return "{not_started_yet}"; + return "T=gui.refinedstorage:crafting_monitor.not_started_yet"; } StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append("{missing_items}").append(TextFormatting.RESET).append("\n"); - - int missingItems = 0; + boolean hasMissingItems = false; for (int i = 0; i < pattern.getInputs().length; ++i) { ItemStack input = pattern.getInputs()[i]; if (checked[i] && !satisfied[i] && !childTasks[i]) { - builder.append("- ").append(input.getDisplayName()).append("\n"); + if (!hasMissingItems) { + builder.append("I=gui.refinedstorage:crafting_monitor.missing_items\n"); - missingItems++; + hasMissingItems = true; + } + + builder.append("T=").append(input.getUnlocalizedName()).append(".name\n"); } } - if (missingItems == 0) { - builder.append(TextFormatting.GRAY).append(TextFormatting.ITALIC).append("{none}").append(TextFormatting.RESET).append("\n"); - } - - builder.append(TextFormatting.YELLOW).append("{items_crafting}").append(TextFormatting.RESET).append("\n"); - - int itemsCrafting = 0; + boolean areItemsCrafting = false; for (int i = 0; i < pattern.getInputs().length; ++i) { ItemStack input = pattern.getInputs()[i]; if (!satisfied[i] && childTasks[i]) { - builder.append("- ").append(input.getUnlocalizedName()).append(".name").append("\n"); + if (!areItemsCrafting) { + builder.append("I=gui.refinedstorage:crafting_monitor.items_crafting\n"); - itemsCrafting++; + areItemsCrafting = true; + } + + builder.append("T=").append(input.getUnlocalizedName()).append(".name\n"); } } - if (itemsCrafting == 0) { - builder.append(TextFormatting.GRAY).append(TextFormatting.ITALIC).append("{none}").append(TextFormatting.RESET).append("\n"); - } - return builder.toString(); } } diff --git a/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java b/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java index cdbb05480..8abfbaed7 100755 --- a/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java +++ b/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java @@ -2,7 +2,6 @@ package refinedstorage.autocrafting.task; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.TextFormatting; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import refinedstorage.RefinedStorageUtils; @@ -127,65 +126,59 @@ public class ProcessingCraftingTask implements ICraftingTask { @Override public String getInfo() { if (!updatedOnce) { - return "{not_started_yet}"; + return "T=gui.refinedstorage:crafting_monitor.not_started_yet"; } StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append("{missing_items}").append(TextFormatting.RESET).append("\n"); - - int missingItems = 0; + boolean hasMissingItems = false; for (int i = 0; i < pattern.getInputs().length; ++i) { ItemStack input = pattern.getInputs()[i]; if (!inserted[i] && !childTasks[i]) { - builder.append("- ").append(input.getDisplayName()).append("\n"); + if (!hasMissingItems) { + builder.append("I=gui.refinedstorage:crafting_monitor.missing_items\n"); - missingItems++; + hasMissingItems = true; + } + + builder.append("T=").append(input.getUnlocalizedName()).append(".name\n"); } } - if (missingItems == 0) { - builder.append(TextFormatting.GRAY).append(TextFormatting.ITALIC).append("{none}").append(TextFormatting.RESET).append("\n"); - } - - builder.append(TextFormatting.YELLOW).append("{items_crafting}").append(TextFormatting.RESET).append("\n"); - - int itemsCrafting = 0; + boolean areItemsCrafting = false; for (int i = 0; i < pattern.getInputs().length; ++i) { ItemStack input = pattern.getInputs()[i]; if (!inserted[i] && childTasks[i]) { - builder.append("- ").append(input.getUnlocalizedName()).append(".name").append("\n"); + if (!areItemsCrafting) { + builder.append("I=gui.refinedstorage:crafting_monitor.items_crafting\n"); - itemsCrafting++; + areItemsCrafting = true; + } + + builder.append("T=").append(input.getUnlocalizedName()).append(".name\n"); } } - if (itemsCrafting == 0) { - builder.append(TextFormatting.GRAY).append(TextFormatting.ITALIC).append("{none}").append(TextFormatting.RESET).append("\n"); - } - - builder.append(TextFormatting.YELLOW).append("{items_processing}").append(TextFormatting.RESET).append("\n"); - - int itemsProcessing = 0; + boolean areItemsProcessing = false; for (int i = 0; i < pattern.getInputs().length; ++i) { ItemStack input = pattern.getInputs()[i]; if (inserted[i]) { - builder.append("- ").append(input.getDisplayName()).append("\n"); + if (!areItemsProcessing) { + builder.append("I=gui.refinedstorage:crafting_monitor.items_processing\n"); - itemsProcessing++; + areItemsProcessing = true; + } + + builder.append("T=").append(input.getUnlocalizedName()).append(".name\n"); } } - if (itemsProcessing == 0) { - builder.append(TextFormatting.GRAY).append(TextFormatting.ITALIC).append("{none}").append(TextFormatting.RESET).append("\n"); - } - return builder.toString(); } } diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index a7b6cd0db..ec539dcd9 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -3,6 +3,7 @@ package refinedstorage.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.util.text.TextFormatting; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerCraftingMonitor; @@ -12,7 +13,6 @@ import refinedstorage.tile.TileCraftingMonitor; import java.io.IOException; import java.util.Arrays; -import java.util.List; public class GuiCraftingMonitor extends GuiBase { public static final int VISIBLE_ROWS = 3; @@ -98,7 +98,7 @@ public class GuiCraftingMonitor extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); - List infoLines = null; + String[] lines = null; renderItemSelection = false; @@ -124,22 +124,18 @@ public class GuiCraftingMonitor extends GuiBase { GlStateManager.popMatrix(); if (inBounds(x + 5, y + 10, 16, 16, mouseX, mouseY)) { - infoLines = Arrays.asList(task.info.split("\n")); + lines = task.info.split("\n"); - // @todo use utils method for this - for (int j = 0; j < infoLines.size(); ++j) { - String line = infoLines.get(j); + for (int j = 0; j < lines.length; ++j) { + String line = lines[j]; - if (line.startsWith("- ")) { - infoLines.set(j, "- " + t(line.substring(2))); - } else { - infoLines.set(j, line - .replace("{missing_items}", t("gui.refinedstorage:crafting_monitor.missing_items")) - .replace("{items_crafting}", t("gui.refinedstorage:crafting_monitor.items_crafting")) - .replace("{items_processing}", t("gui.refinedstorage:crafting_monitor.items_processing")) - .replace("{not_started_yet}", t("gui.refinedstorage:crafting_monitor.not_started_yet")) - .replace("{none}", t("gui.none"))); + if (line.startsWith("T=")) { + line = t(line.substring(2)); + } else if (line.startsWith("I=")) { + line = TextFormatting.YELLOW + t(line.substring(2)); } + + lines[j] = line; } } } @@ -154,8 +150,8 @@ public class GuiCraftingMonitor extends GuiBase { item++; } - if (infoLines != null) { - drawTooltip(mouseX, mouseY, infoLines); + if (lines != null) { + drawTooltip(mouseX, mouseY, Arrays.asList(lines)); } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 5b4ec39d7..a1ed83d73 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -20,10 +20,10 @@ gui.refinedstorage:relay=Relay gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.export=Interface Export gui.refinedstorage:crafting_monitor=Crafting Monitor -gui.refinedstorage:crafting_monitor.missing_items=Missing items: -gui.refinedstorage:crafting_monitor.items_crafting=Items crafting: -gui.refinedstorage:crafting_monitor.items_processing=Items processing: -gui.refinedstorage:crafting_monitor.not_started_yet=Crafting task not started yet. +gui.refinedstorage:crafting_monitor.missing_items=Missing items +gui.refinedstorage:crafting_monitor.items_crafting=Items crafting +gui.refinedstorage:crafting_monitor.items_processing=Items processing +gui.refinedstorage:crafting_monitor.not_started_yet=Not started yet gui.refinedstorage:wireless_transmitter=Wireless Transmitter gui.refinedstorage:wireless_transmitter.distance=%d blocks gui.refinedstorage:crafter=Crafter diff --git a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang index 2ef8b0d28..ff9b3fc26 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang @@ -20,10 +20,10 @@ gui.refinedstorage:relay=Relais gui.refinedstorage:interface.import=Interface d'Import gui.refinedstorage:interface.export=Interface d'Export gui.refinedstorage:crafting_monitor=Moniteur de Craft -gui.refinedstorage:crafting_monitor.missing_items=Items manquant: -gui.refinedstorage:crafting_monitor.items_crafting=Items en craft: -gui.refinedstorage:crafting_monitor.items_processing=Items en traitement: -gui.refinedstorage:crafting_monitor.not_started_yet=Tâche crafting pas encore commencé. +gui.refinedstorage:crafting_monitor.missing_items=Items manquant +gui.refinedstorage:crafting_monitor.items_crafting=Items en craft +gui.refinedstorage:crafting_monitor.items_processing=Items en traitement +gui.refinedstorage:crafting_monitor.not_started_yet=Pas encore commencé gui.refinedstorage:wireless_transmitter=Émetteur sans Fil gui.refinedstorage:wireless_transmitter.distance=%d blocks gui.refinedstorage:crafter=Crafteur diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 6c7848c20..0b525d813 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -20,10 +20,10 @@ gui.refinedstorage:relay=Relais gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.export=Interface Export gui.refinedstorage:crafting_monitor=Crafting Monitor -gui.refinedstorage:crafting_monitor.missing_items=Ontbrekende items: -gui.refinedstorage:crafting_monitor.items_crafting=Items aan het craften: -gui.refinedstorage:crafting_monitor.items_processing=Items aan het verwerken: -gui.refinedstorage:crafting_monitor.not_started_yet=Crafting opdracht nog niet begonnen. +gui.refinedstorage:crafting_monitor.missing_items=Ontbrekende items +gui.refinedstorage:crafting_monitor.items_crafting=Items aan het craften +gui.refinedstorage:crafting_monitor.items_processing=Items aan het verwerken +gui.refinedstorage:crafting_monitor.not_started_yet=Nog niet begonnen gui.refinedstorage:wireless_transmitter=Draadloze Zender gui.refinedstorage:wireless_transmitter.distance=%d blokken gui.refinedstorage:crafter=Crafter