diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java | 13 | ||||
| -rw-r--r-- | src/main/resources/assets/skyblocker/lang/en_us.json | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java index ddbe7620..bcad179e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java @@ -7,6 +7,8 @@ import de.hysky.skyblocker.skyblock.item.slottext.SlotText; import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip; import de.hysky.skyblocker.skyblock.item.tooltip.info.DataTooltipInfoType; import de.hysky.skyblocker.skyblock.item.tooltip.info.TooltipInfoType; +import de.hysky.skyblocker.skyblock.item.tooltip.adders.BazaarPriceTooltip; +import de.hysky.skyblocker.skyblock.item.tooltip.adders.LBinTooltip; import de.hysky.skyblocker.skyblock.itemlist.ItemRepository; import de.hysky.skyblocker.utils.Constants; import de.hysky.skyblocker.utils.ItemUtils; @@ -106,10 +108,17 @@ public class BazaarHelper extends SimpleSlotTextAdder { // ======== Other Bazaar Features ======== + // TODO: Come up with another name? due to supporting AH searching + // TODO: Add Cookie Buff reqirement somewhere in the config screen? public static void bazaarLookup(ClientPlayerEntity player, @NotNull Slot slot) { - ItemStack stack = ItemRepository.getItemStack(slot.getStack().getNeuName()); + ItemStack stack = ItemRepository.getItemStack(slot.getStack().getNeuName()); if (stack != null && !stack.isEmpty()) { - MessageScheduler.INSTANCE.sendMessageAfterCooldown("/bz " + Formatting.strip(stack.getName().getString())); + String itemName = Formatting.strip(stack.getName().getString()); + if (BazaarPriceTooltip.bazaarExist) { + MessageScheduler.INSTANCE.sendMessageAfterCooldown("/bz " + itemName); + } else if (LBinTooltip.lbinExist) { + MessageScheduler.INSTANCE.sendMessageAfterCooldown("/ahsearch " + itemName); + } } else { player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.config.helpers.bazaar.bazaarLookupFailed"))); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b0537af0..d45c0625 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -340,7 +340,7 @@ "skyblocker.config.helpers.bazaar.enableBazaarHelper.@Tooltip": "Draws icons on top of orders to explain the current state of the order.\n\n%s: Order is going to expire soon\n%s: Order has expired\n%s: Order is filled to some degree and there are items/coins to claim\n%s: Order is filled", "skyblocker.config.helpers.bazaar.enableBazaarLookup": "Enable Bazaar Lookup", "skyblocker.config.helpers.bazaar.enableBazaarLookup.@Tooltip": "Searches the Bazaar for the current hovered item with the F6 key.", - "skyblocker.config.helpers.bazaar.bazaarLookupFailed": "Failed to find item in the Bazaar", + "skyblocker.config.helpers.bazaar.bazaarLookupFailed": "Failed to find item in the Bazaar / Auction House", "skyblocker.config.helpers.bazaar.enableRefreshItemPrices": "Enable Bazaar Refresh", "skyblocker.config.helpers.bazaar.enableRefreshItemPrices.@Tooltip": "Refresh the Bazaar prices with the Z key.", "skyblocker.config.helpers.bazaar.refreshingItemPrices": "Refreshing Item Prices...", |