diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java index 8ae8fbdb3c8..0b9358465f4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java @@ -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; @@ -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 @@ -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(); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java index 6f712b01a55..3a39f8b5edb 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java @@ -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};