Skip to content

Commit

Permalink
Refactor VisitorHelper
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevinthegreat1
kevinthegreat1 committed Feb 11, 2024
1 parent b90bdd7 commit 540821c
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 107 deletions.
4 changes: 2 additions & 2 deletions src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ protected HandledScreenMixin(Text title) {
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") && !this.getTitle().getString().contains("Logbook"))
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") )
if (SkyblockerConfigManager.get().general.visitorHelper && (Utils.getLocationRaw().equals("garden") && !getTitle().getString().contains("Logbook") || getTitle().getString().startsWith("Bazaar")))
VisitorHelper.onMouseClicked(mouseX, mouseY, button, this.textRenderer);
}

Expand Down
188 changes: 83 additions & 105 deletions src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
package de.hysky.skyblocker.skyblock.garden;

import java.util.HashMap;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.text.NumberFormat;

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 net.minecraft.client.MinecraftClient;
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, Map<String, Integer>> itemMap = new HashMap<>();
private static final Map<String, NEUItem> itemCache = new HashMap<>();
private static final int TEXT_START_X = 3;
private static final int TEXT_START_Y = 13;
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) {
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);
Expand All @@ -41,20 +43,18 @@ public static void renderScreen(String title, DrawContext context, TextRenderer
public static void onMouseClicked(double mouseX, double mouseY, int mouseButton, TextRenderer textRenderer) {
int yPosition = TEXT_START_Y;

for (var entry : itemMap.entrySet()) {
String text = entry.getKey();
int textWidth = textRenderer.getWidth(text);
for (Map.Entry<String, Object2IntMap<String>> visitorEntry : itemMap.entrySet()) {
int textWidth;
int textHeight = textRenderer.fontHeight;

yPosition += LINE_SPACING + textHeight;

for (var nestedEntry : entry.getValue().entrySet()) {
String nestedText = nestedEntry.getKey();
textWidth = textRenderer.getWidth(nestedText);
for (Object2IntMap.Entry<String> itemEntry : visitorEntry.getValue().object2IntEntrySet()) {
String itemText = itemEntry.getKey();
textWidth = textRenderer.getWidth(itemText);

if (isMouseOverText((int) mouseX, (int) mouseY, TEXT_START_X, yPosition, textWidth, textHeight)) {
MinecraftClient client = MinecraftClient.getInstance();
client.player.networkHandler.sendChatMessage("/bz " + nestedText);
if (isMouseOverText(mouseX, mouseY, TEXT_START_X, yPosition, textWidth, textHeight)) {
MessageScheduler.INSTANCE.sendMessageAfterCooldown("/bz " + itemText);
return;
}
yPosition += LINE_SPACING + textHeight;
Expand All @@ -68,117 +68,95 @@ public static void onSlotClick(Slot slot, int slotId, String title) {
}
}

private static void processVisitorItem(String title, ScreenHandler handler) {
var visitorItem = handler.getSlot(13).getStack();
if (visitorItem != null && visitorItem.hasNbt() && visitorItem.getNbt().toString().contains("Times Visited")) {
var acceptButton = handler.getSlot(29).getStack();
if (acceptButton != null && acceptButton.hasNbt()) {
var acceptButtonNbt = acceptButton.getNbt().getCompound("display");
if (acceptButtonNbt.getType("Lore") == 9) {
processLore(title, acceptButtonNbt.getList("Lore", 8));
}
}
}
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 title, NbtList nbtList) {
private static void processLore(String visitorName, NbtList loreList) {
boolean saveRequiredItems = false;
for (var j = 0; j < nbtList.size(); j++) {
var string = nbtList.getString(j);
if (string.contains("Items Required"))
for (int i = 0; i < loreList.size(); i++) {
String lore = loreList.getString(i);
if (lore.contains("Items Required"))
saveRequiredItems = true;
else if (string.contains("Rewards"))
else if (lore.contains("Rewards"))
break;
else if (saveRequiredItems)
updateItemMap(title, string);
updateItemMap(visitorName, lore);
}
}

private static void updateItemMap(String title, String lore) {
var mutableText = Serialization.fromJson(lore);
var split = mutableText.getString().split(" x");
var itemName = split[0].trim();
if (!itemName.isEmpty()) {
int amount = 1;
try {
amount = split.length == 2 ? NumberFormat.getInstance().parse(split[1].trim()).intValue() : 1;
} catch (Exception e) {
LOGGER.debug("Failed to parse amount for item: " + mutableText.getString());
return;
}
Map<String, Integer> nestedMap = itemMap.getOrDefault(title, new HashMap<>());
if (!nestedMap.containsKey(itemName)) {
nestedMap.put(itemName, amount);
}
if (!itemMap.containsKey(title)) {
itemMap.put(title, nestedMap);
}
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 (var entry : itemMap.entrySet()) {
var primaryKey = entry.getKey();
drawTextWithOptionalUnderline(context, textRenderer, primaryKey, TEXT_START_X,
TEXT_START_Y + (index * (LINE_SPACING + textRenderer.fontHeight)), -1, mouseX, mouseY);
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 (var nestedEntry : entry.getValue().entrySet()) {
index = drawItemEntryWithHover(context, textRenderer, nestedEntry, index, mouseX, mouseY);
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> nestedEntry, int index, int mouseX, int mouseY) {
var subItem = nestedEntry.getKey();
var amount = nestedEntry.getValue();
var item = getCachedItem(subItem);
if (item != null) {
var text = " " + item.getDisplayName() + " x" + amount;
drawTextWithOptionalUnderline(context, textRenderer, text, TEXT_START_X,
TEXT_START_Y + (index * (LINE_SPACING + textRenderer.fontHeight)), -1, mouseX, mouseY);
drawItemStack(context, textRenderer, item, amount, index);
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 NEUItem getCachedItem(String displayName) {
var strippedName = Formatting.strip(displayName);
var cachedItem = itemCache.get(strippedName);
if (cachedItem == null) {
var item = NEURepoManager.NEU_REPO.getItems().getItems().values().stream()
.filter(i -> Formatting.strip(i.getDisplayName()).equals(strippedName))
.findFirst()
.orElse(null);
if (item != null) {
itemCache.put(strippedName, item);
}
return item;
}
return cachedItem;
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, String text,
int x, int y, int color, int mouseX, int mouseY) {
context.drawText(textRenderer, text, x, y, color, true);
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, color);
context.drawHorizontalLine(x, x + textRenderer.getWidth(text), y + textRenderer.fontHeight, -1);
}
}

private static boolean isMouseOverText(int mouseX, int mouseY, int x, int y, int width, int height) {
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;
}

private static void drawItemStack(DrawContext context, TextRenderer textRenderer, NEUItem item, int amount,
int index) {
var stack = ItemRepository.getItemStack(item.getSkyblockItemId());
var text = " " + item.getDisplayName() + " x" + amount;
context.drawItem(stack, TEXT_START_X + 2 + textRenderer.getWidth(text),
TEXT_START_Y + (index * (LINE_SPACING + textRenderer.fontHeight)) - textRenderer.fontHeight + 5);
context.drawText(textRenderer, text, TEXT_START_X,
TEXT_START_Y + (index * (LINE_SPACING + textRenderer.fontHeight)), -1, true);
}
}

0 comments on commit 540821c

Please sign in to comment.