diff options
| author | msg-programs <msgdoesstuff@gmail.com> | 2023-04-16 10:09:48 +0200 |
|---|---|---|
| committer | msg-programs <msgdoesstuff@gmail.com> | 2023-04-16 10:09:48 +0200 |
| commit | 9635056dc9c2849cc05ab4f07db8842c34a277fe (patch) | |
| tree | ee31e2f3891f55334bebfac24ddf791987a8dea3 /src/main/java/me | |
| parent | 515f7fcf6f284030538ca57142a39c32e045d95e (diff) | |
| parent | 0e2eea45c86977cae1ff6c5176637c126d3bf707 (diff) | |
| download | Skyblocker-9635056dc9c2849cc05ab4f07db8842c34a277fe.tar.gz Skyblocker-9635056dc9c2849cc05ab4f07db8842c34a277fe.tar.bz2 Skyblocker-9635056dc9c2849cc05ab4f07db8842c34a277fe.zip | |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into tooltopfix
merge newest changes from upstream
Diffstat (limited to 'src/main/java/me')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/chat/ChatFilterResult.java | 8 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 20 |
2 files changed, 11 insertions, 17 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/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 05ffc2e9..d47ef842 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -6,6 +6,7 @@ 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 net.minecraft.client.resource.language.I18n; import java.util.ArrayList; import java.util.List; @@ -177,12 +178,7 @@ public class SkyblockerConfig implements ConfigData { @Override public String toString() { - return switch (this) { - case LAYER1 -> "Layer 1"; - case LAYER2 -> "Layer 2"; - case RIGHT -> "Right"; - case NONE -> "Disabled"; - }; + return I18n.translate("text.autoconfig.skyblocker.option.general.bars.barpositions." + name()); } public int toInt() { @@ -220,11 +216,7 @@ public class SkyblockerConfig implements ConfigData { @Override public String toString() { - return switch (this) { - case ONE_DAY -> "1 day price"; - case THREE_DAY -> "3 day price"; - case BOTH -> "Both"; - }; + return I18n.translate("text.autoconfig.skyblocker.option.general.itemTooltip.avg." + name()); } } @@ -307,7 +299,11 @@ public class SkyblockerConfig implements ConfigData { public enum Info { PURSE, BITS, - LOCATION + LOCATION; + @Override + public String toString() { + return I18n.translate("text.autoconfig.skyblocker.option.richPresence.info." + name()); + } } public static void init() { |