From d2e50f83fdc0ff9ce4713ed52f89957a359ef870 Mon Sep 17 00:00:00 2001 From: PKLite Date: Thu, 13 Jun 2019 12:56:12 -0400 Subject: [PATCH 1/2] Adds GP value to untradables lost on pvp death, removes debug logging msg Signed-off-by: PKLite --- .../loottracker/LootRecordSortType.java | 2 -- .../plugins/loottracker/LootTrackerPanel.java | 1 - .../loottracker/LootTrackerPlugin.java | 19 ++++++++++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordSortType.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordSortType.java index 61050d2552..6dc01e960c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordSortType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordSortType.java @@ -39,8 +39,6 @@ public enum LootRecordSortType implements Comparator } int sum = Arrays.stream(o1.getItems()).flatMapToInt(lootTrackerItem -> IntStream.of((int) lootTrackerItem.getPrice() * lootTrackerItem.getQuantity())).sum(); - log.info(String.valueOf(sum + Arrays.stream(o2.getItems()).flatMapToInt(lootTrackerItem -> - IntStream.of((int) lootTrackerItem.getPrice() * lootTrackerItem.getQuantity())).sum())); return sum + Arrays.stream(o2.getItems()).flatMapToInt(lootTrackerItem -> IntStream.of((int) lootTrackerItem.getPrice() * lootTrackerItem.getQuantity())).sum(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java index b26f83f0ff..9193a3bdbf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java @@ -446,7 +446,6 @@ class LootTrackerPanel extends PluginPanel } } buildBox(records.get(i)); - log.info(String.valueOf(Arrays.stream(records.get(i).getItems()).flatMapToInt(a -> IntStream.of(a.getQuantity() * (int) a.getPrice())).sum())); } boxes.forEach(LootTrackerBox::rebuild); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 792618d588..ccf8649bc4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -743,14 +743,23 @@ public class LootTrackerPlugin extends Plugin @VisibleForTesting private LootTrackerItem buildLootTrackerItem(int itemId, int quantity) { - final ItemDefinition itemComposition = itemManager.getItemDefinition(itemId); - final int realItemId = itemComposition.getNote() != -1 ? itemComposition.getLinkedNoteId() : itemId; - final long price = (long) itemManager.getItemPrice(realItemId) * (long) quantity; - final boolean ignored = ignoredItems.contains(itemComposition.getName()); + final ItemDefinition itemDefinition = itemManager.getItemDefinition(itemId); + final int realItemId = itemDefinition.getNote() != -1 ? itemDefinition.getLinkedNoteId() : itemId; + final long price; + // If it's a death we want to get a coin value for untradeables lost + if (!itemDefinition.isTradeable() && quantity < 0) + { + price = (long) itemDefinition.getPrice() *(long) quantity; + } + else + { + price =(long) itemManager.getItemPrice(realItemId) * (long) quantity; + } + final boolean ignored = ignoredItems.contains(itemDefinition.getName()); return new LootTrackerItem( itemId, - itemComposition.getName(), + itemDefinition.getName(), quantity, price, ignored); From 8cd41f4c5e1c8ed547bffa5bb10e6482e2713648 Mon Sep 17 00:00:00 2001 From: PKLite Date: Thu, 13 Jun 2019 13:11:11 -0400 Subject: [PATCH 2/2] forgot to run checkstyle Signed-off-by: PKLite --- .../runelite/client/plugins/loottracker/LootTrackerPanel.java | 2 -- .../client/plugins/loottracker/LootTrackerPlugin.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java index 9193a3bdbf..ac2d502ce5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java @@ -33,11 +33,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.stream.IntStream; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.ImageIcon; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index ccf8649bc4..7bb87b03ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -749,11 +749,11 @@ public class LootTrackerPlugin extends Plugin // If it's a death we want to get a coin value for untradeables lost if (!itemDefinition.isTradeable() && quantity < 0) { - price = (long) itemDefinition.getPrice() *(long) quantity; + price = (long) itemDefinition.getPrice() * (long) quantity; } else { - price =(long) itemManager.getItemPrice(realItemId) * (long) quantity; + price = (long) itemManager.getItemPrice(realItemId) * (long) quantity; } final boolean ignored = ignoredItems.contains(itemDefinition.getName());