diff options
Diffstat (limited to 'src/main/java/de/hysky')
4 files changed, 191 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 7c80215c..6411d6e4 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -175,6 +175,9 @@ public class SkyblockerConfig { public boolean dontStripSkinAlphaValues = true; @SerialEntry + public boolean visitorHelper = true; + + @SerialEntry public TabHudConf tabHud = new TabHudConf(); @SerialEntry diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index 808b3c2c..bb2fdee5 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -78,6 +78,13 @@ public class GeneralCategory { .controller(ConfigUtils::createBooleanController) .flag(OptionFlag.ASSET_RELOAD) .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.visitorHelper")) + .binding(defaults.general.visitorHelper, + () -> config.general.visitorHelper, + newValue -> config.general.visitorHelper = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) //Tab Hud .group(OptionGroup.createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java index 71203381..8a1af570 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java @@ -7,6 +7,7 @@ import de.hysky.skyblocker.skyblock.experiment.ChronomatronSolver; import de.hysky.skyblocker.skyblock.experiment.ExperimentSolver; import de.hysky.skyblocker.skyblock.experiment.SuperpairsSolver; import de.hysky.skyblocker.skyblock.experiment.UltrasequencerSolver; +import de.hysky.skyblocker.skyblock.garden.VisitorHelper; import de.hysky.skyblocker.skyblock.item.ItemProtection; import de.hysky.skyblocker.skyblock.item.ItemRarityBackgrounds; import de.hysky.skyblocker.skyblock.item.WikiLookup; @@ -37,7 +38,6 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyVariable; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -71,6 +71,20 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen } } + @Inject(at = @At("RETURN"), method = "render") + public void skyblocker$renderScreen(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { + if (!Utils.isOnSkyblock()) return; + + if (SkyblockerConfigManager.get().general.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar"))) + VisitorHelper.renderScreen(this.getTitle().getString(), context, textRenderer, handler, mouseX, mouseY); + } + + @Inject(at = @At("HEAD"), method = "mouseClicked") + public void skyblocker$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) { + if (SkyblockerConfigManager.get().general.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar"))) + VisitorHelper.onMouseClicked(mouseX, mouseY, button, this.textRenderer); + } + @SuppressWarnings("DataFlowIssue") // makes intellij be quiet about this.focusedSlot maybe being null. It's already null checked in mixined method. @Inject(method = "drawMouseoverTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;II)V"), cancellable = true) @@ -167,8 +181,11 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen if (ItemProtection.isItemProtected(stack)) ci.cancel(); } - //Prevent selling to NPC shops + if (this.client != null && this.handler instanceof GenericContainerScreenHandler genericContainerScreenHandler && genericContainerScreenHandler.getRows() == 6) { + VisitorHelper.onSlotClick(slot, slotId, this.getTitle().getString()); + + //Prevent selling to NPC shops ItemStack sellItem = this.handler.slots.get(49).getStack(); if (sellItem.getName().getString().equals("Sell Item") || skyblocker$doesLoreContain(sellItem, this.client, "buyback")) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java new file mode 100644 index 00000000..3c049f69 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java @@ -0,0 +1,162 @@ +package de.hysky.skyblocker.skyblock.garden; + +import de.hysky.skyblocker.skyblock.itemlist.ItemRepository; +import de.hysky.skyblocker.utils.NEURepoManager; +import de.hysky.skyblocker.utils.scheduler.MessageScheduler; +import io.github.moulberry.repo.data.NEUItem; +import it.unimi.dsi.fastutil.objects.Object2IntMap; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; +import net.minecraft.nbt.NbtList; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.text.Text; +import net.minecraft.text.Text.Serialization; +import net.minecraft.util.Formatting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.text.NumberFormat; +import java.util.HashMap; +import java.util.Map; + +//TODO: check inventory items, sum all repeated items into one +public class VisitorHelper { + private static final Logger LOGGER = LoggerFactory.getLogger("Skyblocker Visitor Helper"); + + private static final Map<String, Object2IntMap<String>> itemMap = new HashMap<>(); + private static final Map<String, ItemStack> itemCache = new HashMap<>(); + private static final int TEXT_START_X = 4; + private static final int TEXT_START_Y = 4; + private static final int LINE_SPACING = 3; + + public static void renderScreen(String title, DrawContext context, TextRenderer textRenderer, ScreenHandler handler, int mouseX, int mouseY) { + if (handler.getCursorStack() == ItemStack.EMPTY) + processVisitorItem(title, handler); + drawScreenItems(context, textRenderer, mouseX, mouseY); + } + + public static void onMouseClicked(double mouseX, double mouseY, int mouseButton, TextRenderer textRenderer) { + int yPosition = TEXT_START_Y; + + for (Map.Entry<String, Object2IntMap<String>> visitorEntry : itemMap.entrySet()) { + int textWidth; + int textHeight = textRenderer.fontHeight; + + yPosition += LINE_SPACING + textHeight; + + for (Object2IntMap.Entry<String> itemEntry : visitorEntry.getValue().object2IntEntrySet()) { + String itemText = itemEntry.getKey(); + textWidth = textRenderer.getWidth(itemText); + + if (isMouseOverText(mouseX, mouseY, TEXT_START_X, yPosition, textWidth, textHeight)) { + MessageScheduler.INSTANCE.sendMessageAfterCooldown("/bz " + itemText); + return; + } + yPosition += LINE_SPACING + textHeight; + } + } + } + + public static void onSlotClick(Slot slot, int slotId, String title) { + if (slotId == 29 || slotId == 13) { + itemMap.remove(title); + } + } + + private static void processVisitorItem(String visitorName, ScreenHandler handler) { + ItemStack visitorItem = handler.getSlot(13).getStack(); + if (visitorItem == null || !visitorItem.hasNbt() || !visitorItem.getNbt().asString().contains("Times Visited")) return; + ItemStack acceptButton = handler.getSlot(29).getStack(); + if (acceptButton == null) return; + NbtCompound acceptButtonNbt = acceptButton.getSubNbt("display"); + if (acceptButtonNbt == null || !acceptButtonNbt.contains("Lore", NbtElement.LIST_TYPE)) return; + processLore(visitorName, acceptButtonNbt.getList("Lore", NbtElement.STRING_TYPE)); + } + + private static void processLore(String visitorName, NbtList loreList) { + boolean saveRequiredItems = false; + for (int i = 0; i < loreList.size(); i++) { + String lore = loreList.getString(i); + if (lore.contains("Items Required")) + saveRequiredItems = true; + else if (lore.contains("Rewards")) + break; + else if (saveRequiredItems) + updateItemMap(visitorName, lore); + } + } + + private static void updateItemMap(String visitorName, String lore) { + Text itemText = Serialization.fromJson(lore); + String[] splitItemText = itemText.getString().split(" x"); + String itemName = splitItemText[0].trim(); + if (itemName.isEmpty()) return; + try { + int amount = splitItemText.length == 2 ? NumberFormat.getInstance().parse(splitItemText[1].trim()).intValue() : 1; + Object2IntMap<String> visitorMap = itemMap.getOrDefault(visitorName, new Object2IntOpenHashMap<>()); + visitorMap.putIfAbsent(itemName, amount); + itemMap.putIfAbsent(visitorName, visitorMap); + } catch (Exception e) { + LOGGER.error("[Skyblocker Visitor Helper] Failed to parse item: " + itemText.getString(), e); + } + } + + private static void drawScreenItems(DrawContext context, TextRenderer textRenderer, int mouseX, int mouseY) { + int index = 0; + for (Map.Entry<String, Object2IntMap<String>> visitorEntry : itemMap.entrySet()) { + String visitorName = visitorEntry.getKey(); + drawTextWithOptionalUnderline(context, textRenderer, Text.literal(visitorName), TEXT_START_X, TEXT_START_Y + index * (LINE_SPACING + textRenderer.fontHeight), mouseX, mouseY); + index++; + + for (Object2IntMap.Entry<String> itemEntry : visitorEntry.getValue().object2IntEntrySet()) { + index = drawItemEntryWithHover(context, textRenderer, itemEntry, index, mouseX, mouseY); + } + } + } + + private static int drawItemEntryWithHover(DrawContext context, TextRenderer textRenderer, Map.Entry<String, Integer> itemEntry, int index, int mouseX, int mouseY) { + String itemName = itemEntry.getKey(); + int amount = itemEntry.getValue(); + ItemStack stack = getCachedItem(itemName); + if (stack != null) { + drawItemEntryWithHover(context, textRenderer, stack, amount, index, mouseX, mouseY); + } + return index + 1; + } + + private static ItemStack getCachedItem(String displayName) { + String strippedName = Formatting.strip(displayName); + ItemStack cachedStack = itemCache.get(strippedName); + if (cachedStack != null) return cachedStack; + NEUItem neuItem = NEURepoManager.NEU_REPO.getItems().getItems().values().stream() + .filter(i -> Formatting.strip(i.getDisplayName()).equals(strippedName)) + .findFirst() + .orElse(null); + if (neuItem == null) return null; + ItemStack stack = ItemRepository.getItemStack(neuItem.getSkyblockItemId()); + itemCache.put(strippedName, stack); + return stack; + } + + private static void drawItemEntryWithHover(DrawContext context, TextRenderer textRenderer, ItemStack stack, int amount, int index, int mouseX, int mousseY) { + Text text = Serialization.fromJson(stack.getSubNbt("display").getString("Name")).append(" x" + amount); + drawTextWithOptionalUnderline(context, textRenderer, text, TEXT_START_X + 8, TEXT_START_Y + (index * (LINE_SPACING + textRenderer.fontHeight)), mouseX, mousseY); + context.drawItem(stack, TEXT_START_X + 10 + textRenderer.getWidth(text), TEXT_START_Y + (index * (LINE_SPACING + textRenderer.fontHeight)) - textRenderer.fontHeight + 5); + } + + private static void drawTextWithOptionalUnderline(DrawContext context, TextRenderer textRenderer, Text text, int x, int y, int mouseX, int mouseY) { + context.drawText(textRenderer, text, x, y, -1, true); + if (isMouseOverText(mouseX, mouseY, x, y, textRenderer.getWidth(text), textRenderer.fontHeight)) { + context.drawHorizontalLine(x, x + textRenderer.getWidth(text), y + textRenderer.fontHeight, -1); + } + } + + private static boolean isMouseOverText(double mouseX, double mouseY, int x, int y, int width, int height) { + return mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + height; + } +} |