feat: add lowest bin prices, gzip support, petSoulbound field to PetInfo, and bold price lines

Author: Fix3dll

src/main/java/com/fix3dll/skyblockaddons/SkyblockAddons.java

@@ -65,6 +65,7 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.EnumMap;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -141,6 +142,7 @@ public class SkyblockAddons implements ClientModInitializer {
 	@Setter private MayorJerryData mayorJerryData;
 	@Setter private BazaarData bazaarData = new BazaarData();
 	@Setter private ItemsData itemsData = new ItemsData();
+	@Setter private Map<String, Double> lowestBinData = Map.of();
 
 	public SkyblockAddons() {
 		instance = this;

src/main/java/com/fix3dll/skyblockaddons/core/PetInfo.java

@@ -34,9 +34,12 @@ public class PetInfo {
     private boolean hideRightClick;
     @SerializedName("noMove")
     private boolean noMove;
+    @SerializedName("petSoulbound")
+    private boolean petSoulbound;
 
     public boolean equals(PetInfo other) {
         if (other == null) return false;
+        if (this.petSoulbound != other.petSoulbound) return false;
         if (this.active != other.active) return false;
         if (!Objects.equals(this.petSkyblockId, other.petSkyblockId)) return false;
         if (this.petRarity != other.petRarity) return false;
@@ -47,4 +50,5 @@ public boolean equals(PetInfo other) {
 
         return Objects.equals(this.uniqueId, other.uniqueId); // the last castle
     }
-}
+
+}

src/main/java/com/fix3dll/skyblockaddons/core/feature/FeatureSetting.java

@@ -140,10 +140,13 @@ public enum FeatureSetting {
     BIGGER_WAKE("settings.coloredFishingParticles.biggerWake", Feature.COLORED_FISHING_PARTICLES),
     SHOW_ONLY_WHEN_SCORPIUS_IS_MAYOR("settings.showOnlyWhenScorpiusIsMayor", Feature.DARK_AUCTION_TIMER),
     ALLOW_CHAT_MESSAGE_COPYING_OUTSIDE_SKYBLOCK("settings.allowChatMessageCopyingOutsideSkyblock", Feature.CHAT_MESSAGE_COPYING),
+    BOLD_PRICE_LINES("settings.itemPricesInTooltip.boldPriceLines", Feature.ITEM_PRICES_IN_TOOLTIP),
+    ALWAYS_SHOW_BULK_PRICE("settings.itemPricesInTooltip.alwaysShowBulkPrice", Feature.ITEM_PRICES_IN_TOOLTIP),
     NPC_SELL_PRICES_IN_TOOLTIP("settings.itemPricesInTooltip.npcSellPrices", Feature.ITEM_PRICES_IN_TOOLTIP),
+    LOWEST_BIN_PRICES_IN_TOOLTIP("settings.itemPricesInTooltip.lowestBinPrices", Feature.ITEM_PRICES_IN_TOOLTIP),
     BAZAAR_PRICES_IN_TOOLTIP("settings.itemPricesInTooltip.bazaarPrices", Feature.ITEM_PRICES_IN_TOOLTIP),
-    ALWAYS_SHOW_BULK_PRICE("settings.itemPricesInTooltip.alwaysShowBulkPrice", Feature.ITEM_PRICES_IN_TOOLTIP),
-    BAZAAR_PRICES_UPDATE_INTERVAL("settings.itemPricesInTooltip.updateInterval", Feature.ITEM_PRICES_IN_TOOLTIP),
+    LOWEST_BIN_PRICES_UPDATE_INTERVAL("settings.itemPricesInTooltip.lowestBinUpdateInterval", Feature.ITEM_PRICES_IN_TOOLTIP),
+    BAZAAR_PRICES_UPDATE_INTERVAL("settings.itemPricesInTooltip.bazaarUpdateInterval", Feature.ITEM_PRICES_IN_TOOLTIP),
 
 
     DISCORD_RP_DETAILS("messages.firstStatus", Feature.DISCORD_RPC),

src/main/java/com/fix3dll/skyblockaddons/gui/screens/SettingsGui.java

@@ -396,10 +396,10 @@ private void addButton(FeatureSetting setting, Object settingValue) {
                 break;
 
             case BAZAAR_PRICES_UPDATE_INTERVAL:
-                boxWidth = 120;
+                boxWidth = 150;
                 x = halfWidth - (boxWidth / 2);
                 y = getRowHeightSetting(row);
-                addRenderableWidget(new ButtonText(halfWidth, (int) y - 10, Translations.getMessage("settings.itemPricesInTooltip.updateInterval"), true, ColorCode.GRAY.getColor()));
+                addRenderableWidget(new ButtonText(halfWidth, (int) y - 10, Translations.getMessage("settings.itemPricesInTooltip.bazaarUpdateInterval"), true, ColorCode.GRAY.getColor()));
                 row += .1F;
                 y = getRowHeightSetting(row);
                 addRenderableWidget(
@@ -412,6 +412,23 @@ private void addButton(FeatureSetting setting, Object settingValue) {
                 row += .1F;
                 break;
 
+            case LOWEST_BIN_PRICES_UPDATE_INTERVAL:
+                boxWidth = 150;
+                x = halfWidth - (boxWidth / 2);
+                y = getRowHeightSetting(row);
+                addRenderableWidget(new ButtonText(halfWidth, (int) y - 10, Translations.getMessage("settings.itemPricesInTooltip.lowestBinUpdateInterval"), true, ColorCode.GRAY.getColor()));
+                row += .1F;
+                y = getRowHeightSetting(row);
+                addRenderableWidget(
+                        new ButtonSlider(
+                                x, y, boxWidth, 20,
+                                feature.getAsNumber(setting).floatValue(), 60.0F, 300.0F, 1.0F,
+                                updatedValue -> feature.set(setting, updatedValue)
+                        ).setSuffix(" seconds")
+                );
+                row += .1F;
+                break;
+
             default:
                 if (setting.isUniversal()) return; // see addUniversalButton()
 

src/main/java/com/fix3dll/skyblockaddons/listeners/NetworkListener.java

@@ -13,6 +13,7 @@
 import com.fix3dll.skyblockaddons.utils.Utils;
 import com.fix3dll.skyblockaddons.utils.data.DataUtils;
 import com.fix3dll.skyblockaddons.utils.data.requests.BazaarRequest;
+import com.fix3dll.skyblockaddons.utils.data.requests.LowestBinRequest;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import io.netty.channel.ChannelHandlerContext;
@@ -59,6 +60,7 @@ private void onSkyblockJoined() {
         );
 
         DataUtils.loadOnlineData(new BazaarRequest());
+        DataUtils.loadOnlineData(new LowestBinRequest());
         DataUtils.onSkyblockJoined();
     }
 
@@ -74,6 +76,7 @@ private void onSkyblockLeft() {
             updateHealth = null;
         }
         BazaarRequest.cancelUpdateTask();
+        LowestBinRequest.cancelUpdateTask();
     }
 
     private void onPacketRead(ChannelHandlerContext channelHandlerContext, Packet<?> packet) {

src/main/java/com/fix3dll/skyblockaddons/listeners/PlayerListener.java

@@ -6,11 +6,13 @@
 import com.fix3dll.skyblockaddons.core.InventoryType;
 import com.fix3dll.skyblockaddons.core.Island;
 import com.fix3dll.skyblockaddons.core.ItemType;
+import com.fix3dll.skyblockaddons.core.PetInfo;
 import com.fix3dll.skyblockaddons.core.PlayerStat;
 import com.fix3dll.skyblockaddons.core.SkillType;
 import com.fix3dll.skyblockaddons.core.SkyblockKeyBinding;
 import com.fix3dll.skyblockaddons.core.SkyblockOre;
 import com.fix3dll.skyblockaddons.core.SkyblockRarity;
+import com.fix3dll.skyblockaddons.core.SkyblockRune;
 import com.fix3dll.skyblockaddons.core.Translations;
 import com.fix3dll.skyblockaddons.core.feature.Feature;
 import com.fix3dll.skyblockaddons.core.feature.FeatureSetting;
@@ -1302,12 +1304,16 @@ private void flyingCheck() {
      *
      * <p>Depending on the enabled {@link FeatureSetting settings}, the following lines may be added:
      * <ul>
+     *   <li><b>Lowest BIN prices</b> - from <a href="https://moulberry.codes">moulberry.codes</a></li>
      *   <li><b>Bazaar buy/sell prices</b> — resolved via the Hypixel Bazaar API.
      *       Enchanted books are looked up by their enchantment ID
      *       (e.g. {@code ENCHANTMENT_SHARPNESS_5}) rather than {@code ENCHANTED_BOOK}.</li>
      *   <li><b>NPC sell price</b> — resolved from the SkyBlock items API.</li>
      * </ul>
      *
+     * <p>Special item types (PET, RUNE, NEW_YEAR_CAKE, POTION, perfect stat boost items)
+     * are resolved to their API-specific item IDs before lookup.
+     *
      * <p>If {@link FeatureSetting#ALWAYS_SHOW_BULK_PRICE} is disabled and
      * {@code LEFT SHIFT} is not held, prices are shown for a single item.
      * When the stack count is greater than one and shift is held, prices are
@@ -1334,15 +1340,106 @@ private void addItemPricesToTooltip(String itemId,
                                         TooltipFlag tooltipFlag,
                                         List<Component> components) {
         Feature feature = Feature.ITEM_PRICES_IN_TOOLTIP;
+        boolean boldLines = feature.isEnabled(FeatureSetting.BOLD_PRICE_LINES);
         UnaryOperator<Style> textColor = style -> feature.isChroma()
-                ? style.withColor(DrawUtils.CHROMA_TEXT_COLOR) // TextColor
-                : style.withColor(feature.getColor());         // int
+                ? style.withBold(boldLines).withColor(DrawUtils.CHROMA_TEXT_COLOR) // TextColor
+                : style.withBold(boldLines).withColor(feature.getColor());         // int
         boolean lshift = feature.isEnabled(FeatureSetting.ALWAYS_SHOW_BULK_PRICE)
                 || InputConstants.isKeyDown(MC.getWindow(), GLFW.GLFW_KEY_LEFT_SHIFT);
         int count = itemStack.getCount();
         int countToBeShown = lshift ? count : 1;
 
         int addedLines = 0;
+
+        if (feature.isEnabled(FeatureSetting.LOWEST_BIN_PRICES_IN_TOOLTIP)) {
+            if (itemId == null) itemId = ItemUtils.getSkyblockItemID(itemStack);
+
+            String apiItemId = itemId;
+            String extraString = null;
+            switch (apiItemId) {
+                case "PET" -> {
+                    PetManager.Pet pet = PetManager.getInstance().getPetFromItemStack(itemStack);
+
+                    if (pet != null) {
+                        PetInfo petInfo = pet.getPetInfo();
+
+                        if (petInfo != null) {
+                            apiItemId = petInfo.getPetSkyblockId() + ";" + petInfo.getPetRarity().ordinal();
+
+                            int petLevel = pet.getPetLevel();
+                            if (petLevel != 0 && pet.getPetLevel() % 100 == 0) {
+                                extraString = "+" + petLevel;
+                                apiItemId += extraString;
+                            }
+                        }
+                    }
+                }
+                case "RUNE" -> {
+                    CompoundTag extraAttributes = ItemUtils.getExtraAttributes(itemStack);
+
+                    if (extraAttributes != null) {
+                        SkyblockRune rune = ItemUtils.getRuneData(extraAttributes);
+
+                        if (rune != null) {
+                            apiItemId = rune.getType() + "_RUNE;" + rune.getLevel();
+                        }
+                    }
+                }
+                case "NEW_YEAR_CAKE" -> {
+                    CompoundTag extraAttributes = ItemUtils.getExtraAttributes(itemStack);
+
+                    if (extraAttributes != null) {
+                        int cakeYears = extraAttributes.getIntOr("new_years_cake", -1);
+
+                        if (cakeYears != -1) {
+                            apiItemId += "+" + cakeYears;
+                        }
+                    }
+                }
+                case "POTION" -> {
+                    CompoundTag extraAttributes = ItemUtils.getExtraAttributes(itemStack);
+
+                    if (extraAttributes != null) {
+                        String potion = extraAttributes.getStringOr("potion", "");
+                        int potionLevel = extraAttributes.getIntOr("potion_level", -1);
+
+                        if (!potion.isEmpty() && potionLevel != -1) {
+                            apiItemId += "_" + potion.toUpperCase(Locale.ENGLISH) + ";" + potionLevel;
+                        }
+                    }
+                }
+                case null -> {
+                    return;
+                }
+                default -> {
+                    CompoundTag extraAttributes = ItemUtils.getExtraAttributes(itemStack);
+
+                    if (extraAttributes != null) {
+                        int baseStatBoost = extraAttributes.getIntOr("baseStatBoostPercentage", -1);
+
+                        if (baseStatBoost == 50) {
+                            extraString = "+PERFECT";
+                            apiItemId += extraString;
+                        }
+                    }
+                }
+            }
+
+            double lowestBinPrice = main.getLowestBinData().getOrDefault(apiItemId, -1.0D);
+            if (extraString != null && lowestBinPrice == -1.0D) {
+                lowestBinPrice = main.getLowestBinData().getOrDefault(
+                        apiItemId.replace(extraString, ""), -1.0D
+                );
+            }
+
+            if (lowestBinPrice > 0.0D) {
+                Component priceComponent = TextUtils.formatPrice(lowestBinPrice, 0, boldLines);
+
+                components.add(Component.literal(Translations.getMessage("tooltip.lowestBinPrice"))
+                        .withStyle(textColor).append(priceComponent));
+            }
+        }
+
         if (feature.isEnabled(FeatureSetting.BAZAAR_PRICES_IN_TOOLTIP)) {
             if (itemId == null) itemId = ItemUtils.getSkyblockItemID(itemStack);
 
@@ -1360,8 +1457,8 @@ private void addItemPricesToTooltip(String itemId,
                 BazaarData.Product product = main.getBazaarData().getProducts().get(apiItemId);
 
                 if (product != null) {
-                    Component buyPrice = TextUtils.formatPrice(product.getInstaBuyPrice() * countToBeShown);
-                    Component sellPrice = TextUtils.formatPrice(product.getInstaSellPrice() * countToBeShown);
+                    Component buyPrice = TextUtils.formatPrice(product.getInstaBuyPrice() * countToBeShown, 1, boldLines);
+                    Component sellPrice = TextUtils.formatPrice(product.getInstaSellPrice() * countToBeShown, 1, boldLines);
 
                     components.add(Component.literal(Translations.getMessage("tooltip.buyPrice"))
                             .withStyle(textColor).append(buyPrice));
@@ -1379,7 +1476,8 @@ private void addItemPricesToTooltip(String itemId,
                 ItemsData.Item item = main.getItemsData().getItemMap().get(itemId);
 
                 if (item != null && item.getNpcSellPrice() != 0.0D) {
-                    Component npcSellPrice = TextUtils.formatPrice(item.getNpcSellPrice() * countToBeShown);
+                    double price = item.getNpcSellPrice() * countToBeShown;
+                    Component npcSellPrice = TextUtils.formatPrice(price, price <= 10.0D ? 2 : 0, boldLines);
 
                     components.add(Component.literal(Translations.getMessage("tooltip.npcSellPrice"))
                             .withStyle(textColor).append(npcSellPrice));

src/main/java/com/fix3dll/skyblockaddons/utils/TextUtils.java

@@ -52,7 +52,7 @@ public class TextUtils {
      * style
      */
     public static final NumberFormat NUMBER_FORMAT_NO_GROUPING = NumberFormat.getInstance(Locale.US);
-    public static final NumberFormat COIN_FORMAT = NumberFormat.getInstance(Locale.US);
+    private static final NumberFormat[] COIN_FORMATS = new NumberFormat[6]; // 0-5
 
     private static final Pattern STRIP_COLOR_PATTERN = Pattern.compile("(?i)§[0-9A-FK-ORZ]");
     private static final Pattern STRIP_ICONS_PATTERN = Pattern.compile("\\[✌]|[♲Ⓑ⚒ቾ]+");
@@ -79,8 +79,11 @@ public class TextUtils {
         NUMBER_FORMAT.setMaximumFractionDigits(2);
         NUMBER_FORMAT_NO_GROUPING.setMaximumFractionDigits(2);
         NUMBER_FORMAT_NO_GROUPING.setGroupingUsed(false);
-        COIN_FORMAT.setMaximumFractionDigits(1);
-        COIN_FORMAT.setMinimumFractionDigits(1);
+        for (int i = 0; i < COIN_FORMATS.length; i++) {
+            COIN_FORMATS[i] = NumberFormat.getInstance(Locale.US);
+            COIN_FORMATS[i].setMaximumFractionDigits(i);
+            COIN_FORMATS[i].setMinimumFractionDigits(i);
+        }
     }
 
     /** For test environment */
@@ -106,22 +109,31 @@ public static String formatNumber(Number number) {
     }
 
     /**
-     * Formats a coin value with US thousands separator and one decimal place,
-     * e.g. {@code 123456.0} → {@code "123,456.0"}.
+     * Formats a coin value with US thousands separator and the given number of decimal places,
+     * e.g. {@code formatCoin(123456.0, 1)} → {@code "123,456.0"}, {@code formatCoin(123456.0, 0)} → {@code "123,456"}.
+     * Supports 0–5 decimal places.
+     * @param number the coin value to format
+     * @param decimals the number of decimal places (0–5)
+     * @return formatted coin string
      * @since 2.2.3
      */
-    public static String formatCoin(Number number) {
-        return COIN_FORMAT.format(number);
+    public static String formatCoin(Number number, int decimals) {
+        return COIN_FORMATS[decimals].format(number);
     }
 
     /**
-     * Returns a yellow formatted coin value, or a red localized {@code "None"} if the price is {@code -1}.
+     * Returns a gold formatted coin value, or a red localized {@code "None"} if the price is negative.
+     * @param price the coin value to format
+     * @param decimal the number of decimal places (0–5), passed to {@link #formatCoin(Number, int)}
+     * @return a gold {@link Component} with the formatted price, or a red {@link Component} with {@code "None"}
      * @since 2.2.3
      */
-    public static Component formatPrice(double price) {
-        return price < 0
-                ? Component.literal(Translations.getMessage("tooltip.none")).withColor(ColorCode.RED.getColor())
-                : Component.literal(TextUtils.formatCoin(price)).withColor(ColorCode.GOLD.getColor());
+    public static Component formatPrice(double price, int decimal, boolean bold) {
+        return price < 0.0D
+                ? Component.literal(Translations.getMessage("tooltip.none"))
+                .withStyle(style -> style.withBold(bold).withColor(ColorCode.RED.getColor()))
+                : Component.literal(TextUtils.formatCoin(price, decimal) + " coins")
+                .withStyle(style -> style.withBold(bold).withColor(ColorCode.GOLD.getColor()));
     }
 
     /**