ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

stack formatter: support larger stack sizes

Browse Source
This commit is contained in:
Jeremy Plsek
2018-03-18 11:33:10 -04:00
committed by Adam
parent adc5fe2b26
commit 254c62bfab
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/util/StackFormatter.java
View File

@@ -58,12 +58,12 @@ public class StackFormatter
* @return A condensed version, with commas, K, M or B * @return A condensed version, with commas, K, M or B
* as needed to 3 significant figures. * as needed to 3 significant figures.
*/ */
public static String quantityToStackSize(int quantity) public static String quantityToStackSize(long quantity)
{ {
if (quantity < 0) if (quantity < 0)
{ {
// Integer.MIN_VALUE = -1 * Integer.MIN_VALUE so we need to correct for it. // Long.MIN_VALUE = -1 * Long.MIN_VALUE so we need to correct for it.
return "-" + quantityToStackSize(quantity == Integer.MIN_VALUE ? Integer.MAX_VALUE : -quantity); return "-" + quantityToStackSize(quantity == Long.MIN_VALUE ? Long.MAX_VALUE : -quantity);
} }
else if (quantity < 10_000) else if (quantity < 10_000)
{ {
@@ -71,14 +71,14 @@ public class StackFormatter
} }
String suffix = SUFFIXES[0]; String suffix = SUFFIXES[0];
int divideBy = 1; long divideBy = 1;
// determine correct suffix by iterating backward through the list // determine correct suffix by iterating backward through the list
// of suffixes until the suffix results in a value >= 1 // of suffixes until the suffix results in a value >= 1
for (int i = (SUFFIXES.length - 1); i >= 0; i--) for (int i = (SUFFIXES.length - 1); i >= 0; i--)
{ {
divideBy = (int) Math.pow(10, i * 3); divideBy = (long) Math.pow(10, i * 3);
if ((float) quantity / divideBy >= 1) if ((double) quantity / divideBy >= 1)
{ {
suffix = SUFFIXES[i]; suffix = SUFFIXES[i];
break; break;
@@ -86,7 +86,7 @@ public class StackFormatter
} }
// get locale formatted string // get locale formatted string
String formattedString = NUMBER_FORMATTER.format((float) quantity / divideBy); String formattedString = NUMBER_FORMATTER.format((double) quantity / divideBy);
// strip down any digits past the 4 first // strip down any digits past the 4 first
formattedString = (formattedString.length() > 4 ? formattedString.substring(0, 4) : formattedString); formattedString = (formattedString.length() > 4 ? formattedString.substring(0, 4) : formattedString);

4
runelite-client/src/test/java/net/runelite/client/util/StackFormatterTest.java
View File

@@ -61,12 +61,14 @@ public class StackFormatterTest
assertEquals("100K", StackFormatter.quantityToStackSize(100_000)); assertEquals("100K", StackFormatter.quantityToStackSize(100_000));
assertEquals("10M", StackFormatter.quantityToStackSize(10_000_000)); assertEquals("10M", StackFormatter.quantityToStackSize(10_000_000));
assertEquals(NumberFormat.getNumberInstance().format(2.14) + "B", StackFormatter.quantityToStackSize(Integer.MAX_VALUE)); assertEquals(NumberFormat.getNumberInstance().format(2.14) + "B", StackFormatter.quantityToStackSize(Integer.MAX_VALUE));
assertEquals("100B", StackFormatter.quantityToStackSize(100_000_000_000L));
assertEquals("0", StackFormatter.quantityToStackSize(-0)); assertEquals("0", StackFormatter.quantityToStackSize(-0));
assertEquals("-400", StackFormatter.quantityToStackSize(-400)); assertEquals("-400", StackFormatter.quantityToStackSize(-400));
assertEquals("-400K", StackFormatter.quantityToStackSize(-400_000)); assertEquals("-400K", StackFormatter.quantityToStackSize(-400_000));
assertEquals("-40M", StackFormatter.quantityToStackSize(-40_000_000)); assertEquals("-40M", StackFormatter.quantityToStackSize(-40_000_000));
assertEquals(NumberFormat.getNumberInstance().format(-2.14) + "B", StackFormatter.quantityToStackSize(Integer.MIN_VALUE)); assertEquals(NumberFormat.getNumberInstance().format(-2.14) + "B", StackFormatter.quantityToStackSize(Integer.MIN_VALUE));
assertEquals("-400B", StackFormatter.quantityToStackSize(-400_000_000_000L));
} }
@Test @Test
@@ -103,4 +105,4 @@ public class StackFormatterTest
{ {
} }
} }
} }