diff options
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures')
6 files changed, 24 insertions, 17 deletions
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..c823cf88 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java @@ -63,6 +63,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -308,7 +309,7 @@ public class PetInfoOverlay extends TextOverlay { pet.petType = petType; JsonObject petTypes = Constants.PETS.get("pet_types").getAsJsonObject(); pet.petXpType = - petTypes.has(pet.petType) ? petTypes.get(pet.petType.toUpperCase()).getAsString().toLowerCase() : "unknown"; + petTypes.has(pet.petType) ? petTypes.get(pet.petType.toUpperCase(Locale.ROOT)).getAsString().toLowerCase(Locale.ROOT) : "unknown"; pet.skin = skin; return pet; @@ -328,7 +329,7 @@ public class PetInfoOverlay extends TextOverlay { "alchemy", "all" ); - if (!validXpTypes.contains(xpType.toLowerCase())) return 0; + if (!validXpTypes.contains(xpType.toLowerCase(Locale.ROOT))) return 0; float tamingPercent = 1.0f + (config.tamingLevel / 100f); xp = xp * tamingPercent; @@ -354,10 +355,10 @@ public class PetInfoOverlay extends TextOverlay { } JsonObject pets = Constants.PETS; if (pets != null && pets.has("custom_pet_leveling") && - pets.get("custom_pet_leveling").getAsJsonObject().has(pet.petType.toUpperCase()) && - pets.get("custom_pet_leveling").getAsJsonObject().get(pet.petType.toUpperCase()).getAsJsonObject().has( + pets.get("custom_pet_leveling").getAsJsonObject().has(pet.petType.toUpperCase(Locale.ROOT)) && + pets.get("custom_pet_leveling").getAsJsonObject().get(pet.petType.toUpperCase(Locale.ROOT)).getAsJsonObject().has( "xp_multiplier")) { - xp *= pets.get("custom_pet_leveling").getAsJsonObject().get(pet.petType.toUpperCase()).getAsJsonObject().get( + xp *= pets.get("custom_pet_leveling").getAsJsonObject().get(pet.petType.toUpperCase(Locale.ROOT)).getAsJsonObject().get( "xp_multiplier").getAsFloat(); } return xp; @@ -660,7 +661,7 @@ public class PetInfoOverlay extends TextOverlay { public static float getBoostMultiplier(String boostName) { if (boostName == null) return 1; - boostName = boostName.toLowerCase(); + boostName = boostName.toLowerCase(Locale.ROOT); if (boostName.equalsIgnoreCase("PET_ITEM_ALL_SKILLS_BOOST_COMMON")) { return 1.1f; } else if (boostName.equalsIgnoreCase("ALL_SKILLS_SUPER_BOOST")) { @@ -859,7 +860,7 @@ public class PetInfoOverlay extends TextOverlay { String rarityString = Utils.getRarityFromInt(rarity); String name = StringUtils.cleanColour(petStack.getDisplayName()); - name = name.substring(name.indexOf(']') + 1).trim().replace(' ', '_').toUpperCase(); + name = name.substring(name.indexOf(']') + 1).trim().replace(' ', '_').toUpperCase(Locale.ROOT); float petXp = petInfoObject.get("exp").getAsFloat(); @@ -998,7 +999,7 @@ public class PetInfoOverlay extends TextOverlay { String pet = Utils.cleanColour(petName) .replaceAll("[^\\w ]", "").trim() - .replace(" ", "_").toUpperCase(); + .replace(" ", "_").toUpperCase(Locale.ROOT); setCurrentPet(getClosestPetIndex(pet, rarity.petId, "", lastLevelHovered)); if (PetInfoOverlay.config.selectedPet == -1) { @@ -1010,9 +1011,9 @@ public class PetInfoOverlay extends TextOverlay { EnumChatFormatting.RED + " try revisiting all pages of /pets.")); } } - } else if ((chatMessage.toLowerCase().startsWith("you despawned your")) || (chatMessage.toLowerCase().contains( + } else if ((chatMessage.toLowerCase(Locale.ROOT).startsWith("you despawned your")) || (chatMessage.toLowerCase(Locale.ROOT).contains( "switching to profile")) - || (chatMessage.toLowerCase().contains("transferring you to a new island..."))) { + || (chatMessage.toLowerCase(Locale.ROOT).contains("transferring you to a new island..."))) { clearPet(); } } |