aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-28 11:45:19 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-28 11:45:19 +0200
commit7c38caa1966996141e159997e85150a107fdd352 (patch)
tree3473a9fca450cb51ffa388c7cad83cfe535dc6d5 /src
parentec91b07c1517114720ca5ca90eec381fc7d641a2 (diff)
downloadskyhanni-7c38caa1966996141e159997e85150a107fdd352.tar.gz
skyhanni-7c38caa1966996141e159997e85150a107fdd352.tar.bz2
skyhanni-7c38caa1966996141e159997e85150a107fdd352.zip
fixed compatibility problem with neu and fixed wrong progress bar for pet exp display
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt
index c29387925..7b54d9d95 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PetExpTooltip.kt
@@ -11,12 +11,13 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPetExp
import at.hannibal2.skyhanni.utils.StringUtils
import net.minecraftforge.event.entity.player.ItemTooltipEvent
+import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class PetExpTooltip {
private val config get() = SkyHanniMod.feature.misc.petExperienceToolTip
- @SubscribeEvent
+ @SubscribeEvent(priority = EventPriority.LOWEST)
fun onItemTooltipLow(event: ItemTooltipEvent) {
if (!LorenzUtils.inSkyBlock) return
if (!config.petDisplay) return
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index d60a1c9ce..d42b597e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -139,15 +139,15 @@ object StringUtils {
var inMissingArea = false
builder.append(prefix)
for (i in 0..steps) {
- builder.append(step)
val toDouble = i.toDouble()
val stepPercentage = toDouble / steps
- if (stepPercentage > percentage) {
+ if (stepPercentage >= percentage) {
if (!inMissingArea) {
builder.append(missing)
inMissingArea = true
}
}
+ builder.append(step)
}
builder.append(end)
return builder.toString()