Merge branch 'master' into price-download-rewrite

6 files changed, 17 insertions, 21 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
+}
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
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DemoBlockEntity.java
+++ /dev/null
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
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/HitResult.java
+++ /dev/null
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 d5301167..59ff2e45 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -30,19 +30,16 @@ 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<Text> list) {
         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);
@@ -88,6 +85,7 @@ public class PriceInfoTooltip {
         return internalname;
     }
 
+
     public static JsonObject downloadPrices() {
         JsonObject result = null;
         try {
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<String> getTooltipStrings(ItemStack item) {
         List<Text> lines = getTooltip(item);
         List<String> 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
+}