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. --- src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data') diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt index ee6899340..ddb5943a0 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt @@ -16,16 +16,14 @@ import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull import at.hannibal2.skyhanni.utils.NEUItems.getPrice import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.RecalculatingValue -import com.google.common.cache.CacheBuilder +import at.hannibal2.skyhanni.utils.TimeLimitedCache import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import java.util.concurrent.TimeUnit +import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds object SlayerAPI { - private var nameCache = - CacheBuilder.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES) - .build, Pair>() + private var nameCache = TimeLimitedCache, Pair>(1.minutes) var questStartTime = 0L var isInCorrectArea = false @@ -43,7 +41,7 @@ object SlayerAPI { fun getItemNameAndPrice(internalName: NEUInternalName, amount: Int): Pair { val key = internalName to amount - nameCache.getIfPresent(key)?.let { + nameCache.getOrNull(key)?.let { return it } -- cgit