diff options
| author | Fix3dll <serhanduzce@gmail.com> | 2022-03-08 19:20:56 +0300 |
|---|---|---|
| committer | Fix3dll <serhanduzce@gmail.com> | 2022-03-08 19:20:56 +0300 |
| commit | 1ff679176faadb95da2c90e7b87b0c2b369bae87 (patch) | |
| tree | be89495260919b89544ddbb1af68d16ec609c699 /src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | |
| parent | 9c67b6d30f14c852937387a5c727d2aff3cedbe8 (diff) | |
| parent | b380c52524bbdb7ea01fe42d5bab95f22e39a5a1 (diff) | |
| download | Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.tar.gz Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.tar.bz2 Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java
# src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
# src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 5b9ce053..130b3064 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -5,6 +5,7 @@ import me.shedaniel.autoconfig.ConfigData; import me.shedaniel.autoconfig.annotation.Config; import me.shedaniel.autoconfig.annotation.ConfigEntry; import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; +import me.xmrvizzy.skyblocker.chat.ChatFilterResult; import java.util.ArrayList; import java.util.List; @@ -30,6 +31,9 @@ public class SkyblockerConfig implements ConfigData { public static class General { + @ConfigEntry.Gui.Excluded + public String apiKey; + @ConfigEntry.Category("bars") @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public Bars bars = new Bars(); @@ -121,23 +125,23 @@ public class SkyblockerConfig implements ConfigData { public boolean solvePuzzler = true; } - public enum MsgOptions { - ActionBar, - Hide, - Show - } - public static class Messages { - public boolean hideAbility = false; - public boolean hideHeal = false; - public boolean hideAOTE = false; - public boolean hideImplosion = false; - public boolean hideMoltenWave = false; - public boolean hideAds = false; - public boolean hideTeleportPad = false; - public boolean hideCombo = false; @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) - public MsgOptions autopet = MsgOptions.Show; + public ChatFilterResult hideAbility = ChatFilterResult.PASS; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ChatFilterResult hideHeal = ChatFilterResult.PASS; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ChatFilterResult hideAOTE = ChatFilterResult.PASS; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ChatFilterResult hideImplosion = ChatFilterResult.PASS; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ChatFilterResult hideMoltenWave = ChatFilterResult.PASS; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ChatFilterResult hideAds = ChatFilterResult.PASS; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ChatFilterResult hideTeleportPad = ChatFilterResult.PASS; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ChatFilterResult hideCombo = ChatFilterResult.PASS; } public enum Info { |