diff options
| author | lanthanide <65650884+lantice3720@users.noreply.github.com> | 2023-05-07 15:39:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-07 15:39:21 +0900 |
| commit | aca9d8437e8ac4345cf57dac276ed434a74d791a (patch) | |
| tree | 780fa8100c2c9aa358ca4dddc86f0b0d4642c75b /src/main/java/me/xmrvizzy/skyblocker/chat | |
| parent | 4b20aca66fd3470a555871b74445dfa452b93896 (diff) | |
| parent | 076ba90b23db2ae3df3f5c3918ccda836ad90690 (diff) | |
| download | Skyblocker-aca9d8437e8ac4345cf57dac276ed434a74d791a.tar.gz Skyblocker-aca9d8437e8ac4345cf57dac276ed434a74d791a.tar.bz2 Skyblocker-aca9d8437e8ac4345cf57dac276ed434a74d791a.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/ChatMessageListener.java | 4 |
2 files changed, 7 insertions, 5 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/ChatMessageListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java index 2e23bf31..9ee87f2b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java @@ -2,11 +2,13 @@ package me.xmrvizzy.skyblocker.chat; import me.xmrvizzy.skyblocker.chat.filters.*; import me.xmrvizzy.skyblocker.skyblock.api.ApiKeyListener; +import me.xmrvizzy.skyblocker.skyblock.barn.HungryHiker; import me.xmrvizzy.skyblocker.skyblock.dungeon.Reparty; import me.xmrvizzy.skyblocker.skyblock.dungeon.ThreeWeirdos; import me.xmrvizzy.skyblocker.skyblock.dungeon.Trivia; import me.xmrvizzy.skyblocker.skyblock.dwarven.Fetchur; import me.xmrvizzy.skyblocker.skyblock.dwarven.Puzzler; +import me.xmrvizzy.skyblocker.skyblock.barn.TreasureHunter; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.text.Text; @@ -30,6 +32,8 @@ public interface ChatMessageListener { new Reparty(), new ThreeWeirdos(), new Trivia(), + new TreasureHunter(), + new HungryHiker(), // Filters new AbilityFilter(), new AdFilter(), |