From 13af18daab535fe99762580057d1b808e11c2c14 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 22 Jul 2018 19:36:36 +0200 Subject: [PATCH] Fix language entries for crafting monitor being too item-specific. --- .../api/autocrafting/task/ICraftingTask.java | 5 ++ .../apiimpl/autocrafting/CraftingManager.java | 2 +- .../autocrafting/task/CraftingTask.java | 55 +++++++------------ .../assets/refinedstorage/lang/de_de.lang | 2 - .../assets/refinedstorage/lang/en_us.lang | 10 ++-- .../assets/refinedstorage/lang/es_es.lang | 2 - .../assets/refinedstorage/lang/fr_fr.lang | 2 - .../assets/refinedstorage/lang/ko_kr.lang | 2 - .../assets/refinedstorage/lang/nl_nl.lang | 1 - .../assets/refinedstorage/lang/pt_br.lang | 2 - .../assets/refinedstorage/lang/ru_ru.lang | 4 -- .../assets/refinedstorage/lang/zh_cn.lang | 2 - 12 files changed, 33 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java index 4e59cc110..ac80fa14e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingTask.java @@ -42,6 +42,11 @@ public interface ICraftingTask { */ int getQuantity(); + /** + * @return the amount that this task gives back + */ + int getQuantityPerCraft(); + /** * @return the stack requested */ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java index 91787e2d7..e5c71a261 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -225,7 +225,7 @@ public class CraftingManager implements ICraftingManager { for (ICraftingTask task : getTasks()) { if (task.getRequested().getItem() != null) { if (API.instance().getComparer().isEqualNoQuantity(task.getRequested().getItem(), stack)) { - amount -= task.getQuantity(); + amount -= task.getQuantity() * task.getQuantityPerCraft(); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index 0b9ffc666..53608a2ae 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -132,7 +132,7 @@ public class CraftingTask implements ICraftingTask { this.calculationStarted = System.currentTimeMillis(); int qty = this.quantity; - int qtyPerCraft = getQuantityPerCraft(pattern, requested); + int qtyPerCraft = getQuantityPerCraft(); int crafted = 0; IStackList results = API.instance().createItemStackList(); @@ -424,7 +424,8 @@ public class CraftingTask implements ICraftingTask { } } - private int getQuantityPerCraft(ICraftingPattern pattern, ICraftingRequestInfo requested) { + @Override + public int getQuantityPerCraft() { int qty = 0; if (requested.getItem() != null) { @@ -522,13 +523,12 @@ public class CraftingTask implements ICraftingTask { return size; } - // TODO: Fix lang keys. @Override public List getCraftingMonitorElements() { ICraftingMonitorElementList elements = API.instance().createCraftingMonitorElementList(); if (!missing.isEmpty() || !missingFluids.isEmpty()) { - elements.directAdd(new CraftingMonitorElementText("gui.refinedstorage:crafting_monitor.items_missing", 5)); + elements.directAdd(new CraftingMonitorElementText("gui.refinedstorage:crafting_monitor.missing", 5)); } if (!missing.isEmpty()) { @@ -588,9 +588,8 @@ public class CraftingTask implements ICraftingTask { elements.commit(); } - // TODO: Make better? if (steps.stream().anyMatch(s -> s instanceof CraftingStepProcess && !s.isCompleted())) { - elements.directAdd(new CraftingMonitorElementText("gui.refinedstorage:crafting_monitor.items_processing", 5)); + elements.directAdd(new CraftingMonitorElementText("gui.refinedstorage:crafting_monitor.processing", 5)); for (CraftingStep step : steps) { if (step instanceof CraftingStepProcess && !step.isCompleted()) { @@ -603,19 +602,7 @@ public class CraftingTask implements ICraftingTask { continue; } - ICraftingMonitorElement element = new CraftingMonitorElementItemRender(stack.getItem(), stack.getItem().getCount(), 0); - - if (stack.getStatus() == CraftingExtractorStatus.MISSING) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.waiting_for_items", CraftingMonitorElementColor.COLOR_INFO); - } else if (stack.getStatus() == CraftingExtractorStatus.MACHINE_DOES_NOT_ACCEPT) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.machine_does_not_accept", CraftingMonitorElementColor.COLOR_ERROR); - } else if (stack.getStatus() == CraftingExtractorStatus.MACHINE_NONE) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.machine_none", CraftingMonitorElementColor.COLOR_ERROR); - } else if (stack.getStatus() == CraftingExtractorStatus.EXTRACTED) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.item_inserted_into_machine", CraftingMonitorElementColor.COLOR_SUCCESS); - } - - elements.add(element); + elements.add(wrapAccordingToStatus(new CraftingMonitorElementItemRender(stack.getItem(), stack.getItem().getCount(), 0), stack)); } } } @@ -629,25 +616,11 @@ public class CraftingTask implements ICraftingTask { for (int i = 0; i < extractor.getStacks().size(); ++i) { CraftingExtractorStack stack = extractor.getStacks().get(i); - ICraftingMonitorElement element; - if (stack.getItem() != null) { continue; } - element = new CraftingMonitorElementFluidRender(stack.getFluid(), stack.getFluid().amount, 0); - - if (stack.getStatus() == CraftingExtractorStatus.MISSING) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.waiting_for_items", CraftingMonitorElementColor.COLOR_INFO); - } else if (stack.getStatus() == CraftingExtractorStatus.MACHINE_DOES_NOT_ACCEPT) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.machine_does_not_accept", CraftingMonitorElementColor.COLOR_ERROR); - } else if (stack.getStatus() == CraftingExtractorStatus.MACHINE_NONE) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.machine_none", CraftingMonitorElementColor.COLOR_ERROR); - } else if (stack.getStatus() == CraftingExtractorStatus.EXTRACTED) { - element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.item_inserted_into_machine", CraftingMonitorElementColor.COLOR_SUCCESS); - } - - elements.add(element); + elements.add(wrapAccordingToStatus(new CraftingMonitorElementFluidRender(stack.getFluid(), stack.getFluid().amount, 0), stack)); } } } @@ -658,6 +631,20 @@ public class CraftingTask implements ICraftingTask { return elements.getElements(); } + private ICraftingMonitorElement wrapAccordingToStatus(ICraftingMonitorElement element, CraftingExtractorStack stack) { + if (stack.getStatus() == CraftingExtractorStatus.MISSING) { + element = new CraftingMonitorElementColor(element, stack.getFluid() != null ? "gui.refinedstorage:crafting_monitor.waiting_for_fluids" : "gui.refinedstorage:crafting_monitor.waiting_for_items", CraftingMonitorElementColor.COLOR_INFO); + } else if (stack.getStatus() == CraftingExtractorStatus.MACHINE_DOES_NOT_ACCEPT) { + element = new CraftingMonitorElementColor(element, stack.getFluid() != null ? "gui.refinedstorage:crafting_monitor.machine_does_not_accept_fluid" : "gui.refinedstorage:crafting_monitor.machine_does_not_accept_item", CraftingMonitorElementColor.COLOR_ERROR); + } else if (stack.getStatus() == CraftingExtractorStatus.MACHINE_NONE) { + element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.machine_none", CraftingMonitorElementColor.COLOR_ERROR); + } else if (stack.getStatus() == CraftingExtractorStatus.EXTRACTED) { + element = new CraftingMonitorElementColor(element, "gui.refinedstorage:crafting_monitor.inserted_into_machine", CraftingMonitorElementColor.COLOR_SUCCESS); + } + + return element; + } + @Override public List getPreviewStacks() { Map map = new LinkedHashMap<>(); diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.lang b/src/main/resources/assets/refinedstorage/lang/de_de.lang index 498ba9536..16f3eef40 100755 --- a/src/main/resources/assets/refinedstorage/lang/de_de.lang +++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang @@ -21,9 +21,7 @@ gui.refinedstorage:interface.export=Ausgabeschnittstelle gui.refinedstorage:crafting_monitor=Fertigungsmonitor gui.refinedstorage:crafting_monitor.fluids_taking=verwende Flüssigkeit gui.refinedstorage:crafting_monitor.items_crafting=Teil herstellen -gui.refinedstorage:crafting_monitor.items_processing=Teil verarbeiten gui.refinedstorage:crafting_monitor.items_inserting=Teil einfügen -gui.refinedstorage:crafting_monitor.items_missing=Teil fehlt gui.refinedstorage:crafting_monitor.machine_none=keine Maschine gefunden gui.refinedstorage:crafting_monitor.waiting_for_items=Warte auf Teile gui.refinedstorage:wireless_transmitter=Funk-Sender diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang index 58e98971d..3f3b22e77 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang @@ -29,14 +29,16 @@ gui.refinedstorage:wireless_crafting_monitor=Wireless Crafting Monitor gui.refinedstorage:crafting_monitor.tooltip.requested=%d requested gui.refinedstorage:crafting_monitor.fluids_taking=Fluids taking gui.refinedstorage:crafting_monitor.items_crafting=Items crafting -gui.refinedstorage:crafting_monitor.items_processing=Items processing +gui.refinedstorage:crafting_monitor.processing=Processing gui.refinedstorage:crafting_monitor.items_inserting=Items inserting -gui.refinedstorage:crafting_monitor.items_missing=Items missing -gui.refinedstorage:crafting_monitor.machine_does_not_accept=Machine doesn't accept item +gui.refinedstorage:crafting_monitor.missing=Missing +gui.refinedstorage:crafting_monitor.machine_does_not_accept_item=Machine doesn't accept item +gui.refinedstorage:crafting_monitor.machine_does_not_accept_fluid=Machine doesn't accept fluid gui.refinedstorage:crafting_monitor.machine_none=No machine found gui.refinedstorage:crafting_monitor.waiting_for_items=Waiting for items +gui.refinedstorage:crafting_monitor.waiting_for_fluids=Waiting for fluids gui.refinedstorage:crafting_monitor.network_full=Network is full -gui.refinedstorage:crafting_monitor.item_inserted_into_machine=Item is inserted into machine, waiting for result +gui.refinedstorage:crafting_monitor.inserted_into_machine=Inserted into machine, waiting for result gui.refinedstorage:wireless_transmitter=Wireless Transmitter gui.refinedstorage:wireless_transmitter.distance=%d block(s) gui.refinedstorage:crafter=Crafter diff --git a/src/main/resources/assets/refinedstorage/lang/es_es.lang b/src/main/resources/assets/refinedstorage/lang/es_es.lang index 14e1f9987..477632e6a 100644 --- a/src/main/resources/assets/refinedstorage/lang/es_es.lang +++ b/src/main/resources/assets/refinedstorage/lang/es_es.lang @@ -26,9 +26,7 @@ gui.refinedstorage:crafting_monitor=Monitor de fabricación gui.refinedstorage:wireless_crafting_monitor=Monitor Remoto de Fabricación gui.refinedstorage:crafting_monitor.fluids_taking=Toma de Fluidos gui.refinedstorage:crafting_monitor.items_crafting=Fabrica Objetos -gui.refinedstorage:crafting_monitor.items_processing=Procesamiento de objetos gui.refinedstorage:crafting_monitor.items_inserting=Inserta Objetos -gui.refinedstorage:crafting_monitor.items_missing=Faltan objetos gui.refinedstorage:crafting_monitor.machine_none=Maquina no Hallada gui.refinedstorage:crafting_monitor.waiting_for_items=Esperando Objetos gui.refinedstorage:wireless_transmitter=Emisor inalámbrico diff --git a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang index e3e8ca976..6fdf1b20d 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang @@ -25,9 +25,7 @@ gui.refinedstorage:crafting_monitor=Moniteur de craft gui.refinedstorage:wireless_crafting_monitor=Moniteur de craft sans-fil gui.refinedstorage:crafting_monitor.fluids_taking=Fluides entrants gui.refinedstorage:crafting_monitor.items_crafting=Items en craft -gui.refinedstorage:crafting_monitor.items_processing=Items en traitement gui.refinedstorage:crafting_monitor.items_inserting=Insertion d'items -gui.refinedstorage:crafting_monitor.items_missing=Items manquants gui.refinedstorage:crafting_monitor.machine_none=Pas de machine disponible gui.refinedstorage:crafting_monitor.waiting_for_items=En attente d'items gui.refinedstorage:wireless_transmitter=Emetteur sans-fil diff --git a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang index dd259d552..e2832973e 100644 --- a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang +++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang @@ -24,9 +24,7 @@ gui.refinedstorage:crafting_monitor=조합 모니터 gui.refinedstorage:wireless_crafting_monitor=무선 조합 모니터 gui.refinedstorage:crafting_monitor.fluids_taking=사용할 액체 gui.refinedstorage:crafting_monitor.items_crafting=제작할 아이템 -gui.refinedstorage:crafting_monitor.items_processing=가공할 아이템 gui.refinedstorage:crafting_monitor.items_inserting=삽입할 아이템 -gui.refinedstorage:crafting_monitor.items_missing=부족한 아이템 gui.refinedstorage:crafting_monitor.machine_none=기계를 찾을 수 없음 gui.refinedstorage:crafting_monitor.waiting_for_items=아이템을 기다리는 중 gui.refinedstorage:wireless_transmitter=무선 송신기 diff --git a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang index d948fb208..caaa15753 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang @@ -20,7 +20,6 @@ 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.machine_none=Geen machine gevonden gui.refinedstorage:wireless_transmitter=Draadloze Zender gui.refinedstorage:wireless_transmitter.distance=%d blokken diff --git a/src/main/resources/assets/refinedstorage/lang/pt_br.lang b/src/main/resources/assets/refinedstorage/lang/pt_br.lang index 976259d92..1a3d3005e 100755 --- a/src/main/resources/assets/refinedstorage/lang/pt_br.lang +++ b/src/main/resources/assets/refinedstorage/lang/pt_br.lang @@ -25,9 +25,7 @@ gui.refinedstorage:crafting_monitor=Monitor de Fabricações gui.refinedstorage:wireless_crafting_monitor=Monitor de Fabricações Wireless gui.refinedstorage:crafting_monitor.fluids_taking=Emcaminhando fluidos gui.refinedstorage:crafting_monitor.items_crafting=Fabricando itens -gui.refinedstorage:crafting_monitor.items_processing=Processando itens gui.refinedstorage:crafting_monitor.items_inserting=Inserindo itens -gui.refinedstorage:crafting_monitor.items_missing=Ausência de itens gui.refinedstorage:crafting_monitor.machine_none=Nenhuma máquina encontrada gui.refinedstorage:crafting_monitor.waiting_for_items=Esperando itens gui.refinedstorage:wireless_transmitter=Transmissor Wireless diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang index c0af99f46..8369bd96f 100755 --- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang +++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang @@ -28,14 +28,10 @@ gui.refinedstorage:wireless_crafting_monitor=Беспроводной монит gui.refinedstorage:crafting_monitor.tooltip.requested=Требует %d gui.refinedstorage:crafting_monitor.fluids_taking=Прием жидкостей gui.refinedstorage:crafting_monitor.items_crafting=Предметы с возможностью крафта -gui.refinedstorage:crafting_monitor.items_processing=Предметы с возможностью обработки gui.refinedstorage:crafting_monitor.items_inserting=Вставка предметов -gui.refinedstorage:crafting_monitor.items_missing=Отсутствуют предметы -gui.refinedstorage:crafting_monitor.machine_does_not_accept=Машина не принимает предмет gui.refinedstorage:crafting_monitor.machine_none=Машина не найдена gui.refinedstorage:crafting_monitor.waiting_for_items=Ожидание предметов gui.refinedstorage:crafting_monitor.network_full=Сеть полна -gui.refinedstorage:crafting_monitor.item_inserted_into_machine=Предмет вставлен в машину, ожидание результата gui.refinedstorage:wireless_transmitter=Передатчик gui.refinedstorage:wireless_transmitter.distance=%d блоков gui.refinedstorage:crafter=Крафтер diff --git a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang index c20ea6036..769be7f7a 100755 --- a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang +++ b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang @@ -26,9 +26,7 @@ gui.refinedstorage:crafting_monitor=合成监控处理器 gui.refinedstorage:wireless_crafting_monitor=无线合成监控处理器 gui.refinedstorage:crafting_monitor.fluids_taking=正在装填流体 gui.refinedstorage:crafting_monitor.items_crafting=正在合成 -gui.refinedstorage:crafting_monitor.items_processing=正在处理 gui.refinedstorage:crafting_monitor.items_inserting=物品正在输入 -gui.refinedstorage:crafting_monitor.items_missing=物品丢失中 gui.refinedstorage:crafting_monitor.machine_none=找不到机器 gui.refinedstorage:crafting_monitor.waiting_for_items=正在等待物品 gui.refinedstorage:wireless_transmitter=无线访问点