From 2725e0452f0b75987a1a68d0784d4c134836a7e4 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 15 Mar 2021 20:28:57 -0400 Subject: [PATCH] ge plugin: use int for ha value --- .../plugins/grandexchange/GrandExchangeItemPanel.java | 6 +++--- .../client/plugins/grandexchange/GrandExchangeItems.java | 2 +- .../plugins/grandexchange/GrandExchangeSearchPanel.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java index b833c4ab41..027c1acb4a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java @@ -51,8 +51,8 @@ class GrandExchangeItemPanel extends JPanel { private static final Dimension ICON_SIZE = new Dimension(32, 32); - GrandExchangeItemPanel(AsyncBufferedImage icon, String name, int itemID, int gePrice, Double - haPrice, int geItemLimit) + GrandExchangeItemPanel(AsyncBufferedImage icon, String name, int itemID, + int gePrice, int haPrice, int geItemLimit) { BorderLayout layout = new BorderLayout(); layout.setHgap(5); @@ -138,7 +138,7 @@ class GrandExchangeItemPanel extends JPanel // Alch price JLabel haPriceLabel = new JLabel(); - haPriceLabel.setText(QuantityFormatter.formatNumber(haPrice.intValue()) + " alch"); + haPriceLabel.setText(QuantityFormatter.formatNumber(haPrice) + " alch"); haPriceLabel.setForeground(ColorScheme.GRAND_EXCHANGE_ALCH); alchAndLimitPanel.add(haPriceLabel, BorderLayout.WEST); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItems.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItems.java index c56472d494..0bc10499e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItems.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItems.java @@ -34,6 +34,6 @@ class GrandExchangeItems private final String name; private final int itemId; private final int gePrice; - private final double haPrice; + private final int haPrice; private final int geItemLimit; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java index 942ee98cde..db45a024ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java @@ -215,9 +215,10 @@ class GrandExchangeSearchPanel extends JPanel int itemPrice = useActivelyTradedPrice && item.getWikiPrice() > 0 ? item.getWikiPrice() : item.getPrice(); int itemLimit = itemStats != null ? itemStats.getGeLimit() : 0; + final int haPrice = itemComp.getHaPrice(); AsyncBufferedImage itemImage = itemManager.getImage(itemId); - itemsList.add(new GrandExchangeItems(itemImage, item.getName(), itemId, itemPrice, itemComp.getPrice() * 0.6, itemLimit)); + itemsList.add(new GrandExchangeItems(itemImage, item.getName(), itemId, itemPrice, haPrice, itemLimit)); // If using hotkey to lookup item, stop after finding match. if (exactMatch && item.getName().equalsIgnoreCase(lookup))