From d6562f8d5cb5b5917ba027daa16497901cc583d9 Mon Sep 17 00:00:00 2001 From: Fix3dll Date: Tue, 22 Feb 2022 22:16:29 +0300 Subject: more reliable filters and organise unnecessary query --- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java index 2d1e5f26..c25c91b5 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -208,23 +208,28 @@ public class PriceInfoTooltip { } } - public static boolean firstRun = true; + public static int minute = 0; public static void init() { skyblocker.scheduler.scheduleCyclic(() -> { { - if (SkyblockerConfig.get().general.itemTooltip.enableAvgBIN || firstRun) + if ((SkyblockerConfig.get().general.itemTooltip.enableAvgBIN || minute == 0) && (avgPricesJson == null || minute % 5 == 0)) { CompletableFuture.runAsync(PriceInfoTooltip::downloadAvgPrices); - if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN || firstRun) + } + if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN || minute == 0) { CompletableFuture.runAsync(PriceInfoTooltip::downloadLowestPrices); - if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice || firstRun) + } + if ((SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice || minute == 0) && minute % 3 == 0) { CompletableFuture.runAsync(PriceInfoTooltip::downloadBazaarPrices); - if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice || firstRun) + } + if ((SkyblockerConfig.get().general.itemTooltip.enableNPCPrice || minute == 0) && npcPricesJson == null) { CompletableFuture.runAsync(PriceInfoTooltip::downloadNPCPrices); - if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate || firstRun) + } + if ((SkyblockerConfig.get().general.itemTooltip.enableMuseumDate || minute == 0) && isMuseumJson == null) { CompletableFuture.runAsync(PriceInfoTooltip::downloadIsMuseum); + } + minute++; } }, 1200); - firstRun = false; } private static void downloadAvgPrices() { -- cgit