From 8b6f6708c6fd888ab90c802e7995862a23a9a4c1 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sat, 28 Jun 2025 01:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E4=B8=8BtoUpper/LowerCase=E7=9A=84=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/data/launchable/LaunchableEntityTool.java | 5 +++-- src/main/java/com/atsuishio/superbwarfare/perk/Perk.java | 4 +++- src/main/java/com/atsuishio/superbwarfare/tools/Ammo.java | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/data/launchable/LaunchableEntityTool.java b/src/main/java/com/atsuishio/superbwarfare/data/launchable/LaunchableEntityTool.java index da98b758e..295fadd8a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/data/launchable/LaunchableEntityTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/launchable/LaunchableEntityTool.java @@ -15,6 +15,7 @@ import org.jetbrains.annotations.Nullable; import java.io.InputStreamReader; import java.util.HashMap; +import java.util.Locale; @EventBusSubscriber(modid = Mod.MODID) public class LaunchableEntityTool { @@ -94,9 +95,9 @@ public class LaunchableEntityTool { case "@sbw:damage" -> DoubleTag.valueOf(data.damage()); case "@sbw:owner" -> NbtUtils.createUUID(data.shooter()); case "@sbw:owner_string_lower" -> - StringTag.valueOf(data.shooter().toString().replace("-", "").toLowerCase()); + StringTag.valueOf(data.shooter().toString().replace("-", "").toLowerCase(Locale.ENGLISH)); case "@sbw:owner_string_upper" -> - StringTag.valueOf(data.shooter().toString().replace("-", "").toUpperCase()); + StringTag.valueOf(data.shooter().toString().replace("-", "").toUpperCase(Locale.ENGLISH)); case "@sbw:explosion_damage" -> DoubleTag.valueOf(data.explosionDamage()); case "@sbw:explosion_radius" -> DoubleTag.valueOf(data.explosionRadius()); case "@sbw:spread" -> DoubleTag.valueOf(data.spread()); diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java b/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java index 720503451..a52a929d3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/Perk.java @@ -12,6 +12,8 @@ import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredHolder; import org.jetbrains.annotations.Nullable; +import java.util.Locale; + public class Perk { public final String descriptionId; @@ -28,7 +30,7 @@ public class Perk { boolean isFirst = true; for (char c : descriptionId.toCharArray()) { if (isFirst || useUpperCase) { - builder.append(Character.toUpperCase(c)); + builder.append(String.valueOf(c).toUpperCase(Locale.ENGLISH)); isFirst = false; useUpperCase = false; } else if (c == '_') { diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/Ammo.java b/src/main/java/com/atsuishio/superbwarfare/tools/Ammo.java index ea9a11be1..c58ff17b6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/Ammo.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/Ammo.java @@ -9,6 +9,8 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.registries.DeferredHolder; +import java.util.Locale; + public enum Ammo { HANDGUN(ChatFormatting.GREEN), RIFLE(ChatFormatting.AQUA), @@ -40,7 +42,7 @@ public enum Ammo { Ammo(ChatFormatting color) { this.color = color; - var name = name().toLowerCase(); + var name = name().toLowerCase(Locale.ENGLISH); this.name = name; this.translationKey = "item.superbwarfare.ammo." + name; @@ -51,7 +53,7 @@ public enum Ammo { if (c == '_') { useUpperCase = true; } else if (useUpperCase) { - builder.append(Character.toUpperCase(c)); + builder.append(String.valueOf(c).toUpperCase(Locale.ENGLISH)); useUpperCase = false; } else { builder.append(c);