Remove formatting codes from a few forgotten classes

Fixes Quiz, Threee Weirdos and other solvers

10 files changed, 13 insertions, 13 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java
index abb4a76d..f0f75600 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java
@@ -14,7 +14,7 @@ public class HungryHiker extends ChatPatternListener {
 
     private static final Map<String, String> foods;
 
-    public HungryHiker() { super("^§e\\[NPC] Hungry Hiker§f: (The food I want is|(I asked for) food that is) ([a-zA-Z, '\\-]*\\.)$"); }
+    public HungryHiker() { super("^\\[NPC] Hungry Hiker: (The food I want is|(I asked for) food that is) ([a-zA-Z, '\\-]*\\.)$"); }
 
     @Override
     public ChatFilterResult state() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java
index 191014d5..032c7df9 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java
@@ -14,7 +14,7 @@ public class TreasureHunter extends ChatPatternListener {
 
     private static final Map<String, String> locations;
 
-    public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-\\.]*)$"); }
+    public TreasureHunter() { super("^\\[NPC] Treasure Hunter: ([a-zA-Z, '\\-\\.]*)$"); }
 
     @Override
     public ChatFilterResult state() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java
index c5e55f93..fd7a8dbf 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java
@@ -12,7 +12,7 @@ import java.util.regex.Matcher;
 
 public class ThreeWeirdos extends ChatPatternListener {
     public ThreeWeirdos() {
-        super("^§e\\[NPC] §c([A-Z][a-z]+)§f: (?:The reward is(?: not in my chest!|n't in any of our chests\\.)|My chest (?:doesn't have the reward\\. We are all telling the truth\\.|has the reward and I'm telling the truth!)|At least one of them is lying, and the reward is not in §c§c[A-Z][a-z]+'s §rchest\\!|Both of them are telling the truth\\. Also, §c§c[A-Z][a-z]+ §rhas the reward in their chest\\!)$");
+        super("^\\[NPC] ([A-Z][a-z]+): (?:The reward is(?: not in my chest!|n't in any of our chests\\.)|My chest (?:doesn't have the reward\\. We are all telling the truth\\.|has the reward and I'm telling the truth!)|At least one of them is lying, and the reward is not in [A-Z][a-z]+'s chest\\!|Both of them are telling the truth\\. Also, [A-Z][a-z]+ has the reward in their chest\\!)$");
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java
index c331bd48..fb418c24 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java
@@ -23,7 +23,7 @@ public class Trivia extends ChatPatternListener {
     private List<String> solutions = Collections.emptyList();
 
     public Trivia() {
-        super("^ +(?:([A-Za-z,' ]*\\?)|§6 ([ⓐⓑⓒ]) §a([a-zA-Z0-9 ]+))$");
+        super("^ +(?:([A-Za-z,' ]*\\?)| ([ⓐⓑⓒ]) ([a-zA-Z0-9 ]+))$");
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
index 27cd62ad..2ddaf6b5 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
@@ -18,7 +18,7 @@ public class Fetchur extends ChatPatternListener {
     private static final Map<String, String> answers;
 
     public Fetchur() {
-        super("^§e\\[NPC] Fetchur§f: (?:its|theyre) ([a-zA-Z, \\-]*)$");
+        super("^\\[NPC] Fetchur: (?:its|theyre) ([a-zA-Z, \\-]*)$");
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java
index fae845b5..1f5c0c90 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java
@@ -13,7 +13,7 @@ import java.util.regex.Matcher;
 
 public class Puzzler extends ChatPatternListener {
     public Puzzler() {
-        super("^§e\\[NPC] §dPuzzler§f: ((?:§d▲|§5▶|§b◀|§a▼){10})$");
+        super("^\\[NPC] Puzzler: ((?:▲|▶|◀|▼){10})$");
     }
 
     @Override
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java
index 22683698..38e795c3 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java
@@ -10,10 +10,10 @@ class ThreeWeirdosTest extends ChatPatternListenerTest<ThreeWeirdos> {
 
     @Test
     void test1() {
-        assertGroup("§e[NPC] §cBaxter§f: My chest doesn't have the reward. We are all telling the truth.", 1, "Baxter");
+        assertGroup("[NPC] Baxter: My chest doesn't have the reward. We are all telling the truth.", 1, "Baxter");
     }
     @Test
     void test2() {
-        assertGroup("§e[NPC] §cHope§f: The reward isn't in any of our chests.", 1, "Hope");
+        assertGroup("[NPC] Hope: The reward isn't in any of our chests.", 1, "Hope");
     }
 }
\ No newline at end of file
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java
index 55a59a68..52a7ad8c 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java
@@ -20,14 +20,14 @@ class TriviaTest extends ChatPatternListenerTest<Trivia> {
 
     @Test
     void answer1() {
-        assertGroup("    §6 ⓐ §aAnswer 1", 3, "Answer 1");
+        assertGroup("     ⓐ Answer 1", 3, "Answer 1");
     }
     @Test
     void answer2() {
-        assertGroup("    §6 ⓑ §aAnswer 2", 3, "Answer 2");
+        assertGroup("     ⓑ Answer 2", 3, "Answer 2");
     }
     @Test
     void answer3() {
-        assertGroup("    §6 ⓒ §aAnswer 3", 3, "Answer 3");
+        assertGroup("     ⓒ Answer 3", 3, "Answer 3");
     }
 }
\ No newline at end of file
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java
index 08282972..12a194ee 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java
@@ -10,6 +10,6 @@ class FetchurTest extends ChatPatternListenerTest<Fetchur> {
 
     @Test
     public void patternCaptures() {
-        assertGroup("§e[NPC] Fetchur§f: its a hint", 1, "a hint");
+        assertGroup("[NPC] Fetchur: its a hint", 1, "a hint");
     }
 }
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java
index 9437a5c9..c32010cf 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java
@@ -10,6 +10,6 @@ class PuzzlerTest extends ChatPatternListenerTest<Puzzler> {
 
     @Test
     void puzzler() {
-        assertGroup("§e[NPC] §dPuzzler§f: §b◀§d▲§b◀§d▲§d▲§5▶§5▶§b◀§d▲§a▼", 1, "§b◀§d▲§b◀§d▲§d▲§5▶§5▶§b◀§d▲§a▼");
+        assertGroup("[NPC] Puzzler: ◀▲◀▲▲▶▶◀▲▼", 1, "◀▲◀▲▲▶▶◀▲▼");
     }
 }
\ No newline at end of file