Changed chat listeners to not block messages by default

8 files changed, 19 insertions, 9 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatListener.java
index e89d06c2..84034f41 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatListener.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatListener.java
@@ -14,7 +14,5 @@ public abstract class ChatListener {
 
     public abstract boolean isEnabled();
     //Returns whether message should get filtered
-    public boolean onMessage(String[] groups) {
-        return true;
-    }
+    public abstract boolean onMessage(String[] groups);
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilter.java
index 0956e0e5..d0178dd6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilter.java
@@ -3,7 +3,7 @@ package me.xmrvizzy.skyblocker.chat.filters;
 import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
-public class AbilityFilter extends ChatListener {
+public class AbilityFilter extends ChatFilter {
     public AbilityFilter() {
         super("^(?:This ability is on cooldown for " + NUMBER + "s\\.|No more charges, next one in " + NUMBER + "s!)$");
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java
index e772f098..16cb5fc3 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java
@@ -5,7 +5,7 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
 import java.util.regex.Pattern;
 
-public class AdFilter extends ChatListener {
+public class AdFilter extends ChatFilter {
     private static final String regex;
 
     public AdFilter() {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java
index 6fa85f14..4545399e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java
@@ -3,7 +3,7 @@ package me.xmrvizzy.skyblocker.chat.filters;
 import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
-public class AoteFilter extends ChatListener {
+public class AoteFilter extends ChatFilter {
     public AoteFilter() {
         super("^There are blocks in the way!$");
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ChatFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ChatFilter.java
new file mode 100644
index 00000000..fac9a3a3
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ChatFilter.java
@@ -0,0 +1,12 @@
+package me.xmrvizzy.skyblocker.chat.filters;
+
+import me.xmrvizzy.skyblocker.chat.ChatListener;
+
+public abstract class ChatFilter extends ChatListener {
+    public ChatFilter(String pattern) {
+        super(pattern);
+    }
+    public boolean onMessage(String[] groups) {
+        return true;
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java
index e8421a45..b4e1c575 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java
@@ -3,7 +3,7 @@ package me.xmrvizzy.skyblocker.chat.filters;
 import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
-public class HealFilter extends ChatListener {
+public class HealFilter extends ChatFilter {
     public HealFilter() {
         super("^(?:You healed yourself for " + NUMBER + " health!|[a-zA-Z0-9_]{2,16} healed you for " + NUMBER + " health!)$");
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java
index 5bcaba57..ffdc5f40 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java
@@ -3,7 +3,7 @@ package me.xmrvizzy.skyblocker.chat.filters;
 import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
-public class ImplosionFilter extends ChatListener {
+public class ImplosionFilter extends ChatFilter {
     public ImplosionFilter() {
         super("^Your Implosion hit " + NUMBER + " enem(?:y|ies) for " + NUMBER + " damage\\.$");
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java
index daa4b601..b6fbddaf 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java
@@ -3,7 +3,7 @@ package me.xmrvizzy.skyblocker.chat.filters;
 import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
-public class MoltenWaveFilter extends ChatListener {
+public class MoltenWaveFilter extends ChatFilter {
     public MoltenWaveFilter() {
         super("^Your Molten Wave hit " + NUMBER + " enemy(?:y|ies) for " + NUMBER + " damage\\.$");
     }