From 27a232d03ec056a45f16e2cf009daad376fc0bd0 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 26 May 2025 13:07:50 -0700 Subject: [PATCH] fix other places where locale might matter --- .../gmail/nossr50/config/skills/salvage/SalvageConfig.java | 2 +- src/main/java/com/gmail/nossr50/util/ItemUtils.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java index 48435581d..7d7ba2964 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java @@ -44,7 +44,7 @@ public class SalvageConfig extends BukkitConfig { if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.FIX_NETHERITE_SALVAGE_QUANTITIES)) { mcMMO.p.getLogger().log(Level.INFO, "Fixing incorrect Salvage quantities on Netherite gear, this will only run once..."); for (String namespacedkey : mcMMO.getMaterialMapStore().getNetheriteArmor()) { - config.set("Salvageables." + namespacedkey.toUpperCase() + ".MaximumQuantity", 4); //TODO: Doesn't make sense to default to 4 for everything + config.set("Salvageables." + namespacedkey.toUpperCase(Locale.ENGLISH) + ".MaximumQuantity", 4); //TODO: Doesn't make sense to default to 4 for everything } try { diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java index c13e473a1..74ef4d807 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java @@ -30,6 +30,7 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.function.Predicate; import static java.util.Objects.requireNonNull; @@ -111,12 +112,12 @@ public final class ItemUtils { // try to match to Material ENUM if (material == null) { - material = Material.getMaterial(materialName.toUpperCase()); + material = Material.getMaterial(materialName.toUpperCase(Locale.ENGLISH)); } // try to match to Material ENUM with legacy name if (material == null) { - material = Material.getMaterial(materialName.toUpperCase(), true); + material = Material.getMaterial(materialName.toUpperCase(Locale.ENGLISH), true); } return material; }