Skip to content

Use Mort's First Message For Dungeon Started Event #2252

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

Draft
Alex33856 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use Mort's First Message For Dungeon Started Event #2252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import de.hysky.skyblocker.skyblock.dungeon.preview.RoomPreviewServer;
import net.minecraft.ChatFormatting;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.VisibleForTesting;
import org.joml.Vector2i;
Expand Down Expand Up @@ -798,7 +799,7 @@ private static void extractRendering(PrimitiveCollector collector) {
@SuppressWarnings("SameReturnValue")
private static boolean onChatMessage(Component text, boolean overlay) {
if (!shouldProcess()) return true;
String message = text.getString();
String message = ChatFormatting.stripFormatting(text.getString());

if (isCurrentRoomMatched()) {
//noinspection DataFlowIssue - checked above
Expand All @@ -822,7 +823,7 @@ private static boolean onChatMessage(Component text, boolean overlay) {

// Dungeon Events

if (message.equals("§e[NPC] §bMort§f: You should find it useful if you get lost.")) {
if (message.equals("[NPC] Mort: Here, I found this map when I first entered the dungeon.")) {
DungeonEvents.DUNGEON_STARTED.invoker().onDungeonStarted();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

public class Room implements Tickable, Renderable {
public static final Pattern SECRET_INDEX = Pattern.compile("^(\\d+)");
private static final Pattern SECRETS = Pattern.compile("§7(\\d{1,2})/(\\d{1,2}) Secrets");
private static final Pattern SECRETS = Pattern.compile("(\\d{1,2})/(\\d{1,2}) Secrets");
private static final String CHEST_ALREADY_OPENED = "This chest has already been searched!";
protected static final float[] RED_COLOR_COMPONENTS = {1, 0, 0};
protected static final float[] GREEN_COLOR_COMPONENTS = {0, 1, 0};
Expand Down
Loading