diff options
| author | NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> | 2024-04-27 06:23:28 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-26 22:23:28 +0200 |
| commit | b3ca5b1ffc698ede14d4e9d8ed2dc86711201de1 (patch) | |
| tree | b30f23c9745bfc66c721e7bfdb440a336142871a | |
| parent | d3106bf41e099d329d9db330ab09e167519fce25 (diff) | |
| download | NotEnoughUpdates-b3ca5b1ffc698ede14d4e9d8ed2dc86711201de1.tar.gz NotEnoughUpdates-b3ca5b1ffc698ede14d4e9d8ed2dc86711201de1.tar.bz2 NotEnoughUpdates-b3ca5b1ffc698ede14d4e9d8ed2dc86711201de1.zip | |
Fix Profile viewer issues with Turkish language (#1116)
40 files changed, 152 insertions, 119 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java index cf95b081..e41ea9df 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java @@ -495,8 +495,8 @@ public class NEUManager { int lastStringMatch = -1; ArrayList<DebugMatch> debugMatches = new ArrayList<>(); - toSearch = cleanForTitleMapSearch(toSearch).toLowerCase(); - query = cleanForTitleMapSearch(query).toLowerCase(); + toSearch = cleanForTitleMapSearch(toSearch).toLowerCase(Locale.ROOT); + query = cleanForTitleMapSearch(query).toLowerCase(Locale.ROOT); String[] splitToSearch = toSearch.split(" "); String[] queryArray = query.split(" "); @@ -683,7 +683,7 @@ public class NEUManager { results.addAll(new TreeSet<>(search(query, loreWordMap))); } else if (query.startsWith("id:")) { query = query.substring(3); - results.addAll(new TreeSet<>(subMapWithKeysThatAreSuffixes(query.toUpperCase(), itemMap).keySet())); + results.addAll(new TreeSet<>(subMapWithKeysThatAreSuffixes(query.toUpperCase(Locale.ROOT), itemMap).keySet())); } else { if (!query.trim().contains(" ")) { StringBuilder sb = new StringBuilder(); @@ -716,7 +716,7 @@ public class NEUManager { public Set<String> search(String query, TreeMap<String, HashMap<String, List<Integer>>> wordMap) { HashMap<String, List<Integer>> matches = null; - query = cleanForTitleMapSearch(query).toLowerCase(); + query = cleanForTitleMapSearch(query).toLowerCase(Locale.ROOT); for (String queryWord : query.split(" ")) { HashMap<String, List<Integer>> matchesToKeep = new HashMap<>(); for (HashMap<String, List<Integer>> wordMatches : subMapWithKeysThatAreSuffixes(queryWord, wordMap).values()) { @@ -871,7 +871,7 @@ public class NEUManager { } public static String cleanForTitleMapSearch(String str) { - return str.replaceAll("(\u00a7.)|[^#0-9a-zA-Z ]", "").toLowerCase().trim(); + return str.replaceAll("(\u00a7.)|[^#0-9a-zA-Z ]", "").toLowerCase(Locale.ROOT).trim(); } public void showRecipe(JsonObject item) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index 797260c4..c3be39b2 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -97,6 +97,7 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -568,14 +569,14 @@ public class NEUOverlay extends Gui { } else if (manager.getItemInformation().containsKey(display)) { render = manager.jsonToStack(manager.getItemInformation().get(display), true, true); } else { - Item item = Item.itemRegistry.getObject(new ResourceLocation(display.toLowerCase())); + Item item = Item.itemRegistry.getObject(new ResourceLocation(display.toLowerCase(Locale.ROOT))); if (item != null) { render = new ItemStack(item); } } if (render != null) { NBTTagCompound tag = render.getTagCompound() != null ? render.getTagCompound() : new NBTTagCompound(); - tag.setString("qc_id", quickCommandStrSplit[0].toLowerCase().trim()); + tag.setString("qc_id", quickCommandStrSplit[0].toLowerCase(Locale.ROOT).trim()); render.setTagCompound(tag); Minecraft.getMinecraft().getTextureManager().bindTexture(GuiTextures.quickcommand_background); @@ -1485,7 +1486,7 @@ public class NEUOverlay extends Gui { if (item != null) searchedItems.add(item); } } - switch (textField.getText().toLowerCase().trim()) { + switch (textField.getText().toLowerCase(Locale.ROOT).trim()) { case "nullzee": searchedItems.add(CustomItems.NULLZEE); break; @@ -1918,14 +1919,14 @@ public class NEUOverlay extends Gui { updateSearch(); } - if (textField.getText().toLowerCase().contains("bald")) { + if (textField.getText().toLowerCase(Locale.ROOT).contains("bald")) { Minecraft.getMinecraft().getTextureManager().bindTexture(SUPERGEHEIMNISVERMOGEN); GlStateManager.color(1, 1, 1, 1); Utils.drawTexturedRect((width - 64) / 2f, (height - 64) / 2f - 114, 64, 64, GL11.GL_LINEAR); GlStateManager.bindTexture(0); } - if (textField.getText().toLowerCase().contains("lunar")) { + if (textField.getText().toLowerCase(Locale.ROOT).contains("lunar")) { Minecraft.getMinecraft().getTextureManager().bindTexture(ATMOULBERRYWHYISMYLUNARCLIENTBUGGING); GlStateManager.color(1, 1, 1, 1); GlStateManager.translate(0, 0, 100); @@ -1933,7 +1934,7 @@ public class NEUOverlay extends Gui { GlStateManager.bindTexture(0); } - SunTzu.setEnabled(textField.getText().toLowerCase().startsWith("potato")); + SunTzu.setEnabled(textField.getText().toLowerCase(Locale.ROOT).startsWith("potato")); updateGuiGroupSize(); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java index 38270c77..848185a8 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java @@ -87,6 +87,7 @@ import org.apache.logging.log4j.Logger; import java.awt.*; import java.io.File; import java.util.HashMap; +import java.util.Locale; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -470,7 +471,7 @@ public class NotEnoughUpdates { if (mc != null && mc.theWorld != null && mc.thePlayer != null) { if (mc.isSingleplayer() || mc.thePlayer.getClientBrand() == null || - !mc.thePlayer.getClientBrand().toLowerCase().contains("hypixel")) { + !mc.thePlayer.getClientBrand().toLowerCase(Locale.ROOT).contains("hypixel")) { hasSkyblockScoreboard = false; return; } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java index 405b18fc..c02e3e15 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java @@ -34,6 +34,7 @@ import org.lwjgl.opengl.GL11; import java.awt.*; import java.awt.image.BufferedImage; +import java.util.Locale; import java.util.function.Consumer; import java.util.function.Supplier; @@ -274,7 +275,7 @@ public class GuiElementColour extends GuiElement { } hexField.setSize(48, 10); - if (!hexField.getFocus()) hexField.setText(Integer.toHexString(c.getRGB() & 0xFFFFFF).toUpperCase()); + if (!hexField.getFocus()) hexField.setText(Integer.toHexString(c.getRGB() & 0xFFFFFF).toUpperCase(Locale.ROOT)); StringBuilder sb = new StringBuilder(EnumChatFormatting.GRAY + "#"); for (int i = 0; i < 6 - hexField.getText().length(); i++) { @@ -421,7 +422,7 @@ public class GuiElementColour extends GuiElement { hexField.setText(old); } else { try { - String text = hexField.getText().toLowerCase(); + String text = hexField.getText().toLowerCase(Locale.ROOT); int rgb = Integer.parseInt(text, 16); int alpha = (ChromaColour.specialToSimpleRGB(colour.get()) >> 24) & 0xFF; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java index 20031ec3..ae8011c5 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/util/StringUtils.java @@ -95,7 +95,7 @@ public class StringUtils { public static String firstUpperLetter(String text) { if (text.isEmpty()) return text; - String firstLetter = ("" + text.charAt(0)).toUpperCase(); + String firstLetter = ("" + text.charAt(0)).toUpperCase(Locale.ROOT); return firstLetter + text.substring(1); } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java index 2cf09457..0aa44cd5 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Random; import java.util.Set; import java.util.concurrent.Executors; @@ -191,7 +192,7 @@ public class DungeonWin { if (matcher.find()) { lastDungeonFinish = currentTime; String score = matcher.group(1); - switch (score.toUpperCase()) { + switch (score.toUpperCase(Locale.ROOT)) { case "S+": TEAM_SCORE = SPLUS; break; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/infopanes/HTMLInfoPane.java b/src/main/java/io/github/moulberry/notenoughupdates/infopanes/HTMLInfoPane.java index de9c608f..770e313a 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/infopanes/HTMLInfoPane.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/infopanes/HTMLInfoPane.java @@ -60,6 +60,7 @@ import java.net.URLConnection; import java.nio.charset.CharsetEncoder; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.util.Locale; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -128,7 +129,7 @@ public class HTMLInfoPane extends TextInfoPane { public void parseInternalImageLink(String imageNamespace, String rawImageLink) { rawImageLink = rawImageLink.replaceFirst("\\|x([0-9]+)px", "\\|$1x$1px"); - if (!rawImageLink.split("\\|")[0].toLowerCase().endsWith(".jpg")) { + if (!rawImageLink.split("\\|")[0].toLowerCase(Locale.ROOT).endsWith(".jpg")) { super.parseInternalImageLink(imageNamespace, rawImageLink); } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipEssenceShopListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipEssenceShopListener.java index 4b380c2f..86650991 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipEssenceShopListener.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipEssenceShopListener.java @@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -59,7 +60,7 @@ public class ItemTooltipEssenceShopListener { int amount = Integer.parseInt(rawNumber); String type = matcher.group(2); - String essenceName = "ESSENCE_" + type.toUpperCase(); + String essenceName = "ESSENCE_" + type.toUpperCase(Locale.ROOT); JsonObject bazaarInfo = neu.manager.auctionManager.getBazaarInfo(essenceName); if (bazaarInfo != null && bazaarInfo.has("curr_sell")) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java index bd923157..dcbc8654 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java @@ -656,7 +656,7 @@ public class RenderListener { String displayName = item.getDisplayName(); Matcher matcher = ESSENCE_PATTERN.matcher(displayName); if (neu.config.dungeons.useEssenceCostFromBazaar && matcher.matches()) { - String type = matcher.group(1).toUpperCase(); + String type = matcher.group(1).toUpperCase(Locale.ROOT); JsonObject bazaarInfo = neu.manager.auctionManager.getBazaarInfo("ESSENCE_" + type); if (bazaarInfo != null && bazaarInfo.has("curr_sell")) { float bazaarPrice = bazaarInfo.get("curr_sell").getAsFloat(); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBAnchorPoint.java b/src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBAnchorPoint.java index 7193b47f..d0aac435 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBAnchorPoint.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/mbgui/MBAnchorPoint.java @@ -22,6 +22,7 @@ package io.github.moulberry.notenoughupdates.mbgui; import org.lwjgl.util.vector.Vector2f; import java.io.Serializable; +import java.util.Locale; public class MBAnchorPoint implements Serializable { public enum AnchorPoint { @@ -59,7 +60,7 @@ public class MBAnchorPoint implements Serializable { try { String[] split = str.split(":"); - AnchorPoint point = AnchorPoint.valueOf(split[0].toUpperCase()); + AnchorPoint point = AnchorPoint.valueOf(split[0].toUpperCase(Locale.ROOT)); Vector2f pos = new Vector2f(Float.parseFloat(split[1]), Float.parseFloat(split[2])); return new MBAnchorPoint(point, pos, Boolean.parseBoolean(split[3])); } catch (Exception e) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java index 40425560..78c7dd2e 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java @@ -33,6 +33,8 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import java.util.Locale; + @NEUAutoSubscribe public class AntiCoopAdd { @@ -72,7 +74,7 @@ public class AntiCoopAdd { public Boolean onPacketChatMessage(C01PacketChatMessage packet) { if (!NotEnoughUpdates.INSTANCE.config.misc.coopWarning) return false; - String message = packet.getMessage().toLowerCase(); + String message = packet.getMessage().toLowerCase(Locale.ROOT); if (message.startsWith("/hypixelcommand:coopadd")) { Utils.addChatMessage("§e[NEU] You just entered a malicious looking Co-op add command! If you truly want to add someone to your coop, type §e/coopadd <name>"); return true; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java index e7331378..6759d940 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java @@ -47,6 +47,7 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.HashMap; +import java.util.Locale; @NEUAutoSubscribe public class BetterContainers { @@ -132,7 +133,7 @@ public class BetterContainers { GuiChest eventGui = (GuiChest) Minecraft.getMinecraft().currentScreen; ContainerChest cc = (ContainerChest) eventGui.inventorySlots; String containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText(); - return containerName.toLowerCase().trim().startsWith("navigate the maze"); + return containerName.toLowerCase(Locale.ROOT).trim().startsWith("navigate the maze"); } public static boolean isOverriding() { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java index 76f56fac..e355c437 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java @@ -38,6 +38,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.stream.Collectors; public class CrystalMetalDetectorSolver { @@ -378,7 +379,7 @@ public class CrystalMetalDetectorSolver { NEUDebugLogger.log(NEUDebugFlag.METAL, "Locating center using Keeper: " + EnumChatFormatting.WHITE + keeperEntity); String keeperType = keeperName.substring(keeperName.indexOf(KEEPER_OF_STRING) + KEEPER_OF_STRING.length()); - minesCenter = keeperEntity.getPosition().add(keeperOffsets.get(keeperType.toLowerCase())); + minesCenter = keeperEntity.getPosition().add(keeperOffsets.get(keeperType.toLowerCase(Locale.ROOT))); NEUDebugLogger.log(NEUDebugFlag.METAL, "Mines center: " + EnumChatFormatting.WHITE + minesCenter.toString()); Utils.addChatMessage( diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesWaypoints.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesWaypoints.java index f05f1cd8..4d1494ed 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesWaypoints.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesWaypoints.java @@ -43,6 +43,7 @@ import org.lwjgl.util.vector.Vector3f; import java.util.HashMap; import java.util.HashSet; +import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -226,17 +227,17 @@ public class DwarvenMinesWaypoints { } } } - String skyblockLocation = SBInfo.getInstance().location.toLowerCase(); + String skyblockLocation = SBInfo.getInstance().location.toLowerCase(Locale.ROOT); if (locWaypoint >= 1) { for (Map.Entry<String, Vector3f> entry : waypointsMap.entrySet()) { if (locWaypoint >= 2) { RenderUtils.renderWayPoint(EnumChatFormatting.AQUA + entry.getKey(), entry.getValue(), event.partialTicks); } else { - String commissionLocation = entry.getKey().toLowerCase(); + String commissionLocation = entry.getKey().toLowerCase(Locale.ROOT); for (String commissionName : MiningOverlay.commissionProgress.keySet()) { if (NotEnoughUpdates.INSTANCE.config.mining.hideWaypointIfAtLocation) if (commissionLocation.replace("'", "").equals(skyblockLocation)) continue; - if (commissionName.toLowerCase().contains(commissionLocation)) { + if (commissionName.toLowerCase(Locale.ROOT).contains(commissionLocation)) { if (commissionName.contains("Titanium")) { RenderUtils.renderWayPoint( EnumChatFormatting.WHITE + entry.getKey(), diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java index a5c96e4a..588628c6 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java @@ -44,6 +44,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; @NEUAutoSubscribe @@ -498,7 +499,7 @@ public class EnchantingSolvers { if (display.hasKey("Lore", 9)) { NBTTagList list = display.getTagList("Lore", 8); for (int i = 0; i < list.tagCount(); i++) { - if (list.getStringTagAt(i).toLowerCase().contains("powerup")) { + if (list.getStringTagAt(i).toLowerCase(Locale.ROOT).contains("powerup")) { powerupMatches.add(index); continue out; } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java index fb12906a.. |
