Fix Profile viewer issues with Turkish language (#1116)

4 files changed, 23 insertions, 20 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java
index cc974841..c013ba06 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java
@@ -48,6 +48,7 @@ import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.function.BiFunction;
 
@@ -234,7 +235,7 @@ public class ItemUtils {
 			return stack;
 		}
 		String petname = currentPet.petType;
-		String tier = Utils.getRarityFromInt(currentPet.rarity.petId).toUpperCase();
+		String tier = Utils.getRarityFromInt(currentPet.rarity.petId).toUpperCase(Locale.ROOT);
 		String heldItem = currentPet.petItem;
 		String skin = currentPet.skin;
 		JsonObject heldItemJson = heldItem == null ? null : NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(
@@ -410,13 +411,13 @@ public class ItemUtils {
 					NBTTagList newLore = new NBTTagList();
 					int maxLvl = 100;
 					if (Constants.PETS != null && Constants.PETS.has("custom_pet_leveling") &&
-						Constants.PETS.getAsJsonObject("custom_pet_leveling").has(pet.petType.toUpperCase()) &&
-						Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(pet.petType.toUpperCase()).has(
+						Constants.PETS.getAsJsonObject("custom_pet_leveling").has(pet.petType.toUpperCase(Locale.ROOT)) &&
+						Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(pet.petType.toUpperCase(Locale.ROOT)).has(
 							"max_level")) {
 						maxLvl =
 							Constants.PETS
 								.getAsJsonObject("custom_pet_leveling")
-								.getAsJsonObject(pet.petType.toUpperCase())
+								.getAsJsonObject(pet.petType.toUpperCase(Locale.ROOT))
 								.get("max_level")
 								.getAsInt();
 					}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
index 86799147..ebcae9c6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
@@ -351,7 +351,7 @@ public class SBInfo {
 //				if (matcher.find()) {
 //					try {
 //						int level = Integer.parseInt(matcher.group(2).trim());
-//						XPInformation.getInstance().updateLevel(matcher.group(1).toLowerCase().trim(), level);
+//						XPInformation.getInstance().updateLevel(matcher.group(1).toLowerCase(Locale.ROOT).trim(), level);
 //					} catch (Exception ignored) {
 //					}
 //				}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java b/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
index 6b597ebe..fee8c594 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
@@ -97,6 +97,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.regex.Matcher;
@@ -673,7 +674,7 @@ public class Utils {
 	}
 
 	public static String prettyCase(String str) {
-		return str.substring(0, 1).toUpperCase() + str.substring(1).toLowerCase();
+		return str.substring(0, 1).toUpperCase(Locale.ROOT) + str.substring(1).toLowerCase(Locale.ROOT);
 	}
 
 	public static String getRarityFromInt(int rarity) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
index 8336fbd0..ab8ece6c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
@@ -35,6 +35,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -78,8 +79,8 @@ public class XPInformation {
 	}
 
 	public @Nullable SkillInfo getSkillInfo(String skillName, boolean isHighlyInterested) {
-		var obj = skillInfoMap.get(skillName.toLowerCase());
-		if (isHighlyInterested && failedSkills.contains(skillName.toLowerCase())) {
+		var obj = skillInfoMap.get(skillName.toLowerCase(Locale.ROOT));
+		if (isHighlyInterested && failedSkills.contains(skillName.toLowerCase(Locale.ROOT))) {
 			TablistAPI.getWidgetLines(TablistAPI.WidgetNames.SKILLS);
 		}
 		return obj;
@@ -130,7 +131,7 @@ public class XPInformation {
 					skillInfo.level++;
 				}
 
-				skillInfoMap.put(skillS.toLowerCase(), skillInfo);
+				skillInfoMap.put(skillS.toLowerCase(Locale.ROOT), skillInfo);
 				return;
 			} else {
 				matcher = SKILL_PATTERN_PERCENTAGE.matcher(component);
@@ -139,11 +140,11 @@ public class XPInformation {
 					String xpPercentageS = matcher.group(3).replace(",", "");
 
 					float xpPercentage = Float.parseFloat(xpPercentageS);
-					if (updateWithPercentage.containsKey(skillS.toLowerCase())) {
-						failedSkills.add(skillS.toLowerCase());
+					if (updateWithPercentage.containsKey(skillS.toLowerCase(Locale.ROOT))) {
+						failedSkills.add(skillS.toLowerCase(Locale.ROOT));
 					}
-					updateWithPercentage.put(skillS.toLowerCase(), xpPercentage);
-					increment.put(skillS.toLowerCase(), Float.parseFloat(matcher.group(1).replace(",", "")));
+					updateWithPercentage.put(skillS.toLowerCase(Locale.ROOT), xpPercentage);
+					increment.put(skillS.toLowerCase(Locale.ROOT), Float.parseFloat(matcher.group(1).replace(",", "")));
 				} else {
 					matcher = SKILL_PATTERN_MULTIPLIER.matcher(component);
 
@@ -183,7 +184,7 @@ public class XPInformation {
 							skillInfo.level++;
 						}
 
-						skillInfoMap.put(skillS.toLowerCase(), skillInfo);
+						skillInfoMap.put(skillS.toLowerCase(Locale.ROOT), skillInfo);
 						return;
 					}
 				}
@@ -213,7 +214,7 @@ public class XPInformation {
 			var amountAsNumber = amount != null ? Double.parseDouble(amount.replace(",", "")) : null;
 			var isMax = matcher.group("max") != null;
 			// TODO: use this extra information for good (not evil)
-			updateLevel(type.toLowerCase(), level);
+			updateLevel(type.toLowerCase(Locale.ROOT), level);
 		}
 	}
 
@@ -239,8 +240,8 @@ public class XPInformation {
 				}
 			}
 
-			SkillInfo oldSkillInfo = skillInfoMap.get(skill.toLowerCase());
-			float inc = increment.getOrDefault(skill.toLowerCase(), 0F);
+			SkillInfo oldSkillInfo = skillInfoMap.get(skill.toLowerCase(Locale.ROOT));
+			float inc = increment.getOrDefault(skill.toLowerCase(Locale.ROOT), 0F);
 			if (oldSkillInfo != null && oldSkillInfo.totalXp + inc > newSkillInfo.totalXp && oldSkillInfo.totalXp - inc * 5 < newSkillInfo.totalXp) {
 				SkillInfo incrementedSkillInfo = new SkillInfo();
 				incrementedSkillInfo.totalXp = oldSkillInfo.totalXp + inc;
@@ -253,11 +254,11 @@ public class XPInformation {
 					incrementedSkillInfo.level < levelingArray.size() && incrementedSkillInfo.level >= 0
 						? levelingArray.get(incrementedSkillInfo.level).getAsFloat()
 						: 0F;
-				skillInfoMap.put(skill.toLowerCase(), incrementedSkillInfo);
+				skillInfoMap.put(skill.toLowerCase(Locale.ROOT), incrementedSkillInfo);
 			} else {
-				skillInfoMap.put(skill.toLowerCase(), newSkillInfo);
+				skillInfoMap.put(skill.toLowerCase(Locale.ROOT), newSkillInfo);
 			}
-			failedSkills.remove(skill.toLowerCase());
+			failedSkills.remove(skill.toLowerCase(Locale.ROOT));
 		}
 		updateWithPercentage.clear();
 	}