diff options
Diffstat (limited to 'api/src/main/java/me/shedaniel')
12 files changed, 40 insertions, 32 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/AppearanceTheme.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/AppearanceTheme.java index fc653861b..d5397ceb0 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/AppearanceTheme.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/AppearanceTheme.java @@ -31,12 +31,12 @@ import net.minecraft.client.resources.language.I18n; import java.util.Locale; @Environment(EnvType.CLIENT) -public enum AppearanceTheme implements SelectionListEntry.Translatable { +public enum AppearanceTheme { LIGHT, DARK; @Override - public String getKey() { - return I18n.get("config.roughlyenoughitems.theme." + name().toLowerCase(Locale.ROOT)); + public String toString() { + return I18n.get("config.rei.value.appearance.theme." + name().toLowerCase(Locale.ROOT)); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/CheatingMode.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/CheatingMode.java index 5e9a98261..e8a456a0c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/CheatingMode.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/CheatingMode.java @@ -35,11 +35,11 @@ public enum CheatingMode { public String toString() { switch (this) { case ON: - return I18n.get("config.rei.value.enabledDisabled.true"); + return I18n.get("config.rei.value.trueFalse.true"); case OFF: - return I18n.get("config.rei.value.enabledDisabled.false"); + return I18n.get("config.rei.value.trueFalse.false"); case WHEN_CREATIVE: - return I18n.get("config.roughlyenoughitems.cheating.when_creative"); + return I18n.get("config.rei.value.cheats.mode.when_creative"); default: throw new IllegalStateException("Unknown CheatingMode: " + this); } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ConfigButtonPosition.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ConfigButtonPosition.java index fd9a7d9a0..b816899ab 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ConfigButtonPosition.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ConfigButtonPosition.java @@ -31,12 +31,13 @@ import net.minecraft.client.resources.language.I18n; import java.util.Locale; @Environment(EnvType.CLIENT) -public enum ConfigButtonPosition implements SelectionListEntry.Translatable { +public enum ConfigButtonPosition { UPPER, LOWER; - @Override - public String getKey() { - return I18n.get("config.roughlyenoughitems.layout.configButtonLocation." + name().toLowerCase(Locale.ROOT)); + public String toString(boolean right) { + if (this == UPPER && right) return I18n.get("config.rei.value.layout.config_button_location.top_right"); + if (this == UPPER) return I18n.get("config.rei.value.layout.config_button_location.top_left"); + return I18n.get("config.rei.value.layout.config_button_location.next_to_search"); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayPanelLocation.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayPanelLocation.java index d91569291..6278c0d01 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayPanelLocation.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayPanelLocation.java @@ -23,7 +23,6 @@ package me.shedaniel.rei.api.client.gui.config; -import me.shedaniel.clothconfig2.gui.entries.SelectionListEntry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.resources.language.I18n; @@ -31,7 +30,7 @@ import net.minecraft.client.resources.language.I18n; import java.util.Locale; @Environment(EnvType.CLIENT) -public enum DisplayPanelLocation implements SelectionListEntry.Translatable { +public enum DisplayPanelLocation { LEFT, RIGHT; @@ -41,7 +40,7 @@ public enum DisplayPanelLocation implements SelectionListEntry.Translatable { } @Override - public String getKey() { - return I18n.get("config.roughlyenoughitems.accessibility.displayPanelLocation." + name().toLowerCase(Locale.ROOT)); + public String toString() { + return I18n.get("config.rei.value.layout.location." + name().toLowerCase(Locale.ROOT)); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayScreenType.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayScreenType.java index f647db2f4..90b4fb8bf 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayScreenType.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/DisplayScreenType.java @@ -37,6 +37,6 @@ public enum DisplayScreenType { @Override public String toString() { - return I18n.get("config.roughlyenoughitems.recipeScreenType." + name().toLowerCase(Locale.ROOT)); + return I18n.get("config.rei.value.appearance.recipe_lookup_style." + name().toLowerCase(Locale.ROOT)); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/EntryPanelOrderingConfig.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/EntryPanelOrderingConfig.java index 407d9cb3c..9b706c889 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/EntryPanelOrderingConfig.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/EntryPanelOrderingConfig.java @@ -27,6 +27,8 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.resources.language.I18n; +import java.util.Locale; + @Environment(EnvType.CLIENT) public enum EntryPanelOrderingConfig { REGISTRY_ASCENDING(EntryPanelOrdering.REGISTRY, true), @@ -59,6 +61,6 @@ public enum EntryPanelOrderingConfig { @Override public String toString() { - return I18n.get("config.roughlyenoughitems.list_ordering_button", I18n.get(getOrdering().getNameTranslationKey()), I18n.get(isAscending ? "ordering.rei.ascending" : "ordering.rei.descending")); + return I18n.get("config.rei.value.list.ordering." + name().toLowerCase(Locale.ROOT)); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingMode.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingMode.java index 910669225..fb4e228fc 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingMode.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingMode.java @@ -27,8 +27,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.resources.language.I18n; -import java.util.Locale; - @Environment(EnvType.CLIENT) public enum ItemCheatingMode { REI_LIKE, @@ -36,6 +34,10 @@ public enum ItemCheatingMode { @Override public String toString() { - return I18n.get("config.roughlyenoughitems.itemCheatingMode." + name().toLowerCase(Locale.ROOT)); + if (this == REI_LIKE) { + return I18n.get("config.rei.value.cheats.amount.default"); + } else { + return I18n.get("config.rei.value.cheats.amount.reversed"); + } } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingStyle.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingStyle.java index 59174011c..8c49960f7 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingStyle.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/ItemCheatingStyle.java @@ -23,7 +23,6 @@ package me.shedaniel.rei.api.client.gui.config; -import me.shedaniel.clothconfig2.gui.entries.SelectionListEntry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.resources.language.I18n; @@ -31,12 +30,12 @@ import net.minecraft.client.resources.language.I18n; import java.util.Locale; @Environment(EnvType.CLIENT) -public enum ItemCheatingStyle implements SelectionListEntry.Translatable { +public enum ItemCheatingStyle { GRAB, GIVE; @Override - public String getKey() { - return I18n.get("config.roughlyenoughitems.cheatingStyle." + name().toLowerCase(Locale.ROOT)); + public String toString() { + return I18n.get("config.rei.value.cheats.method." + name().toLowerCase(Locale.ROOT)); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java index 1bde0b058..86db371be 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java @@ -57,6 +57,6 @@ public enum RecipeBorderType { @Override public String toString() { - return I18n.get("config.roughlyenoughitems.recipeBorder." + name().toLowerCase(Locale.ROOT)); + return I18n.get("config.rei.value.appearance.recipe_border." + name().toLowerCase(Locale.ROOT)); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchFieldLocation.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchFieldLocation.java index f80cb4f1b..2653bbced 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchFieldLocation.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchFieldLocation.java @@ -25,6 +25,8 @@ package me.shedaniel.rei.api.client.gui.config; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; import java.util.Locale; @@ -35,8 +37,12 @@ public enum SearchFieldLocation { BOTTOM_SIDE, TOP_SIDE; - @Override - public String toString() { - return I18n.get("config.roughlyenoughitems.layout.searchFieldLocation.%s".formatted(name().toLowerCase(Locale.ROOT))); + public String toString(boolean right) { + if (this == CENTER) return I18n.get("config.rei.value.layout.search_field_location.center"); + if (this == BOTTOM_SIDE && right) return I18n.get("config.rei.value.layout.search_field_location.bottom_right"); + if (this == BOTTOM_SIDE) return I18n.get("config.rei.value.layout.search_field_location.bottom_left"); + if (this == TOP_SIDE && right) return I18n.get("config.rei.value.layout.search_field_location.top_right"); + if (this == TOP_SIDE) return I18n.get("config.rei.value.layout.search_field_location.top_left"); + return ""; } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchMode.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchMode.java index ca634bc0b..77a9a2f88 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchMode.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SearchMode.java @@ -23,7 +23,6 @@ package me.shedaniel.rei.api.client.gui.config; -import me.shedaniel.clothconfig2.gui.entries.SelectionListEntry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.resources.language.I18n; @@ -31,13 +30,13 @@ import net.minecraft.client.resources.language.I18n; import java.util.Locale; @Environment(EnvType.CLIENT) -public enum SearchMode implements SelectionListEntry.Translatable { +public enum SearchMode { ALWAYS, PREFIX, NEVER; @Override - public String getKey() { - return I18n.get("config.roughlyenoughitems.search_mode." + name().toLowerCase(Locale.ROOT)); + public String toString() { + return I18n.get("config.rei.value.search.filters." + name().toLowerCase(Locale.ROOT)); } } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SyntaxHighlightingMode.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SyntaxHighlightingMode.java index d8388687f..e034a5b14 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SyntaxHighlightingMode.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/SyntaxHighlightingMode.java @@ -38,6 +38,6 @@ public enum SyntaxHighlightingMode { @Override public String toString() { - return I18n.get("config.roughlyenoughitems.syntaxHighlightingMode." + name().toLowerCase(Locale.ROOT)); + return I18n.get("config.rei.value.search.syntax_highlighting." + name().toLowerCase(Locale.ROOT)); } } |