diff options
Diffstat (limited to 'src/main/java/de')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java | 10 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java index c3bd887c..ec03de12 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java @@ -7,6 +7,7 @@ import de.hysky.skyblocker.skyblock.item.tooltip.info.DataTooltipInfoType; import de.hysky.skyblocker.skyblock.item.tooltip.info.TooltipInfoType; import de.hysky.skyblocker.skyblock.itemlist.ItemRepository; import de.hysky.skyblocker.utils.Constants; +import de.hysky.skyblocker.utils.ItemUtils; import de.hysky.skyblocker.utils.scheduler.MessageScheduler; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.network.ClientPlayerEntity; @@ -15,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -import org.apache.commons.text.WordUtils; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; @@ -68,18 +68,20 @@ public class ItemPrice { // Handle Enchanted Books if (itemName.equals("Enchanted Book")) { - itemName = WordUtils.capitalizeFully(skyblockApiId.replace("ENCHANTMENT_", "").replaceAll("_\\d+", "")); + itemName = ItemUtils.getLore(stack).stream().findFirst().orElse(Text.empty()).getString(); } // Search up the item in the bazaar or auction house if (TooltipInfoType.BAZAAR.hasOrNullWarning(skyblockApiId)) { MessageScheduler.INSTANCE.sendMessageAfterCooldown("/bz " + itemName, true); + return; } else if (TooltipInfoType.LOWEST_BINS.hasOrNullWarning(skyblockApiId)) { MessageScheduler.INSTANCE.sendMessageAfterCooldown("/ahsearch " + itemName, true); + return; } - } else { - player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.config.helpers.itemPrice.itemPriceLookupFailed")), false); } + + player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.config.helpers.itemPrice.itemPriceLookupFailed")), false); } public static void refreshItemPrices(ClientPlayerEntity player) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java index f304d03f..07c56525 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java @@ -12,6 +12,7 @@ import io.github.moulberry.repo.data.NEUItem; import io.github.moulberry.repo.data.NEURecipe; import io.github.moulberry.repo.util.NEUId; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,6 +67,10 @@ public class ItemRepository { ItemStack stack = ItemStackBuilder.fromNEUItem(item); StackOverlays.applyOverlay(item, stack); + if (stack.isOf(Items.ENCHANTED_BOOK) && ItemUtils.getItemId(stack).contains(";")) { + ItemUtils.getCustomData(stack).putString("id", "ENCHANTED_BOOK"); + } + items.add(stack); itemsMap.put(item.getSkyblockItemId(), stack); } catch (Exception e) { |