aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/combat
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/combat')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt33
1 files changed, 3 insertions, 30 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
index c30299e4f..8ea8449f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
@@ -1,14 +1,11 @@
package at.hannibal2.skyhanni.features.combat
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.model.TabWidget
+import at.hannibal2.skyhanni.data.model.SkyblockStat
import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.events.WidgetUpdateEvent
import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst
import at.hannibal2.skyhanni.utils.RenderUtils.renderString
-import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@SkyHanniModule
@@ -16,35 +13,11 @@ object FerocityDisplay {
private val config get() = SkyHanniMod.feature.combat.ferocityDisplay
- /**
- * REGEX-TEST: Ferocity: §r§c⫽14
- */
- private val ferocityPattern by RepoPattern.pattern(
- "combat.ferocity.tab",
- " Ferocity: §r§c⫽(?<stat>.*)",
- )
-
- private var display = ""
-
- @SubscribeEvent
- fun onTabListUpdate(event: WidgetUpdateEvent) {
- if (!isEnabled()) return
- if (!event.isWidget(TabWidget.STATS, TabWidget.DUNGEON_SKILLS_AND_STATS)) return
- display = ""
- if (event.isClear()) return
- val stat = event.lines.matchFirst(ferocityPattern) {
- group("stat")
- } ?: return
-
- display = "§c⫽$stat"
-
- }
-
@SubscribeEvent
fun onRenderOverlay(event: GuiRenderEvent) {
if (!isEnabled()) return
-
- config.position.renderString(display, posLabel = "Ferocity Display")
+ if (SkyblockStat.FEROCITY.lastKnownValue == 0.0) return
+ config.position.renderString(SkyblockStat.FEROCITY.displayValue, posLabel = "Ferocity Display")
}
fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled