From 8f7f41e914a214242e85c94326bb143c3a5e37df Mon Sep 17 00:00:00 2001 From: 7777777-4547 Date: Sun, 18 Feb 2024 02:01:55 +0800 Subject: [PATCH] Make some strings translatable. --- .../mods/sodium/client/gui/SodiumGameOptionPages.java | 2 +- .../client/gui/options/control/ControlValueFormatter.java | 7 +++++-- src/main/resources/assets/sodium/lang/en_us.json | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/caffeinemc/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/net/caffeinemc/mods/sodium/client/gui/SodiumGameOptionPages.java index d86625ea2f..caa4acaff0 100644 --- a/src/main/java/net/caffeinemc/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/net/caffeinemc/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -248,7 +248,7 @@ public static OptionPage performance() { .add(OptionImpl.createBuilder(int.class, sodiumOpts) .setName(Component.translatable("sodium.options.chunk_update_threads.name")) .setTooltip(Component.translatable("sodium.options.chunk_update_threads.tooltip")) - .setControl(o -> new SliderControl(o, 0, Runtime.getRuntime().availableProcessors(), 1, ControlValueFormatter.quantityOrDisabled("threads", "Default"))) + .setControl(o -> new SliderControl(o, 0, Runtime.getRuntime().availableProcessors(), 1, ControlValueFormatter.quantityOrDisabled("sodium.options.chunk_update_threads.value", "options.gamma.default"))) .setImpact(OptionImpact.HIGH) .setBinding((opts, value) -> opts.performance.chunkBuilderThreads = value, opts -> opts.performance.chunkBuilderThreads) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) diff --git a/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/ControlValueFormatter.java b/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/ControlValueFormatter.java index e72a682b1b..4ce1072fc9 100644 --- a/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/ControlValueFormatter.java +++ b/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/ControlValueFormatter.java @@ -15,6 +15,8 @@ static ControlValueFormatter brightness() { return (v) -> { if (v == 0) { return Component.translatable("options.gamma.min"); + } else if (v == 50) { + return Component.translatable("options.gamma.default"); } else if (v == 100) { return Component.translatable("options.gamma.max"); } else { @@ -23,6 +25,7 @@ static ControlValueFormatter brightness() { }; } + static ControlValueFormatter biomeBlend() { return (v) -> (v == 0) ? Component.translatable("gui.none") : Component.translatable("sodium.options.biome_blend.value", v); } @@ -41,8 +44,8 @@ static ControlValueFormatter multiplier() { return (v) -> Component.literal(v + "x"); } - static ControlValueFormatter quantityOrDisabled(String name, String disableText) { - return (v) -> Component.literal(v == 0 ? disableText : v + " " + name); + static ControlValueFormatter quantityOrDisabled(String valueKey, String disableText) { + return (v) -> v == 0 ? Component.translatable(disableText) : Component.translatable(valueKey, v); } static ControlValueFormatter number() { diff --git a/src/main/resources/assets/sodium/lang/en_us.json b/src/main/resources/assets/sodium/lang/en_us.json index 79a6be914a..59b56b7f83 100644 --- a/src/main/resources/assets/sodium/lang/en_us.json +++ b/src/main/resources/assets/sodium/lang/en_us.json @@ -47,6 +47,7 @@ "sodium.options.use_persistent_mapping.tooltip": "For debugging only. If enabled, persistent memory mappings will be used for the staging buffer so that unnecessary memory copies can be avoided. Disabling this can be useful for narrowing down the cause of graphical corruption.\n\nRequires OpenGL 4.4 or ARB_buffer_storage.", "sodium.options.chunk_update_threads.name": "Chunk Update Threads", "sodium.options.chunk_update_threads.tooltip": "Specifies the number of threads to use for chunk building and sorting. Using more threads can speed up chunk loading and update speed, but may negatively impact frame times. The default value is usually good enough for all situations.", + "sodium.options.chunk_update_threads.value": "%s thread(s)", "sodium.options.always_defer_chunk_updates.name": "Always Defer Chunk Updates", "sodium.options.always_defer_chunk_updates.tooltip": "If enabled, rendering will never wait for chunk updates to finish, even if they are important. This can greatly improve frame rates in some scenarios, but it may create significant visual lag where blocks take a while to appear or disappear.", "sodium.options.sort_behavior.name": "Translucency Sorting",