EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-01 06:36:23 +02:00
Code Issues Projects Releases Wiki Activity

fix other places where locale might matter

Browse Source
This commit is contained in:
nossr50 2025-05-26 13:07:50 -07:00
parent ce7461f459
commit 27a232d03e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
View File

@ -44,7 +44,7 @@ public class SalvageConfig extends BukkitConfig {
if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.FIX_NETHERITE_SALVAGE_QUANTITIES)) { 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..."); mcMMO.p.getLogger().log(Level.INFO, "Fixing incorrect Salvage quantities on Netherite gear, this will only run once...");
for (String namespacedkey : mcMMO.getMaterialMapStore().getNetheriteArmor()) { 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 { try {

5
src/main/java/com/gmail/nossr50/util/ItemUtils.java
View File

@ -30,6 +30,7 @@ import java.lang.reflect.Method;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.function.Predicate; import java.util.function.Predicate;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
@ -111,12 +112,12 @@ public final class ItemUtils {
// try to match to Material ENUM // try to match to Material ENUM
if (material == null) { if (material == null) {
material = Material.getMaterial(materialName.toUpperCase()); material = Material.getMaterial(materialName.toUpperCase(Locale.ENGLISH));
} }
// try to match to Material ENUM with legacy name // try to match to Material ENUM with legacy name
if (material == null) { if (material == null) {
material = Material.getMaterial(materialName.toUpperCase(), true); material = Material.getMaterial(materialName.toUpperCase(Locale.ENGLISH), true);
} }
return material; return material;
} }