Fix Profile viewer issues with Turkish language (#1116)

10 files changed, 43 insertions, 37 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index 1a50dfe4..f2af715c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -69,6 +69,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -971,7 +972,7 @@ public class CalendarOverlay {
 
 	private static String getIdForDisplayName(String displayName) {
 		return Utils.cleanColour(displayName)
-								.toLowerCase()
+								.toLowerCase(Locale.ROOT)
 								.replaceAll("[0-9]+th", "")
 								.replaceAll("[0-9]+nd", "")
 								.replaceAll("[0-9]+rd", "")
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
index 6d219999..3041ee43 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
@@ -65,6 +65,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Random;
 import java.util.regex.Matcher;
@@ -381,7 +382,7 @@ public class GuiCustomEnchant extends Gui {
 								if (enchantments != null) {
 									String enchId = Utils
 										.cleanColour(book.getDisplayName())
-										.toLowerCase()
+										.toLowerCase(Locale.ROOT)
 										.replace(" ", "_")
 										.replace("-", "_")
 										.replaceAll("[^a-z_]", "");
@@ -396,7 +397,7 @@ public class GuiCustomEnchant extends Gui {
 									}
 									Matcher levelMatcher = ENCHANT_LEVEL_PATTERN.matcher(enchId);
 									if (levelMatcher.matches()) {
-										enchLevel = Utils.parseRomanNumeral(levelMatcher.group(2).toUpperCase());
+										enchLevel = Utils.parseRomanNumeral(levelMatcher.group(2).toUpperCase(Locale.ROOT));
 										enchId = levelMatcher.group(1);
 									}
 									Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
@@ -457,7 +458,7 @@ public class GuiCustomEnchant extends Gui {
 									if (enchantments != null) {
 										String enchId = Utils
 											.cleanColour(book.getDisplayName())
-											.toLowerCase()
+											.toLowerCase(Locale.ROOT)
 											.replace(" ", "_")
 											.replace("-", "_")
 											.replaceAll("[^a-z_]", "");
@@ -466,7 +467,7 @@ public class GuiCustomEnchant extends Gui {
 										String name = Utils.cleanColour(book.getDisplayName());
 
 										if (searchField.getText().trim().isEmpty() ||
-											name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+											name.toLowerCase(Locale.ROOT).contains(searchField.getText().trim().toLowerCase(Locale.ROOT))) {
 											if (name.equalsIgnoreCase("Bane of Arthropods")) {
 												name = "Bane of Arth.";
 											} else if (name.equalsIgnoreCase("Projectile Protection")) {
@@ -512,7 +513,7 @@ public class GuiCustomEnchant extends Gui {
 					Comparator<Enchantment> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
 						Comparator.comparingInt(e -> mult * e.xpCost) :
 						(c1, c2) -> mult *
-							c1.enchId.toLowerCase().compareTo(c2.enchId.toLowerCase());
+							c1.enchId.toLowerCase(Locale.ROOT).compareTo(c2.enchId.toLowerCase(Locale.ROOT));
 					removable.sort(comparator);
 					applicable.sort(comparator);
 				}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
index 174650d9..86ea09f9 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
@@ -22,10 +22,7 @@ package io.github.moulberry.notenoughupdates.miscgui;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
-import info.bliki.api.Template;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingInteger;
 import io.github.moulberry.notenoughupdates.itemeditor.GuiElementTextField;
@@ -48,11 +45,10 @@ import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -154,8 +150,8 @@ public class GuiEnchantColour extends GuiScreen {
 			String modifier = getColourOpIndex(colourOps, 4);
 			modifiers.put(yIndex, modifier);
 
-			if (colourCode.length() > 1) colourCode = String.valueOf(colourCode.toLowerCase().charAt(0));
-			if (comparator.length() > 1) comparator = String.valueOf(comparator.toLowerCase().charAt(0));
+			if (colourCode.length() > 1) colourCode = String.valueOf(colourCode.toLowerCase(Locale.ROOT).charAt(0));
+			if (comparator.length() > 1) comparator = String.valueOf(comparator.toLowerCase(Locale.ROOT).charAt(0));
 
 			Utils.drawStringCentered(comparator, guiLeft + 96, guiTop + 33 + 25 * yIndex, false, 4210752);
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiNavigation.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiNavigation.java
index ba3f95df..6e36179a 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiNavigation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiNavigation.java
@@ -32,6 +32,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Collectors;
 
 public class GuiNavigation extends GuiScreen {
@@ -114,14 +115,14 @@ public class GuiNavigation extends GuiScreen {
 	}
 
 	private void refreshResults() {
-		String text = textField.getText().toLowerCase();
+		String text = textField.getText().toLowerCase(Locale.ROOT);
 		List<String> results = NotEnoughUpdates.INSTANCE.navigation
 			.getWaypoints()
 			.values()
 			.stream()
 			.filter(it ->
-				it.get("internalname").getAsString().toLowerCase().contains(text)
-					|| it.get("displayname").getAsString().toLowerCase().contains(text))
+				it.get("internalname").getAsString().toLowerCase(Locale.ROOT).contains(text)
+					|| it.get("displayname").getAsString().toLowerCase(Locale.ROOT).contains(text))
 			.map(it -> it.get("internalname").getAsString())
 			.sorted(Comparator.comparing(String::length)
 												.thenComparing(String.CASE_INSENSITIVE_ORDER))
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
index 1da81605..f2b7b1c8 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
@@ -72,6 +72,7 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Random;
 import java.util.regex.Matcher;
@@ -116,7 +117,7 @@ public class GuiCustomHex extends Gui {
 				}
 			}
 			JsonObject bazaarInfo = NotEnoughUpdates.INSTANCE.manager.auctionManager.getBazaarInfo(
-				(isUlt ? "ULTIMATE_" : "") + enchId.toUpperCase() + ";" + level);
+				(isUlt ? "ULTIMATE_" : "") + enchId.toUpperCase(Locale.ROOT) + ";" + level);
 			if (bazaarInfo != null && bazaarInfo.get("curr_buy") != null) {
 				this.price = bazaarInfo.get("curr_buy").getAsInt();
 			}
@@ -476,7 +477,7 @@ public class GuiCustomHex extends Gui {
 								if (enchantments != null) {
 									String enchId = Utils
 										.cleanColour(book.getDisplayName())
-										.toLowerCase()
+										.toLowerCase(Locale.ROOT)
 										.replace(" ", "_")
 										.replace("-", "_")
 										.replaceAll("[^a-z_]", "");
@@ -493,7 +494,7 @@ public class GuiCustomHex extends Gui {
 									}
 									Matcher levelMatcher = ENCHANT_LEVEL_PATTERN.matcher(enchId);
 									if (levelMatcher.matches()) {
-										enchLevel = Utils.parseRomanNumeral(levelMatcher.group(2).toUpperCase());
+										enchLevel = Utils.parseRomanNumeral(levelMatcher.group(2).toUpperCase(Locale.ROOT));
 										enchId = levelMatcher.group(1);
 									}
 									Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
@@ -595,7 +596,7 @@ public class GuiCustomHex extends Gui {
 									if (enchantments != null) {
 										String enchId = Utils
 											.cleanColour(book.getDisplayName())
-											.toLowerCase()
+											.toLowerCase(Locale.ROOT)
 											.replace(" ", "_")
 											.replace("-", "_")
 											.replaceAll("[^a-z_]", "");
@@ -604,7 +605,7 @@ public class GuiCustomHex extends Gui {
 										String name = Utils.cleanColour(book.getDisplayName());
 
 										if (searchField.getText().trim().isEmpty() ||
-											name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+											name.toLowerCase(Locale.ROOT).contains(searchField.getText().trim().toLowerCase(Locale.ROOT))) {
 											if (name.equalsIgnoreCase("Bane of Arthropods")) {
 												name = "Bane of Arth.";
 											} else if (name.equalsIgnoreCase("Projectile Protection")) {
@@ -650,7 +651,7 @@ public class GuiCustomHex extends Gui {
 					Comparator<Enchantment> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
 						Comparator.comparingInt(e -> mult * e.xpCost) :
 						(c1, c2) -> mult *
-							c1.enchId.toLowerCase().compareTo(c2.enchId.toLowerCase());
+							c1.enchId.toLowerCase(Locale.ROOT).compareTo(c2.enchId.toLowerCase(Locale.ROOT));
 					removable.sort(comparator);
 					applicable.sort(comparator);
 				}
@@ -798,7 +799,7 @@ public class GuiCustomHex extends Gui {
 						if (ea != null) {
 							NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
 							if (enchantments != null) {
-								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase().replace(" ", "_").replace(
+								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase(Locale.ROOT).replace(" ", "_").replace(
 									"-",
 									"_"
 								);
@@ -806,7 +807,7 @@ public class GuiCustomHex extends Gui {
 								if (itemId.equalsIgnoreCase("_")) continue;
 								if (itemId.equalsIgnoreCase("Item_Maxed_Out")) continue;
 								if (searchField.getText().trim().isEmpty() ||
-									name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+									name.toLowerCase(Locale.ROOT).contains(searchField.getText().trim().toLowerCase(Locale.ROOT))) {
 									name = fixName(name);
 									/*if (playerEnchantIds.containsKey(itemId)) {
 										HexItem item = new HexItem(slotIndex, name, itemId,
@@ -966,7 +967,7 @@ public class GuiCustomHex extends Gui {
 			Comparator<HexItem> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
 				Comparator.comparingInt(e -> (int) (mult * e.price)) :
 				(c1, c2) -> mult *
-					c1.itemId.toLowerCase().compareTo(c2.itemId.toLowerCase());
+					c1.itemId.toLowerCase(Locale.ROOT).compareTo(c2.itemId.toLowerCase(Locale.ROOT));
 			removableItem.sort(comparator);
 			applicableItem.sort(comparator);
 		}
@@ -1040,7 +1041,7 @@ public class GuiCustomHex extends Gui {
 						if (ea != null) {
 							NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
 							if (enchantments != null) {
-								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase().replace(" ", "_").replace(
+								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase(Locale.ROOT).replace(" ", "_").replace(
 									"-",
 									"_"
 								);
@@ -1048,7 +1049,7 @@ public class GuiCustomHex extends Gui {
 								if (itemId.equalsIgnoreCase("_")) continue;
 								if (itemId.equalsIgnoreCase("Item_Maxed_Out")) continue;
 								if (searchField.getText().trim().isEmpty() ||
-									name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+									name.toLowerCase(Locale.ROOT).contains(searchField.getText().trim().toLowerCase(Locale.ROOT))) {
 									if (name.equalsIgnoreCase("Ultimate Enchantments")) {
 										name = "Ult Enchants";
 									}
@@ -1085,7 +1086,7 @@ public class GuiCustomHex extends Gui {
 			Comparator<HexItem> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
 				Comparator.comparingInt(e -> (int) (mult * e.price)) :
 				(c1, c2) -> mult *
-					c1.itemId.toLowerCase().compareTo(c2.itemId.toLowerCase());
+					c1.itemId.toLowerCase(Locale.ROOT).compareTo(c2.itemId.toLowerCase(Locale.ROOT));
 			removableItem.sort(comparator);
 			applicableItem.sort(comparator);
 		}
@@ -1187,7 +1188,7 @@ public class GuiCustomHex extends Gui {
 						if (ea != null) {
 							NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
 							if (enchantments != null) {
-								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase().replace(" ", "_").replace(
+								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase(Locale.ROOT).replace(" ", "_").replace(
 									"-",
 									"_"
 								);
@@ -1195,7 +1196,7 @@ public class GuiCustomHex extends Gui {
 								if (itemId.equalsIgnoreCase("_")) continue;
 								if (itemId.equalsIgnoreCase("Item_Maxed_Out")) continue;
 								if (searchField.getText().trim().isEmpty() ||
-									name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+									name.toLowerCase(Locale.ROOT).contains(searchField.getText().trim().toLowerCase(Locale.ROOT))) {
 									/*if (playerEnchantIds.containsKey(itemId)) {
 										HexItem item = new HexItem(slotIndex, name, itemId,
 											Utils.getRawTooltip(book), false, false
@@ -1247,7 +1248,7 @@ public class GuiCustomHex extends Gui {
 			Comparator<HexItem> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
 				Comparator.comparingInt(e -> (int) (mult * e.price)) :
 				(c1, c2) -> mult *
-					c1.itemId.toLowerCase().compareTo(c2.itemId.toLowerCase());
+					c1.itemId.toLowerCase(Locale.ROOT).compareTo(c2.itemId.toLowerCase(Locale.ROOT));
 			removableItem.sort(comparator);
 			applicableItem.sort(comparator);
 		}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java
index 8d28dd1d..ab871888 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java
@@ -26,6 +26,7 @@ import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.util.StringUtils;
 
 import java.util.List;
+import java.util.Locale;
 
 public class HexItem {
 	public int slotIndex;
@@ -255,8 +256,8 @@ public class HexItem {
 
 	public String getReforge() {
 		JsonObject reforgeStones = Constants.REFORGESTONES;
-		if (reforgeStones != null && reforgeStones.has(this.itemId.toUpperCase())) {
-			JsonObject reforgeInfo = reforgeStones.get(this.itemId.toUpperCase()).getAsJsonObject();
+		if (reforgeStones != null && reforgeStones.has(this.itemId.toUpperCase(Locale.ROOT))) {
+			JsonObject reforgeInfo = reforgeStones.get(this.itemId.toUpperCase(Locale.ROOT)).getAsJsonObject();
 			if (reforgeInfo != null) {
 				return Utils.getElementAsString(reforgeInfo.get("reforgeName"), "");
 			}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/MinionHelperManager.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/MinionHelperManager.java
index 03eb227c..16ad9d00 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/MinionHelperManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/MinionHelperManager.java
@@ -40,6 +40,7 @@ import net.minecraftforge.common.MinecraftForge;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 @NEUAutoSubscribe
@@ -123,7 +124,7 @@ public class MinionHelperManager {
 	}
 
 	public String formatInternalName(String minionName) {
-		return minionName.toUpperCase().replace(" ", "_");
+		return minionName.toUpperCase(Locale.ROOT).replace(" ", "_");
 	}
 
 	private List<Minion> getChildren(Minion minion) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/repo/MinionHelperRepoMinionLoader.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/repo/MinionHelperRepoMinionLoader.java
index 6abc5c56..8d2aaaf4 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/repo/MinionHelperRepoMinionLoader.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/loaders/repo/MinionHelperRepoMinionLoader.java
@@ -31,6 +31,7 @@ import io.github.moulberry.notenoughupdates.miscgui.minionhelper.requirements.Sl
 import io.github.moulberry.notenoughupdates.miscgui.minionhelper.sources.CraftingSource;
 import io.github.moulberry.notenoughupdates.util.Utils;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.regex.Pattern;
@@ -97,7 +98,7 @@ public class MinionHelperRepoMinionLoader {
 						}
 						case "slayer_req": {
 							String[] split = value.split("_");
-							String slayerType = split[0].toLowerCase();
+							String slayerType = split[0].toLowerCase(Locale.ROOT);
 							int tier = Integer.parseInt(split[1]);
 							minion.getRequirements().add(new SlayerRequirement(slayerType, tier));
 							break;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/render/MinionHelperOverlayHover.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/render/MinionHelperOverlayHover.java
index 18b26754..df3559ba 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/render/MinionHelperOverlayHover.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/render/MinionHelperOverlayHover.java
@@ -45,6 +45,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class MinionHelperOverlayHover {
@@ -227,7 +228,7 @@ public class MinionHelperOverlayHover {
 				int need = reputationRequirement.getReputation();
 				if (having < 0) having = 0;
 
-				String reputationName = StringUtils.firstUpperLetter(reputationType.toLowerCase());
+				String reputationName = StringUtils.firstUpperLetter(reputationType.toLowerCase(Locale.ROOT));
 				String havingFormat = Utils.formatNumberWithDots(having);
 				String needFormat = Utils.formatNumberWithDots(need);
 				description = "Reputation: §c" + havingFormat + "§8/§c" + needFormat + " §7" + reputationName + " Reputation";
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/requirements/ReputationRequirement.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/requirements/ReputationRequirement.java
index 70d1e5fc..8aaad623 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/requirements/ReputationRequirement.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/minionhelper/requirements/ReputationRequirement.java
@@ -22,6 +22,8 @@ package io.github.moulberry.notenoughupdates.miscgui.minionhelper.requirements;
 import io.github.moulberry.notenoughupdates.core.util.StringUtils;
 import io.github.moulberry.notenoughupdates.util.Utils;
 
+import java.util.Locale;
+
 public class ReputationRequirement extends MinionRequirement {
 
 	private final String reputationType;
@@ -32,7 +34,7 @@ public class ReputationRequirement extends MinionRequirement {
 		this.reputationType = reputationType;
 		this.reputation = reputation;
 
-		String reputationName = StringUtils.firstUpperLetter(reputationType.toLowerCase());
+		String reputationName = StringUtils.firstUpperLetter(reputationType.toLowerCase(Locale.ROOT));
 		description = Utils.formatNumberWithDots(reputation) + " §7" + reputationName + " Reputation";
 	}