From 252a3bad48fea103985da6a8c1be3ec14fcb87df Mon Sep 17 00:00:00 2001 From: GoldenGnu Date: Mon, 7 Oct 2024 00:42:02 +0200 Subject: [PATCH 1/2] Bug Fix: Reprocessed value and color box was wrong --- .../eve/jeveasset/gui/tabs/reprocessed/ReprocessedTotal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedTotal.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedTotal.java index 86b93777f4..4d5407d692 100644 --- a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedTotal.java +++ b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedTotal.java @@ -105,7 +105,7 @@ public String getTypeName() { } public double getValue() { - return getSellPrice() * getPortionSize(); + return getSellPrice() * count; } public boolean isSell() { From 105a5ea3898e47489a610b20be86508288a7808c Mon Sep 17 00:00:00 2001 From: GoldenGnu Date: Mon, 7 Oct 2024 00:42:27 +0200 Subject: [PATCH 2/2] Bug Fix: Reprocessed grand total should never have a color --- .../gui/tabs/reprocessed/ReprocessedSeparatorTableCell.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedSeparatorTableCell.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedSeparatorTableCell.java index eb6bb6d43b..b792b3514b 100644 --- a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedSeparatorTableCell.java +++ b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/reprocessed/ReprocessedSeparatorTableCell.java @@ -183,7 +183,9 @@ protected void configure(Separator separator) { jBatchSize.setVisible(false); } //Color - if (material.getTotal().isSell()) { + if (material.isGrandTotal()) { + ColorSettings.config(jColor, ColorEntry.REPROCESSED_EQUAL); + } else if (material.getTotal().isSell()) { ColorSettings.config(jColor, ColorEntry.REPROCESSED_SELL); } else if (material.getTotal().isReprocess()) { ColorSettings.config(jColor, ColorEntry.REPROCESSED_REPROCESS);