Skip to content

Commit 9827432

Browse files
shs3131FlashyReese
andauthored
Update fog type option IDs to use Locale.ROOT (#493)
- Resolves #492 * Update fog type option IDs to use Locale.ROOT Fixes crash on systems using Turkish locale. String identifiers were generated using String#toLowerCase(), which is locale-sensitive and caused invalid characters (I → ı). This change uses Locale.ROOT to ensure consistent behavior. * change: Fix import --------- Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
1 parent 2743202 commit 9827432

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

common/src/main/java/me/flashyreese/mods/sodiumextra/client/config/SodiumExtraConfig.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
import net.minecraft.resources.Identifier;
1818
import net.minecraft.world.level.material.FogType;
1919

20-
import java.util.ArrayList;
21-
import java.util.Arrays;
22-
import java.util.Comparator;
23-
import java.util.List;
20+
import java.util.*;
2421
import java.util.stream.Collectors;
2522

2623
public class SodiumExtraConfig implements ConfigEntryPoint {
@@ -311,7 +308,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
311308
.filter(type -> type != FogType.NONE)
312309
.forEach(fogType -> {
313310
// Environment Start
314-
IntegerOptionBuilder envStart = builder.createIntegerOption(id(fogType.name().toLowerCase() + "_environment_start"))
311+
IntegerOptionBuilder envStart = builder.createIntegerOption(id(fogType.name().toLowerCase(Locale.ROOT) + "_environment_start"))
315312
.setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.fog").isEnabled())
316313
.setName(Component.translatable("sodium-extra.option.fog_type.environment_start", fogTypeName(fogType)))
317314
.setTooltip(Component.translatable("sodium-extra.option.fog_type.environment_start.tooltip"))
@@ -326,7 +323,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
326323
.setValueFormatter(ControlValueFormatterImpls.percentage());
327324

328325
// Environment End
329-
IntegerOptionBuilder envEnd = builder.createIntegerOption(id(fogType.name().toLowerCase() + "_environment_end"))
326+
IntegerOptionBuilder envEnd = builder.createIntegerOption(id(fogType.name().toLowerCase(Locale.ROOT) + "_environment_end"))
330327
.setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.fog").isEnabled())
331328
.setName(Component.translatable("sodium-extra.option.fog_type.environment_end", fogTypeName(fogType)))
332329
.setTooltip(Component.translatable("sodium-extra.option.fog_type.environment_end.tooltip"))
@@ -341,7 +338,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
341338
.setValueFormatter(ControlValueFormatterImpls.percentage());
342339

343340
// Render Start
344-
IntegerOptionBuilder renderStart = builder.createIntegerOption(id(fogType.name().toLowerCase() + "_render_distance_start"))
341+
IntegerOptionBuilder renderStart = builder.createIntegerOption(id(fogType.name().toLowerCase(Locale.ROOT) + "_render_distance_start"))
345342
.setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.fog").isEnabled())
346343
.setName(Component.translatable("sodium-extra.option.fog_type.render_distance_start", fogTypeName(fogType)))
347344
.setTooltip(Component.translatable("sodium-extra.option.fog_type.render_distance_start.tooltip"))
@@ -356,7 +353,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
356353
.setValueFormatter(ControlValueFormatterImpls.percentage());
357354

358355
// Render End
359-
IntegerOptionBuilder renderEnd = builder.createIntegerOption(id(fogType.name().toLowerCase() + "_render_distance_end"))
356+
IntegerOptionBuilder renderEnd = builder.createIntegerOption(id(fogType.name().toLowerCase(Locale.ROOT) + "_render_distance_end"))
360357
.setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.fog").isEnabled())
361358
.setName(Component.translatable("sodium-extra.option.fog_type.render_distance_end", fogTypeName(fogType)))
362359
.setTooltip(Component.translatable("sodium-extra.option.fog_type.render_distance_end.tooltip"))
@@ -371,7 +368,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
371368
.setValueFormatter(ControlValueFormatterImpls.percentage());
372369

373370
// Sky End
374-
IntegerOptionBuilder skyEnd = builder.createIntegerOption(id(fogType.name().toLowerCase() + "_sky_end"))
371+
IntegerOptionBuilder skyEnd = builder.createIntegerOption(id(fogType.name().toLowerCase(Locale.ROOT) + "_sky_end"))
375372
.setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.fog").isEnabled())
376373
.setName(Component.translatable("sodium-extra.option.fog_type.sky_end", fogTypeName(fogType)))
377374
.setTooltip(Component.translatable("sodium-extra.option.fog_type.sky_end.tooltip"))
@@ -386,7 +383,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
386383
.setValueFormatter(ControlValueFormatterImpls.percentage());
387384

388385

389-
IntegerOptionBuilder cloudEnd = builder.createIntegerOption(id(fogType.name().toLowerCase() + "_cloud_end"))
386+
IntegerOptionBuilder cloudEnd = builder.createIntegerOption(id(fogType.name().toLowerCase(Locale.ROOT) + "_cloud_end"))
390387
.setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.fog").isEnabled())
391388
.setName(Component.translatable("sodium-extra.option.fog_type.cloud_end", fogTypeName(fogType)))
392389
.setTooltip(Component.translatable("sodium-extra.option.fog_type.cloud_end.tooltip"))
@@ -402,7 +399,7 @@ private OptionPageBuilder createRenderPage(ConfigBuilder builder) {
402399

403400
// Add group
404401
fogGroups.add(builder.createOptionGroup()
405-
.addOption(builder.createBooleanOption(id(fogType.name().toLowerCase() + "_fog"))
402+
.addOption(builder.createBooleanOption(id(fogType.name().toLowerCase(Locale.ROOT) + "_fog"))
406403
.setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.fog").isEnabled())
407404
.setName(fogTypeName(fogType))
408405
.setTooltip(fogTypeTooltip(fogType))

0 commit comments

Comments
 (0)