diff options
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt | 27 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt | 1 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt index e2dac0f4c..9d1a1dca2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt @@ -52,15 +52,15 @@ object TrevorFeatures { private val patternGroup = RepoPattern.group("misc.trevor") private val trapperPattern by patternGroup.pattern( "trapper", - "\\[NPC] Trevor: You can find your (?<rarity>.*) animal near the (?<location>.*)." + "\\[NPC] Trevor: You can find your (?<rarity>.*) animal near the (?<location>.*).", ) private val talbotPatternAbove by patternGroup.pattern( "above", - "The target is around (?<height>.*) blocks above, at a (?<angle>.*) degrees angle!" + "The target is around (?<height>.*) blocks above, at a (?<angle>.*) degrees angle!", ) private val talbotPatternBelow by patternGroup.pattern( "below", - "The target is around (?<height>.*) blocks below, at a (?<angle>.*) degrees angle!" + "The target is around (?<height>.*) blocks below, at a (?<angle>.*) degrees angle!", ) private val talbotPatternAt by patternGroup.pattern( "at", @@ -68,27 +68,27 @@ object TrevorFeatures { ) private val locationPattern by patternGroup.pattern( "zone", - "Location: (?<zone>.*)" + "Location: (?<zone>.*)", ) private val mobDiedPattern by patternGroup.pattern( "mob.died", - "§aReturn to the Trapper soon to get a new animal to hunt!" + "§aReturn to the Trapper soon to get a new animal to hunt!", ) private val startDialoguePattern by patternGroup.pattern( "start.dialogue", - "[NPC] Trevor: You will have 10 minutes to find the mob from when you accept the task." + "[NPC] Trevor: You will have 10 minutes to find the mob from when you accept the task.", ) private val outOfTimePattern by patternGroup.pattern( "outoftime", - "You ran out of time and the animal disappeared!" + "You ran out of time and the animal disappeared!", ) private val clickOptionPattern by patternGroup.pattern( "clickoption", - "Click an option: §r§a§l\\[YES]§r§7 - §r§c§l\\[NO]" + "Click an option: §r§a§l\\[YES]§r§7 - §r§c§l\\[NO]", ) private val areaTrappersDenPattern by patternGroup.pattern( "area.trappersden", - "Trapper's Den" + "Trapper's Den", ) private var timeUntilNextReady = 0 @@ -193,7 +193,7 @@ object TrevorFeatures { config.trapperCooldownPos.renderString( "${currentStatus.colorCode}Trapper Cooldown: $cooldownMessage", - posLabel = "Trapper Cooldown GUI" + posLabel = "Trapper Cooldown GUI", ) } @@ -216,6 +216,7 @@ object TrevorFeatures { var found = false var active = false val previousLocation = TrevorSolver.mobLocation + // TODO work wioth trapper widget, widget api, repo patterns, when not found, warn in chat and dont update for (line in TabListData.getTabList()) { val formattedLine = line.removeColor().drop(1) if (formattedLine.startsWith("Time Left: ")) { @@ -231,8 +232,7 @@ object TrevorFeatures { } locationPattern.matchMatcher(formattedLine) { val zone = group("zone") - TrevorSolver.mobLocation = TrapperMobArea.entries.firstOrNull { it.location == zone } - ?: TrapperMobArea.NONE + TrevorSolver.mobLocation = TrapperMobArea.entries.firstOrNull { it.location == zone } ?: TrapperMobArea.NONE found = true } } @@ -254,8 +254,7 @@ object TrevorFeatures { var entityTrapper = EntityUtils.getEntityByID(trapperID) if (entityTrapper !is EntityLivingBase) entityTrapper = EntityUtils.getEntityByID(backupTrapperID) if (entityTrapper is EntityLivingBase && config.trapperTalkCooldown) { - RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entityTrapper, currentStatus.color) - { config.trapperTalkCooldown } + RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entityTrapper, currentStatus.color) { config.trapperTalkCooldown } entityTrapper.getLorenzVec().let { if (it.distanceToPlayer() < 15) { event.drawString(it.add(y = 2.23), currentLabel) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt index eb9a2fc11..270b52038 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt @@ -36,6 +36,7 @@ object TabListData { var fullyLoaded = false // TODO replace with TabListUpdateEvent + @Deprecated("replace with TabListUpdateEvent") fun getTabList() = debugCache ?: tablistCache fun getHeader() = header fun getFooter() = footer |