add: Autopet filter with ActionBar option

remove: Unused imports

14 files changed, 48 insertions, 9 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
index f2c67d32..45a1053e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
@@ -21,6 +21,7 @@ public class ChatParser {
             new AdFilter(),
             new TeleportPadFilter(),
             new ComboFilter(),
+            new AutopetFilter(),
             new Fetchur(),
             new Puzzler(),
             new Trivia(),
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 4545399e..e3a270a3 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
 public class AoteFilter extends ChatFilter {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
new file mode 100644
index 00000000..c0ec47a0
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
@@ -0,0 +1,24 @@
+package me.xmrvizzy.skyblocker.chat.filters;
+
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.LiteralText;
+
+public class AutopetFilter extends ChatFilter {
+    public AutopetFilter() {
+        super("^§cAutopet §eequipped your §7.*§e! §a§lVIEW RULE$");
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return SkyblockerConfig.get().messages.autopet != SkyblockerConfig.Autopet.Show;
+    }
+
+    @Override
+    public boolean onMessage(String[] groups) {
+        if (SkyblockerConfig.get().messages.autopet == SkyblockerConfig.Autopet.ActionBar) {
+            MinecraftClient.getInstance().player.sendMessage(new LiteralText(groups[0].replace("§a§lVIEW RULE", "")), true);
+        }
+        return true;
+    }
+}
\ No newline at end of file
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 b4e1c575..f31fb070 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
 public class HealFilter extends ChatFilter {
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 ffdc5f40..9a98cb8a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
 public class ImplosionFilter extends ChatFilter {
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 b6fbddaf..71a5f868 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 
 public class MoltenWaveFilter extends ChatFilter {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index f94a422d..49e17f50 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -121,6 +121,12 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solvePuzzler = true;
     }
 
+    public enum Autopet {
+        ActionBar,
+        Hide,
+        Show
+    }
+
     public static class Messages {
         public boolean hideAbility = false;
         public boolean hideHeal = false;
@@ -130,6 +136,8 @@ public class SkyblockerConfig implements ConfigData {
         public boolean hideAds = false;
         public boolean hideTeleportPad = false;
         public boolean hideCombo = false;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        public Autopet autopet = Autopet.Show;
     }
 
     public enum Info {
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 55c7910c..4ffba936 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -55,6 +55,7 @@
   "text.autoconfig.skyblocker.option.messages.hideAds": "Hide Ads From Public Chat",
   "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Hide Teleport Pad Messages",
   "text.autoconfig.skyblocker.option.messages.hideCombo": "Hide Combo Messages",
+  "text.autoconfig.skyblocker.option.messages.autopet": "Autopet Messages",
 
   "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2There is a new version available!",
   "skyblocker.update.update_link": " §2§nClick here§r",
diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilterTest.java
index ec2db07b..295d9c6a 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilterTest.java
+++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilterTest.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListenerTest;
 import org.junit.jupiter.api.Test;
 
 class AbilityFilterTest extends ChatFilterTest<AbilityFilter> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
index 639042fe..f66071d8 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
+++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListenerTest;
 import org.junit.jupiter.api.Test;
 
 class AdFilterTest extends ChatFilterTest<AdFilter> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilterTest.java
index 2aa14e1c..ab75351e 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilterTest.java
+++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilterTest.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListenerTest;
 import org.junit.jupiter.api.Test;
 
 class AoteFilterTest extends ChatFilterTest<AoteFilter> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilterTest.java
new file mode 100644
index 00000000..c50e57a9
--- /dev/null
+++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilterTest.java
@@ -0,0 +1,14 @@
+package me.xmrvizzy.skyblocker.chat.filters;
+
+import org.junit.jupiter.api.Test;
+
+class AutopetFilterTest extends ChatFilterTest<AutopetFilter> {
+    public AutopetFilterTest() {
+        super(new AutopetFilter());
+    }
+
+    @Test
+    void testAutopet() {
+        assertFilters("§cAutopet §eequipped your §7[Lvl 85] §6Tiger§e! §a§lVIEW RULE");
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/HealFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/HealFilterTest.java
index f7b4d59b..05477ce9 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/HealFilterTest.java
+++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/HealFilterTest.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListenerTest;
 import org.junit.jupiter.api.Test;
 
 class HealFilterTest extends ChatFilterTest<HealFilter> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilterTest.java
index a6526925..fe2c00b1 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilterTest.java
+++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilterTest.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.chat.filters;
 
-import me.xmrvizzy.skyblocker.chat.ChatListenerTest;
 import org.junit.jupiter.api.Test;
 
 class ImplosionFilterTest extends ChatFilterTest<ImplosionFilter> {