creating and using TimeLimitedCache and TimeLimitedSet instead of guava cache.

1 files changed, 7 insertions, 8 deletions

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<String, String>()
     private val fullErrorMessages = mutableMapOf<String, String>()
-    private var cache =
-        CacheBuilder.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES).build<Pair<String, Int>, Unit>()
+    private var cache = TimeLimitedSet<Pair<String, Int>>(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")