Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Internal Change: Cleanup DungeonMilestonesDisplay & Remove matchRegex #646

Merged
merged 5 commits into from
Dec 4, 2023
Merged

Internal Change: Cleanup DungeonMilestonesDisplay & Remove matchRegex #646

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c183cf
Refactor isMilestoneMessage to use patterns and a list
walkerselby Oct 28, 2023
513fe2f
Merge branch 'beta' into DungeonMilestonesDisplay-regex
hannibal002 Nov 22, 2023
08d2727
Update usage to appropriate function
walkerselby Dec 2, 2023
ace215c
Merge branch 'beta' into DungeonMilestonesDisplay-regex
walkerselby Dec 4, 2023
6d1a636
code cleanup
hannibal002 Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.chat
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
import at.hannibal2.skyhanni.utils.StringUtils.matches
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpaceAndResets
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
Expand Down Expand Up @@ -427,7 +427,7 @@ class ChatFilter {
* @see messagesStartsWithMap
*/
private fun String.isPresent(key: String) = this in (messagesMap[key] ?: emptyList()) ||
(patternsMap[key] ?: emptyList()).any { it.matchMatcher(this) { } != null } ||
(patternsMap[key] ?: emptyList()).any { it.matches(this) } ||
(messagesContainsMap[key] ?: emptyList()).any { this.contains(it) } ||
(messagesStartsWithMap[key] ?: emptyList()).any { this.startsWith(it) }

Expand Down
26 changes: 16 additions & 10 deletions src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,30 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.RenderUtils.renderString
import at.hannibal2.skyhanni.utils.StringUtils.matchRegex
import at.hannibal2.skyhanni.utils.StringUtils.matches
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import kotlin.concurrent.fixedRateTimer

class DungeonMilestonesDisplay {
private val config get() = SkyHanniMod.feature.dungeon

companion object {

// TODO USE SH-REPO
private val milestonePatternList = listOf(
"§e§l(.*) Milestone §r§e.§r§7: You have dealt §r§c(.*)§r§7 Total Damage so far! §r§a(.*)".toPattern(),
"§e§lArcher Milestone §r§e.§r§7: You have dealt §r§c(.*)§r§7 Ranged Damage so far! §r§a(.*)".toPattern(),
"§e§lHealer Milestone §r§e.§r§7: You have healed §r§a(.*)§r§7 Damage so far! §r§a(.*)".toPattern(),
"§e§lTank Milestone §r§e.§r§7: You have tanked and dealt §r§c(.*)§r§7 Total Damage so far! §r§a(.*)s".toPattern()
)

private var display = ""
var color = ""
var currentMilestone = 0
var timeReached = 0L

fun isMilestoneMessage(message: String): Boolean = when {
message.matchRegex("§e§l(.*) Milestone §r§e.§r§7: You have dealt §r§c(.*)§r§7 Total Damage so far! §r§a(.*)") -> true
message.matchRegex("§e§lArcher Milestone §r§e.§r§7: You have dealt §r§c(.*)§r§7 Ranged Damage so far! §r§a(.*)") -> true
message.matchRegex("§e§lHealer Milestone §r§e.§r§7: You have healed §r§a(.*)§r§7 Damage so far! §r§a(.*)") -> true
message.matchRegex("§e§lTank Milestone §r§e.§r§7: You have tanked and dealt §r§c(.*)§r§7 Total Damage so far! §r§a(.*)s") -> true

else -> false
}
fun isMilestoneMessage(message: String): Boolean =
milestonePatternList.any { it.matches(message) }
}

init {
Expand Down Expand Up @@ -84,7 +87,10 @@ class DungeonMilestonesDisplay {
fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
if (!isEnabled()) return

config.showMileStonesDisplayPos.renderString(color + display, posLabel = "Dungeon Milestone")
config.showMileStonesDisplayPos.renderString(
color + display,
posLabel = "Dungeon Milestone"
)
}

private fun isEnabled() = LorenzUtils.inDungeons && config.showMilestonesDisplay
Expand Down