dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to monitor

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-11 23:36:39 +02:00
parent 3ad0ac1c19
commit 7c7071ec36
6 changed files with 62 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java
View File

@@ -3,7 +3,6 @@ package refinedstorage.autocrafting.task;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.Constants;
import refinedstorage.RefinedStorageUtils; import refinedstorage.RefinedStorageUtils;
import refinedstorage.autocrafting.CraftingPattern; import refinedstorage.autocrafting.CraftingPattern;
@@ -135,45 +134,41 @@ public class BasicCraftingTask implements ICraftingTask {
@Override @Override
public String getInfo() { public String getInfo() {
if (!updatedOnce) { if (!updatedOnce) {
return "{not_started_yet}"; return "T=gui.refinedstorage:crafting_monitor.not_started_yet";
} }
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.YELLOW).append("{missing_items}").append(TextFormatting.RESET).append("\n"); boolean hasMissingItems = false;
int missingItems = 0;
for (int i = 0; i < pattern.getInputs().length; ++i) { for (int i = 0; i < pattern.getInputs().length; ++i) {
ItemStack input = pattern.getInputs()[i]; ItemStack input = pattern.getInputs()[i];
if (checked[i] && !satisfied[i] && !childTasks[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) { boolean areItemsCrafting = false;
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;
for (int i = 0; i < pattern.getInputs().length; ++i) { for (int i = 0; i < pattern.getInputs().length; ++i) {
ItemStack input = pattern.getInputs()[i]; ItemStack input = pattern.getInputs()[i];
if (!satisfied[i] && childTasks[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;
}
} }
if (itemsCrafting == 0) { builder.append("T=").append(input.getUnlocalizedName()).append(".name\n");
builder.append(TextFormatting.GRAY).append(TextFormatting.ITALIC).append("{none}").append(TextFormatting.RESET).append("\n"); }
} }
return builder.toString(); return builder.toString();

49
src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java
View File

@@ -2,7 +2,6 @@ package refinedstorage.autocrafting.task;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorageUtils; import refinedstorage.RefinedStorageUtils;
@@ -127,63 +126,57 @@ public class ProcessingCraftingTask implements ICraftingTask {
@Override @Override
public String getInfo() { public String getInfo() {
if (!updatedOnce) { if (!updatedOnce) {
return "{not_started_yet}"; return "T=gui.refinedstorage:crafting_monitor.not_started_yet";
} }
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.YELLOW).append("{missing_items}").append(TextFormatting.RESET).append("\n"); boolean hasMissingItems = false;
int missingItems = 0;
for (int i = 0; i < pattern.getInputs().length; ++i) { for (int i = 0; i < pattern.getInputs().length; ++i) {
ItemStack input = pattern.getInputs()[i]; ItemStack input = pattern.getInputs()[i];
if (!inserted[i] && !childTasks[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) { boolean areItemsCrafting = false;
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;
for (int i = 0; i < pattern.getInputs().length; ++i) { for (int i = 0; i < pattern.getInputs().length; ++i) {
ItemStack input = pattern.getInputs()[i]; ItemStack input = pattern.getInputs()[i];
if (!inserted[i] && childTasks[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) { boolean areItemsProcessing = false;
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;
for (int i = 0; i < pattern.getInputs().length; ++i) { for (int i = 0; i < pattern.getInputs().length; ++i) {
ItemStack input = pattern.getInputs()[i]; ItemStack input = pattern.getInputs()[i];
if (inserted[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;
}
} }
if (itemsProcessing == 0) { builder.append("T=").append(input.getUnlocalizedName()).append(".name\n");
builder.append(TextFormatting.GRAY).append(TextFormatting.ITALIC).append("{none}").append(TextFormatting.RESET).append("\n"); }
} }
return builder.toString(); return builder.toString();

30
src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
View File

@@ -3,6 +3,7 @@ package refinedstorage.gui;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.util.text.TextFormatting;
import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils; import refinedstorage.RefinedStorageUtils;
import refinedstorage.container.ContainerCraftingMonitor; import refinedstorage.container.ContainerCraftingMonitor;
@@ -12,7 +13,6 @@ import refinedstorage.tile.TileCraftingMonitor;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
public class GuiCraftingMonitor extends GuiBase { public class GuiCraftingMonitor extends GuiBase {
public static final int VISIBLE_ROWS = 3; public static final int VISIBLE_ROWS = 3;
@@ -98,7 +98,7 @@ public class GuiCraftingMonitor extends GuiBase {
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
List<String> infoLines = null; String[] lines = null;
renderItemSelection = false; renderItemSelection = false;
@@ -124,22 +124,18 @@ public class GuiCraftingMonitor extends GuiBase {
GlStateManager.popMatrix(); GlStateManager.popMatrix();
if (inBounds(x + 5, y + 10, 16, 16, mouseX, mouseY)) { 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 < lines.length; ++j) {
for (int j = 0; j < infoLines.size(); ++j) { String line = lines[j];
String line = infoLines.get(j);
if (line.startsWith("- ")) { if (line.startsWith("T=")) {
infoLines.set(j, "- " + t(line.substring(2))); line = t(line.substring(2));
} else { } else if (line.startsWith("I=")) {
infoLines.set(j, line line = TextFormatting.YELLOW + t(line.substring(2));
.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")));
} }
lines[j] = line;
} }
} }
} }
@@ -154,8 +150,8 @@ public class GuiCraftingMonitor extends GuiBase {
item++; item++;
} }
if (infoLines != null) { if (lines != null) {
drawTooltip(mouseX, mouseY, infoLines); drawTooltip(mouseX, mouseY, Arrays.asList(lines));
} }
} }

8
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

@@ -20,10 +20,10 @@ gui.refinedstorage:relay=Relay
gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.import=Interface Import
gui.refinedstorage:interface.export=Interface Export gui.refinedstorage:interface.export=Interface Export
gui.refinedstorage:crafting_monitor=Crafting Monitor gui.refinedstorage:crafting_monitor=Crafting Monitor
gui.refinedstorage:crafting_monitor.missing_items=Missing items: gui.refinedstorage:crafting_monitor.missing_items=Missing items
gui.refinedstorage:crafting_monitor.items_crafting=Items crafting: gui.refinedstorage:crafting_monitor.items_crafting=Items crafting
gui.refinedstorage:crafting_monitor.items_processing=Items processing: gui.refinedstorage:crafting_monitor.items_processing=Items processing
gui.refinedstorage:crafting_monitor.not_started_yet=Crafting task not started yet. gui.refinedstorage:crafting_monitor.not_started_yet=Not started yet
gui.refinedstorage:wireless_transmitter=Wireless Transmitter gui.refinedstorage:wireless_transmitter=Wireless Transmitter
gui.refinedstorage:wireless_transmitter.distance=%d blocks gui.refinedstorage:wireless_transmitter.distance=%d blocks
gui.refinedstorage:crafter=Crafter gui.refinedstorage:crafter=Crafter

8
src/main/resources/assets/refinedstorage/lang/fr_FR.lang
View File

@@ -20,10 +20,10 @@ gui.refinedstorage:relay=Relais
gui.refinedstorage:interface.import=Interface d'Import gui.refinedstorage:interface.import=Interface d'Import
gui.refinedstorage:interface.export=Interface d'Export gui.refinedstorage:interface.export=Interface d'Export
gui.refinedstorage:crafting_monitor=Moniteur de Craft gui.refinedstorage:crafting_monitor=Moniteur de Craft
gui.refinedstorage:crafting_monitor.missing_items=Items manquant: gui.refinedstorage:crafting_monitor.missing_items=Items manquant
gui.refinedstorage:crafting_monitor.items_crafting=Items en craft: gui.refinedstorage:crafting_monitor.items_crafting=Items en craft
gui.refinedstorage:crafting_monitor.items_processing=Items en traitement: 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.not_started_yet=Pas encore commencé
gui.refinedstorage:wireless_transmitter=Émetteur sans Fil gui.refinedstorage:wireless_transmitter=Émetteur sans Fil
gui.refinedstorage:wireless_transmitter.distance=%d blocks gui.refinedstorage:wireless_transmitter.distance=%d blocks
gui.refinedstorage:crafter=Crafteur gui.refinedstorage:crafter=Crafteur

8
src/main/resources/assets/refinedstorage/lang/nl_NL.lang
View File

@@ -20,10 +20,10 @@ gui.refinedstorage:relay=Relais
gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.import=Interface Import
gui.refinedstorage:interface.export=Interface Export gui.refinedstorage:interface.export=Interface Export
gui.refinedstorage:crafting_monitor=Crafting Monitor gui.refinedstorage:crafting_monitor=Crafting Monitor
gui.refinedstorage:crafting_monitor.missing_items=Ontbrekende items: gui.refinedstorage:crafting_monitor.missing_items=Ontbrekende items
gui.refinedstorage:crafting_monitor.items_crafting=Items aan het craften: gui.refinedstorage:crafting_monitor.items_crafting=Items aan het craften
gui.refinedstorage:crafting_monitor.items_processing=Items aan het verwerken: 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.not_started_yet=Nog niet begonnen
gui.refinedstorage:wireless_transmitter=Draadloze Zender gui.refinedstorage:wireless_transmitter=Draadloze Zender
gui.refinedstorage:wireless_transmitter.distance=%d blokken gui.refinedstorage:wireless_transmitter.distance=%d blokken
gui.refinedstorage:crafter=Crafter gui.refinedstorage:crafter=Crafter