From 680b20370ad4563f202a08eae5713d0d1d7f9078 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 20 Jan 2024 20:21:00 +0100 Subject: creating and using TimeLimitedCache and TimeLimitedSet instead of guava cache. --- .../at/hannibal2/skyhanni/test/command/ErrorManager.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/test/command') diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt index eaeed6aba..092800c10 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt @@ -5,20 +5,19 @@ import at.hannibal2.skyhanni.utils.KeyboardManager import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.OSUtils import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import com.google.common.cache.CacheBuilder +import at.hannibal2.skyhanni.utils.TimeLimitedSet import net.minecraft.client.Minecraft import java.util.UUID -import java.util.concurrent.TimeUnit +import kotlin.time.Duration.Companion.minutes object ErrorManager { // random id -> error message private val errorMessages = mutableMapOf() private val fullErrorMessages = mutableMapOf() - private var cache = - CacheBuilder.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES).build, Unit>() + private var cache = TimeLimitedSet>(10.minutes) fun resetCache() { - cache.asMap().clear() + cache.clear() } fun skyHanniError(message: String): Nothing { @@ -77,10 +76,10 @@ object ErrorManager { if (!ignoreErrorCache) { val pair = if (throwable.stackTrace.isNotEmpty()) { - throwable.stackTrace[0].let { it.fileName to it.lineNumber } + throwable.stackTrace[0].let { it.fileName!! to it.lineNumber } } else message to 0 - if (cache.getIfPresent(pair) != null) return - cache.put(pair, Unit) + if (cache.contains(pair)) return + cache.add(pair) } val fullStackTrace = throwable.getCustomStackTrace(true).joinToString("\n") -- cgit