aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
index 26452e58f..09cd4f730 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
@@ -49,16 +49,18 @@ object RepoPatternManager {
private val insideTest = Launch.blackboard == null
+ var inTestDuplicateUsage = true
+
private val config
get() = if (!insideTest) {
SkyHanniMod.feature.dev.repoPattern
} else {
RepoPatternConfig().apply {
- tolerateDuplicateUsage = true
+ tolerateDuplicateUsage = inTestDuplicateUsage
}
}
- val localLoading: Boolean get() = config.forceLocal.get() || LorenzUtils.isInDevEnvironment()
+ val localLoading: Boolean get() = config.forceLocal.get() || (!insideTest && LorenzUtils.isInDevEnvironment())
/**
* Crash if in a development environment, or if inside a guarded event handler.
@@ -86,8 +88,12 @@ object RepoPatternManager {
@SubscribeEvent
fun onRepoReload(event: RepositoryReloadEvent) {
+ loadPatternsFromDump(event.getConstant<RepoPatternDump>("regexes"))
+ }
+
+ fun loadPatternsFromDump(dump: RepoPatternDump) {
regexes = null
- regexes = event.getConstant<RepoPatternDump>("regexes")
+ regexes = dump
reloadPatterns()
}