aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt
index 1f0cbfe30..e3bfb8cfc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt
@@ -76,15 +76,7 @@ object GhostCounter {
private var killETA = ""
private var currentSkill = ""
private var currentSkillLevel = -1
- private val configUpdateVersion = 1
-
- init {
- if (hidden?.configUpdateVersion == 0){
- config.textFormatting.bestiaryFormatting.base = " &6Bestiary %display%: &b%value%"
- chat("§e[SkyHanni] Your GhostCounter config has been automatically adjusted.")
- hidden?.configUpdateVersion = configUpdateVersion
- }
- }
+ private const val configUpdateVersion = 1
@SubscribeEvent
fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
@@ -152,6 +144,7 @@ object GhostCounter {
bestiaryCurrentKill = cKill
bestiaryFormatting.showMax_progress
}
+
else -> bestiaryFormatting.openMenu
}
} else {
@@ -213,7 +206,7 @@ object GhostCounter {
addAsSingletonList(config.textFormatting.killComboFormat.formatText(KILLCOMBO.getInt(), MAXKILLCOMBO.getInt(true)))
addAsSingletonList(config.textFormatting.highestKillComboFormat.formatText(MAXKILLCOMBO.getInt(), MAXKILLCOMBO.getInt(true)))
addAsSingletonList(config.textFormatting.skillXPGainFormat.formatText(SKILLXPGAINED.get(), SKILLXPGAINED.get(true)))
- addAsSingletonList(bestiaryFormatting.base.preFormat(bestiary,nextLevel-1, nextLevel).formatBestiary(currentKill, killNeeded))
+ addAsSingletonList(bestiaryFormatting.base.preFormat(bestiary, nextLevel - 1, nextLevel).formatBestiary(currentKill, killNeeded))
addAsSingletonList(xpHourFormatting.base.formatText(xp))
addAsSingletonList(killHourFormatting.base.formatText(killHour))
@@ -445,17 +438,26 @@ object GhostCounter {
var kills = 0.0
for (line in ghostStack.getLore()) {
val l = line.removeColor().trim()
- if (l.startsWith("Kills: ")){
+ if (l.startsWith("Kills: ")) {
kills = "Kills: (.*)".toRegex().find(l)?.groupValues?.get(1)?.formatNumber()?.toDouble() ?: 0.0
}
ghostXPPattern.matchMatcher(line.removeColor().trim()) {
- hidden?.bestiaryCurrentKill = if (kills>0) kills else group("current").formatNumber().toDouble()
+ hidden?.bestiaryCurrentKill = if (kills > 0) kills else group("current").formatNumber().toDouble()
hidden?.bestiaryKillNeeded = group("total").formatNumber().toDouble()
}
}
update()
}
+ @SubscribeEvent
+ fun onConfigLoad(event: ConfigLoadEvent) {
+ if (hidden?.configUpdateVersion == 0) {
+ config.textFormatting.bestiaryFormatting.base = " &6Bestiary %display%: &b%value%"
+ chat("§e[SkyHanni] Your GhostCounter config has been automatically adjusted.")
+ hidden?.configUpdateVersion = configUpdateVersion
+ }
+ }
+
fun isEnabled(): Boolean {
return LorenzUtils.inSkyBlock && config.enabled && LorenzUtils.skyBlockIsland == IslandType.DWARVEN_MINES
}