From 1c2af56c0d14b7d91ea222e0fab222fccccb4513 Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 30 Aug 2021 11:22:10 +0200 Subject: Check if String has non-whitespace characters more directly --- src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java index 198e91bc..00f400ec 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java @@ -8,6 +8,7 @@ import net.minecraft.text.Text; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.regex.Pattern; public class ItemUtils { @@ -18,16 +19,18 @@ public class ItemUtils { return Collections.emptyList(); } + private final static Pattern WHITESPACES = Pattern.compile("^\\s*$"); + public static List getTooltipStrings(ItemStack item) { List lines = getTooltip(item); List list = new ArrayList<>(); for (Text line : lines) { String string = line.getString(); - if (!string.replaceAll("\\s+","").isEmpty()) + if (!WHITESPACES.matcher(string).matches()) list.add(string); } return list; } -} \ No newline at end of file +} -- cgit From e64cdeba8f9b738cdc822a89b04a39508093f6ee Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 30 Aug 2021 11:29:46 +0200 Subject: Moved null check before the variable is first used --- .../xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 ff02c675..30e19c0f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -41,14 +41,11 @@ public class PriceInfoTooltip { String name = getInternalNameForItem(stack); try { - if(!list.toString().contains("Avg. BIN Price") && prices.has(name) ){ - if(prices != null){ - - JsonElement getPrice = prices.get(name); - String price = round(getPrice.getAsDouble(), 2); - - list.add(new LiteralText("Avg. BIN Price: ").formatted(Formatting.GOLD).append(new LiteralText(price + " Coins").formatted(Formatting.DARK_AQUA))); - } + if(!list.toString().contains("Avg. BIN Price") && prices != null && prices.has(name) ){ + JsonElement getPrice = prices.get(name); + String price = round(getPrice.getAsDouble(), 2); + + list.add(new LiteralText("Avg. BIN Price: ").formatted(Formatting.GOLD).append(new LiteralText(price + " Coins").formatted(Formatting.DARK_AQUA))); } }catch(Exception e) { MinecraftClient.getInstance().player.sendMessage(new LiteralText(e.toString()), false); -- cgit From 957a088e1928130e28aee8852892aeb9e2a44fc1 Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 30 Aug 2021 11:43:17 +0200 Subject: Changed visibility of internal function to private --- .../java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 30e19c0f..13627403 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -36,7 +36,7 @@ import me.xmrvizzy.skyblocker.SkyblockerMod; public class PriceInfoTooltip { private JsonObject auctionPricesJson = null; private JsonObject bazaarPricesJson = null; - public static JsonObject prices = PriceInfoTooltip.downloadPrices(); + public static JsonObject prices = downloadPrices(); public static void onInjectTooltip(ItemStack stack, TooltipContext context, List list) { String name = getInternalNameForItem(stack); @@ -91,7 +91,7 @@ public class PriceInfoTooltip { return internalname; } - public static JsonObject downloadPrices() { + private static JsonObject downloadPrices() { try { downloadUsingStream("https://moulberry.codes/auction_averages_lbin/3day.json.gz", "3day.json.gz"); decompressGzipFile("3day.json.gz", "3day.json"); -- cgit From 8a1ea9fdabc8f0c4cc3e1e97186674c7b685c55f Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 30 Aug 2021 11:50:35 +0200 Subject: Fixed chat filters not turning off properly --- .../me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java index 99a4f929..f9ed014a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java @@ -56,15 +56,15 @@ public class ChatHudListenerMixin { Puzzler.solve(msg); } - if (SkyblockerConfig.get().messages.hideAbility && + if (SkyblockerConfig.get().messages.hideAbility && ( msg.contains("This ability is currently on cooldown for ") || msg.contains("No more charges, next one in ") || - msg.contains("This ability is on cooldown for ")) + msg.contains("This ability is on cooldown for "))) ci.cancel(); - if (SkyblockerConfig.get().messages.hideHeal && + if (SkyblockerConfig.get().messages.hideHeal && ( msg.contains("You healed ") && - msg.contains(" health!") || msg.contains(" healed you for ")) + msg.contains(" health!") || msg.contains(" healed you for "))) ci.cancel(); if (SkyblockerConfig.get().messages.hideAOTE && @@ -81,4 +81,4 @@ public class ChatHudListenerMixin { } } -} \ No newline at end of file +} -- cgit From 86b68d408a60ce31289129cb4730aba97982a1ec Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 30 Aug 2021 12:02:44 +0200 Subject: Deleted empty files --- src/main/java/me/xmrvizzy/skyblocker/skyblock/api/AuctionAPI.java | 5 ----- .../me/xmrvizzy/skyblocker/skyblock/dungeon/DemoBlockEntity.java | 0 src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/HitResult.java | 0 3 files changed, 5 deletions(-) delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/AuctionAPI.java delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DemoBlockEntity.java delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/HitResult.java diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/AuctionAPI.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/AuctionAPI.java deleted file mode 100644 index 1ca45b74..00000000 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/AuctionAPI.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.xmrvizzy.skyblocker.skyblock.api; - -public class AuctionAPI { - -} \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DemoBlockEntity.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DemoBlockEntity.java deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/HitResult.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/HitResult.java deleted file mode 100644 index e69de29b..00000000 -- cgit