Skip to content

Treasure Hunter Waypoints #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 1, 2025
Merged

Treasure Hunter Waypoints #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b1388a
initial commit
Fluboxer Apr 9, 2025
10c9e91
made waypoint actually say "Treasure" instead of "Chat Waypoint"
Fluboxer Apr 10, 2025
cbc07a4
Merge branch 'SkyblockerMod:master' into TreasureHunter-waypoints
Fluboxer May 15, 2025
617e478
now it works with new version. Still awaits for chat prompt fix as it…
Fluboxer May 16, 2025
cfc3c8d
fixing chat parser thingy
Fluboxer May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
package de.hysky.skyblocker.skyblock.barn;

import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.utils.Constants;
import de.hysky.skyblocker.utils.chat.ChatFilterResult;
import de.hysky.skyblocker.utils.chat.ChatPatternListener;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.ClickEvent;
import net.minecraft.text.HoverEvent;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
import java.util.Map;
Expand All @@ -28,10 +34,22 @@ public boolean onMatch(Text message, Matcher matcher) {
String hint = matcher.group(1);
String location = locations.get(hint);
if (location == null) return false;
client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: Go mine around " + location + "."), false);
client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: Go mine around " + location), false);
requestWaypoint(location);
return true;
}

private static void requestWaypoint(String location) {
String command = "/skyblocker waypoints individual " + location + " Treasure";
MutableText requestMessage = Constants.PREFIX.get().append(Text.translatable("skyblocker.config.chat.waypoints.display", java.util.Arrays.stream(location.split(" ")).mapToInt(Integer::parseInt).boxed().toArray()).formatted(Formatting.AQUA)
.styled(style -> style
.withHoverEvent(new HoverEvent.ShowText(Text.translatable("skyblocker.config.chat.waypoints.display")))
.withClickEvent(new ClickEvent.RunCommand(command.trim()))
)
);
MinecraftClient.getInstance().player.sendMessage(requestMessage, false);
}

static {
locations = new HashMap<>();
locations.put("There's a treasure chest somewhere in a small cave in the gorge.", "258 70 -492");
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/de/hysky/skyblocker/skyblock/chat/ChatPositionShare.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ private static void onMessage(Text text, boolean overlay) {
if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.waypoints.enableWaypoints) {
String message = text.getString();

// prevents parsing skyblocker's own messages. Also prevents TH solver from parsing as it already has own waypoint
if (message.startsWith("[Skyblocker]") || message.startsWith("§e[NPC] Treasure Hunter§f:")) {
return;
}

for (Pattern pattern : PATTERNS) {
Matcher matcher = pattern.matcher(message);
if (matcher.find()) {
Expand Down