diff options
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt | 22 |
1 files changed, 13 insertions, 9 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 80881bbce..2ec62fd3f 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt @@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.utils.system.PlatformUtils import net.minecraft.launchwrapper.Launch import net.minecraftforge.fml.common.FMLCommonHandler import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import org.apache.logging.log4j.LogManager import java.io.File import java.util.NavigableMap import java.util.TreeMap @@ -43,7 +44,7 @@ object RepoPatternManager { private val remotePattern: NavigableMap<String, String> get() = TreeMap( if (localLoading) mapOf() - else regexes?.regexes ?: mapOf() + else regexes?.regexes ?: mapOf(), ) /** @@ -79,6 +80,8 @@ object RepoPatternManager { val localLoading: Boolean get() = config.forceLocal.get() || (!insideTest && PlatformUtils.isDevEnvironment) + private val logger = LogManager.getLogger("SkyHanni") + /** * Crash if in a development environment, or if inside a guarded event handler. */ @@ -122,7 +125,7 @@ object RepoPatternManager { " First obtained by ${previousParentOwner.ownerClass} / ${previousParentOwner.property}," + " tried to use at ${owner.ownerClass} / ${owner.property}" + if (parentKeyHolder != null) "with parentKeyHolder ${parentKeyHolder.ownerClass} / ${parentKeyHolder.property}" - else "" + else "", ) } } @@ -141,7 +144,7 @@ object RepoPatternManager { if (!config.tolerateDuplicateUsage) crash( "Non unique access to array regex at \"$key\"." + " First obtained by ${preRegistered.ownerClass} / ${preRegistered.property}," + - " tried to use at ${owner.ownerClass} / ${owner.property}" + " tried to use at ${owner.ownerClass} / ${owner.property}", ) } } @@ -174,6 +177,7 @@ object RepoPatternManager { is RepoPatternListImpl -> loadArrayPatterns(remotePatterns, it) is RepoPatternImpl -> loadStandalonePattern(remotePatterns, it) } + } } @@ -187,7 +191,7 @@ object RepoPatternManager { return } } catch (e: PatternSyntaxException) { - SkyHanniMod.logger.error("Error while loading pattern from repo", e) + logger.error("Error while loading pattern from repo", e) } it.value = Pattern.compile(it.defaultPattern) it.isLoadedRemotely = false @@ -210,7 +214,7 @@ object RepoPatternManager { } if (patternMap.mapTo(mutableSetOf()) { it.first } != patternMap.indices.toSet()) { - SkyHanniMod.logger.error("Incorrect index set for $arrayPattern") + logger.error("Incorrect index set for $arrayPattern") setDefaultPatterns() } @@ -221,7 +225,7 @@ object RepoPatternManager { arrayPattern.wasOverridden = patternStrings != arrayPattern.defaultPattern return } catch (e: PatternSyntaxException) { - SkyHanniMod.logger.error("Error while loading pattern from repo", e) + logger.error("Error while loading pattern from repo", e) } setDefaultPatterns() } @@ -243,8 +247,8 @@ object RepoPatternManager { ConfigManager.gson.toJson( RepoPatternDump( sourceLabel, - usedKeys.values.flatMap { it.dump().toList() }.toMap() - ) + usedKeys.values.flatMap { it.dump().toList() }.toMap(), + ), ) file.parentFile.mkdirs() file.writeText(data) @@ -258,7 +262,7 @@ object RepoPatternManager { val (sourceLabel, path) = dumpDirective.split(":", limit = 2) dump(sourceLabel, File(path)) if (System.getenv("SKYHANNI_DUMP_REGEXES_EXIT") != null) { - SkyHanniMod.logger.info("Exiting after dumping RepoPattern regex patterns to $path") + logger.info("Exiting after dumping RepoPattern regex patterns to $path") FMLCommonHandler.instance().exitJava(0, false) } } |