diff options
| author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2023-04-18 07:07:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 07:07:40 -0700 |
| commit | 2e1384b266c9734ebefc06d85f067b2a80755e89 (patch) | |
| tree | 18cddc6a21aadcb365f81f2186b1ce665c7d76c5 /src/main/java/me/xmrvizzy/skyblocker/chat | |
| parent | bd8415eafe741d37f658c3235658a1f2d9fb4ed2 (diff) | |
| parent | 0e2eea45c86977cae1ff6c5176637c126d3bf707 (diff) | |
| download | Skyblocker-2e1384b266c9734ebefc06d85f067b2a80755e89.tar.gz Skyblocker-2e1384b266c9734ebefc06d85f067b2a80755e89.tar.bz2 Skyblocker-2e1384b266c9734ebefc06d85f067b2a80755e89.zip | |
Merge branch 'SkyblockerMod:master' into master
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/chat')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/chat/ChatFilterResult.java | 8 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatFilterResult.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatFilterResult.java index 0a31409a..85c3f3e3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatFilterResult.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatFilterResult.java @@ -1,5 +1,6 @@ package me.xmrvizzy.skyblocker.chat; +import net.minecraft.client.resource.language.I18n; public enum ChatFilterResult { // Skip this one / no action PASS, @@ -10,11 +11,8 @@ public enum ChatFilterResult { // Skip remaining checks, don't filter // null + @Override public String toString() { - return switch (this) { - case PASS -> "Disabled"; - case FILTER -> "Filter"; - case ACTION_BAR -> "Move to action bar"; - }; + return I18n.translate("text.autoconfig.skyblocker.option.messages.chatFilterResult." + name()); } } 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 19789dba..da082c2d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java @@ -5,7 +5,7 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig; public class MoltenWaveFilter extends SimpleChatFilter { public MoltenWaveFilter() { - super("^Your Molten Wave hit " + NUMBER + " enemy(?:y|ies) for " + NUMBER + " damage\\.$"); + super("^Your Molten Wave hit " + NUMBER + " enem(?:y|ies) for " + NUMBER + " damage\\.$"); } @Override |