From 1fdbbe23800bd6347e6f7e3de9362c7745e2c144 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Mon, 28 Aug 2023 20:02:24 +1000 Subject: Merge pull request #404 * Various /ff fixes --- src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt | 2 +- src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt index 9c9d612f3..a8d493018 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt @@ -236,7 +236,7 @@ object GuiRenderUtils { GlStateManager.scale(textScale, textScale, 1f) drawString(label, xPos * inverseScale, yPos * inverseScale) drawString( - "§2$current / ${DecimalFormat("0.#").format(maxValue)}☘", + "§2$current / ${DecimalFormat("0.##").format(maxValue)}☘", xPos * inverseScale, (yPos + 8) * inverseScale ) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt index d90c16ded..510ef0aa3 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt @@ -233,4 +233,11 @@ object ItemUtils { } return getItemStack().nameWithEnchantment ?: error("Could not find item name for $this") } + + fun getPetRarityOld(petStack: ItemStack?): Int { + val petInternalName = petStack?.getInternalName_old() + if (petInternalName == "NONE" || petInternalName == null) return -1 + val split = petInternalName.split(";") + return split.last().toInt() + } } \ No newline at end of file -- cgit