Conflicts begone

1 files changed, 10 insertions, 6 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java
index f20c41d2..520229f6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java
@@ -1,24 +1,28 @@
 package me.xmrvizzy.skyblocker.skyblock.api;
 
 import me.shedaniel.autoconfig.AutoConfig;
-import me.xmrvizzy.skyblocker.chat.ChatListener;
+import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
+import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 
-public class ApiKeyListener extends ChatListener {
+import java.util.regex.Matcher;
+
+public class ApiKeyListener extends ChatPatternListener {
     public ApiKeyListener() {
         super("^Your new API key is (.*)$");
     }
 
     @Override
-    public boolean isEnabled() {
-        return true;
+    protected ChatFilterResult state() {
+        return null;
     }
 
     @Override
-    public boolean onMessage(String[] groups) {
-        SkyblockerConfig.get().general.apiKey = groups[1];
+    protected boolean onMatch(Text message, Matcher matcher) {
+        SkyblockerConfig.get().general.apiKey = matcher.group(1);
         AutoConfig.getConfigHolder(SkyblockerConfig.class).save();
         MinecraftClient.getInstance().player.sendMessage(new TranslatableText("skyblocker.api.got_key"), false);
         return false;