diff options
| author | Fix3dll <serhanduzce@gmail.com> | 2022-02-22 22:16:29 +0300 |
|---|---|---|
| committer | Fix3dll <serhanduzce@gmail.com> | 2022-02-22 22:16:29 +0300 |
| commit | d6562f8d5cb5b5917ba027daa16497901cc583d9 (patch) | |
| tree | 2f394c299dcf5cf091d07a4e74fbc8165b20d08d /src/main/java/me/xmrvizzy | |
| parent | 502240b2783f9cb3948e4a3373e998d7b526b25a (diff) | |
| download | Skyblocker-d6562f8d5cb5b5917ba027daa16497901cc583d9.tar.gz Skyblocker-d6562f8d5cb5b5917ba027daa16497901cc583d9.tar.bz2 Skyblocker-d6562f8d5cb5b5917ba027daa16497901cc583d9.zip | |
more reliable filters and organise unnecessary query
Diffstat (limited to 'src/main/java/me/xmrvizzy')
3 files changed, 16 insertions, 9 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java index 718dda11..c09cb69c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java @@ -4,7 +4,8 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig; public class ComboFilter extends ChatFilter { public ComboFilter() { - super("^.*Kill Combo (\\+|has expired!).*$"); + super("^(\\+\\d+ Kill Combo \\+\\d+(% ✯ Magic Find| coins per kill)" + + "|Your Kill Combo has expired! You reached a \\d+ Kill Combo!)$"); } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java index 1515613a..2913d2bb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java @@ -4,7 +4,8 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig; public class TeleportPadFilter extends ChatFilter { public TeleportPadFilter() { - super("^.*Teleport Pad (does not have a destination set!|to the).*$"); + super("^(Warped from the .* Teleport Pad to the .* Teleport Pad!" + + "|This Teleport Pad does not have a destination set!)$"); } @Override 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() { |