From 51f38c0bac92ac21fc01a0fabb4ef7b4a3da7e19 Mon Sep 17 00:00:00 2001
From: Fix3dll <serhanduzce@gmail.com>
Date: Mon, 21 Feb 2022 17:34:16 +0300
Subject: new filters

---
 src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java  |  2 ++
 .../me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java   | 14 ++++++++++++++
 .../skyblocker/chat/filters/TeleportPadFilter.java         | 14 ++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java
 create mode 100644 src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java

(limited to 'src/main/java/me/xmrvizzy/skyblocker/chat')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
index 97ca1f68..f2c67d32 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
@@ -19,6 +19,8 @@ public class ChatParser {
             new HealFilter(),
             new AbilityFilter(),
             new AdFilter(),
+            new TeleportPadFilter(),
+            new ComboFilter(),
             new Fetchur(),
             new Puzzler(),
             new Trivia(),
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java
new file mode 100644
index 00000000..718dda11
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java
@@ -0,0 +1,14 @@
+package me.xmrvizzy.skyblocker.chat.filters;
+
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+
+public class ComboFilter extends ChatFilter {
+    public ComboFilter() {
+        super("^.*Kill Combo (\\+|has expired!).*$");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return SkyblockerConfig.get().messages.hideCombo;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java
new file mode 100644
index 00000000..1515613a
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java
@@ -0,0 +1,14 @@
+package me.xmrvizzy.skyblocker.chat.filters;
+
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+
+public class TeleportPadFilter extends ChatFilter {
+    public TeleportPadFilter() {
+        super("^.*Teleport Pad (does not have a destination set!|to the).*$");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return SkyblockerConfig.get().messages.hideTeleportPad;
+    }
+}
\ No newline at end of file
-- 
cgit 


From d6562f8d5cb5b5917ba027daa16497901cc583d9 Mon Sep 17 00:00:00 2001
From: Fix3dll <serhanduzce@gmail.com>
Date: Tue, 22 Feb 2022 22:16:29 +0300
Subject: more reliable filters and organise unnecessary query

---
 src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java     | 3 ++-
 .../java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/chat')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java
index 718dda11..c09cb69c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java
@@ -4,7 +4,8 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
 public class ComboFilter extends ChatFilter {
     public ComboFilter() {
-        super("^.*Kill Combo (\\+|has expired!).*$");
+        super("^(\\+\\d+ Kill Combo \\+\\d+(% ✯ Magic Find| coins per kill)" +
+                "|Your Kill Combo has expired! You reached a \\d+ Kill Combo!)$");
     }
 
     @Override
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java
index 1515613a..2913d2bb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java
@@ -4,7 +4,8 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
 public class TeleportPadFilter extends ChatFilter {
     public TeleportPadFilter() {
-        super("^.*Teleport Pad (does not have a destination set!|to the).*$");
+        super("^(Warped from the .* Teleport Pad to the .* Teleport Pad!" +
+                "|This Teleport Pad does not have a destination set!)$");
     }
 
     @Override
-- 
cgit