From 38ec6ea613924c32af7d5fec6c4c586167847e89 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 7 Aug 2017 23:07:07 +0200 Subject: [PATCH] Fixed number formatting that looks weird in grid view --- .../refinedstorage/util/RenderUtils.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java index c1731e9a4..636c234b3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java @@ -44,10 +44,22 @@ public final class RenderUtils { } public static String formatQuantity(int qty) { - if (qty >= 1000000) { - return QUANTITY_FORMATTER.format((float) qty / 1000000F) + "M"; + if (qty >= 1_000_000) { + float qtyShort = (float) qty / 1_000_000F; + + if (qty >= 100_000_000) { + qtyShort = Math.round(qtyShort); // XXX.XM looks weird. + } + + return QUANTITY_FORMATTER.format(qtyShort) + "M"; } else if (qty >= 1000) { - return QUANTITY_FORMATTER.format((float) qty / 1000F) + "K"; + float qtyShort = (float) qty / 1000F; + + if (qty >= 100_000) { + qtyShort = Math.round(qtyShort); // XXX.XK looks weird. + } + + return QUANTITY_FORMATTER.format(qtyShort) + "K"; } return String.valueOf(qty);