aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-06-13 20:58:28 +0300
committerRime <81419447+Emirlol@users.noreply.github.com>2024-07-10 02:08:24 +0300
commit26af94886e964b5f83a26bf4a6866fd1553d0d79 (patch)
treeaff04f6f01ec3e76672fbba39a7ebd83067fa89a
parentb99fb26b5a049e7bd5a7a485e5f43938ae6d33ea (diff)
downloadSkyblocker-26af94886e964b5f83a26bf4a6866fd1553d0d79.tar.gz
Skyblocker-26af94886e964b5f83a26bf4a6866fd1553d0d79.tar.bz2
Skyblocker-26af94886e964b5f83a26bf4a6866fd1553d0d79.zip
Add reorder helper that copies the number of items to clipboard
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java73
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/ItemUtils.java13
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java4
4 files changed, 91 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java
new file mode 100644
index 00000000..f779be98
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/ReorderHelper.java
@@ -0,0 +1,73 @@
+package de.hysky.skyblocker.skyblock.bazaar;
+
+import de.hysky.skyblocker.skyblock.item.tooltip.TooltipAdder;
+import de.hysky.skyblocker.utils.ItemUtils;
+import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
+import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.util.InputUtil;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.Nullable;
+import org.lwjgl.glfw.GLFW;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ReorderHelper extends ContainerSolver {
+ private static final Pattern BUY_PATTERN = Pattern.compile("([\\d,]+)x missing items\\.");
+ private static final Pattern SELL_PATTERN = Pattern.compile("([\\d,]+)x items\\.");
+
+ public ReorderHelper() {
+ super("^Order options");
+ }
+
+ @Override
+ protected boolean isEnabled() {
+ return true;
+ }
+
+ @Override
+ protected boolean onClickSlot(int slot, ItemStack stack, int screenId, String[] groups) {
+ // V This part is so that it short-circuits if not necessary
+ if ((slot == 11 || slot == 13) && stack.isOf(Items.GREEN_TERRACOTTA) && InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), GLFW.GLFW_KEY_LEFT_CONTROL)) {
+ Matcher matcher;
+ // The terracotta is at slot 13 on sell orders and at slot 11 on buy orders
+ if (slot == 13) matcher = ItemUtils.getLoreLineIfContainsMatch(stack, SELL_PATTERN);
+ else matcher = ItemUtils.getLoreLineIfContainsMatch(stack, BUY_PATTERN);
+ if (matcher != null) {
+ MinecraftClient.getInstance().keyboard.setClipboard(matcher.group(1).replace(",", ""));
+ return false;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ protected List<ColorHighlight> getColors(String[] groups, Int2ObjectMap<ItemStack> slots) {
+ return List.of();
+ }
+
+ public static class Tooltip extends TooltipAdder {
+ public Tooltip() {
+ super("^Order options", Integer.MIN_VALUE);
+ }
+
+ @Override
+ public void addToTooltip(@Nullable Slot focusedSlot, ItemStack stack, List<Text> lines) {
+ if (focusedSlot == null || !stack.isOf(Items.GREEN_TERRACOTTA)) return;
+ switch (focusedSlot.id) {
+ case 11, 13 -> {
+ lines.add(Text.empty());
+ lines.add(Text.empty().append(Text.literal("[Skyblocker] You can copy the amount of items").formatted(Formatting.DARK_GRAY, Formatting.ITALIC)));
+ lines.add(Text.empty().append(Text.literal("by holding CTRL while clicking on the item!").formatted(Formatting.DARK_GRAY, Formatting.ITALIC)));
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
index cb8efb0c..bd06acba 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java
@@ -1,6 +1,7 @@
package de.hysky.skyblocker.skyblock.item.tooltip;
import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
+import de.hysky.skyblocker.skyblock.bazaar.ReorderHelper;
import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver;
import de.hysky.skyblocker.skyblock.item.tooltip.adders.*;
import de.hysky.skyblocker.skyblock.item.tooltip.adders.CraftPriceTooltip;
@@ -24,6 +25,7 @@ public class TooltipManager {
new LineSmoothener(), // Applies before anything else
new SupercraftReminder(),
new ChocolateFactorySolver.Tooltip(),
+ new ReorderHelper.Tooltip(),
new NpcPriceTooltip(1),
new BazaarPriceTooltip(2),
new LBinTooltip(3),
diff --git a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
index e43ce783..ff6daad2 100644
--- a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
@@ -223,6 +223,19 @@ public class ItemUtils {
return null;
}
+ @Nullable
+ public static Matcher getLoreLineIfContainsMatch(ItemStack item, Pattern pattern) {
+ for (Text line : getLore(item)) {
+ String string = line.getString();
+ Matcher matcher = pattern.matcher(string);
+ if (matcher.find()) {
+ return matcher;
+ }
+ }
+
+ return null;
+ }
+
public static @NotNull List<Text> getLore(ItemStack item) {
return item.getOrDefault(DataComponentTypes.LORE, LoreComponent.DEFAULT).styledLines();
}
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
index 5ef4e075..c5ed0494 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
@@ -5,6 +5,7 @@ import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
import de.hysky.skyblocker.skyblock.accessories.newyearcakes.NewYearCakeBagHelper;
import de.hysky.skyblocker.skyblock.accessories.newyearcakes.NewYearCakesHelper;
import de.hysky.skyblocker.skyblock.bazaar.BazaarHelper;
+import de.hysky.skyblocker.skyblock.bazaar.ReorderHelper;
import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver;
import de.hysky.skyblocker.skyblock.dungeon.CroesusHelper;
import de.hysky.skyblocker.skyblock.dungeon.CroesusProfit;
@@ -60,7 +61,8 @@ public class ContainerSolverManager {
new NewYearCakeBagHelper(),
NewYearCakesHelper.INSTANCE,
new ChocolateFactorySolver(),
- new BazaarHelper()
+ new BazaarHelper(),
+ new ReorderHelper()
};
}