0.14 - Finished :) (#233)

Co-authored-by: nopo <noahogno@gmail.com>
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: Ascynx <78341107+Ascynx@users.noreply.github.com>
Co-authored-by: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Co-authored-by: Lulonaut <lulonaut@tutanota.de>

1 files changed, 5 insertions, 15 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
index 59373952..0f9d1b4a 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
@@ -23,6 +23,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.core.util.StringUtils;
 import io.github.moulberry.notenoughupdates.cosmetics.ShaderManager;
 import io.github.moulberry.notenoughupdates.itemeditor.GuiElementTextField;
 import io.github.moulberry.notenoughupdates.miscfeatures.PetInfoOverlay;
@@ -283,20 +284,9 @@ public class GuiProfileViewer extends GuiScreen {
 		return levelObj;
 	}
 
+	@Deprecated
 	public static String shortNumberFormat(double n, int iteration) {
-		if (n < 1000) {
-			if (n % 1 == 0) {
-				return Integer.toString((int) n);
-			} else {
-				return String.format("%.2f", n);
-			}
-		}
-
-		double d = ((long) n / 100) / 10.0;
-		boolean isRound = (d * 10) % 10 == 0;
-		return d < 1000 ? (isRound || d > 9.99 ? (int) d * 10 / 10 : d + "") + "" + c[iteration] : shortNumberFormat(
-			d,
-			iteration + 1
+		return StringUtils.shortNumberFormat(n, iteration
 		);
 	}
 
@@ -1013,9 +1003,9 @@ public class GuiProfileViewer extends GuiScreen {
 					int maxXp = (int) levelObj.maxXpForLevel;
 					levelStr =
 						EnumChatFormatting.DARK_PURPLE +
-							shortNumberFormat(Math.round((level % 1) * maxXp), 0) +
+							StringUtils.shortNumberFormat(Math.round((level % 1) * maxXp)) +
 							"/" +
-							shortNumberFormat(maxXp, 0);
+							StringUtils.shortNumberFormat(maxXp);
 				}
 				if (totalXpStr != null) {
 					tooltipToDisplay = Utils.createList(levelStr, totalXpStr);