From 68d33efe3cea6312ce2839d1a75e56930518f576 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 24 Aug 2015 22:04:27 -0400 Subject: [PATCH] Add proper locale to all toLowerCase and toUpperCase calls --- .../crazypants/enderio/conduit/item/filter/FuzzyMode.java | 3 ++- src/main/java/crazypants/enderio/config/Config.java | 3 ++- .../crazypants/enderio/machine/RedstoneControlMode.java | 6 ++++-- .../crazypants/enderio/machine/buffer/BlockItemBuffer.java | 3 ++- .../enderio/machine/capbank/render/IoDisplay.java | 2 +- .../enderio/machine/invpanel/GuiInventoryPanel.java | 2 +- .../enderio/machine/obelisk/weather/GuiWeatherObelisk.java | 2 +- .../enderio/machine/recipe/RecipeConfigParser.java | 4 ++-- src/main/java/crazypants/enderio/machine/tank/GuiTank.java | 2 +- .../enderio/machine/transceiver/BlockTransceiver.java | 3 ++- src/main/java/crazypants/enderio/waila/WailaCompat.java | 3 ++- 11 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java b/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java index 5a044590..764dcf91 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java @@ -2,6 +2,7 @@ package crazypants.enderio.conduit.item.filter; import java.util.Collections; import java.util.List; +import java.util.Locale; import net.minecraft.item.ItemStack; @@ -62,7 +63,7 @@ public enum FuzzyMode implements CycleButton.ICycleEnum { @Override public List getTooltipLines() { - return Collections.singletonList(EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase()))); + return Collections.singletonList(EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US)))); } } diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 5e27b565..413bc5a7 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -3,6 +3,7 @@ package crazypants.enderio.config; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -40,7 +41,7 @@ public final class Config { } public String lc() { - return name.toLowerCase(); + return name.toLowerCase(Locale.US); } } diff --git a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java index d019687b..7a015b41 100644 --- a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java +++ b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java @@ -1,12 +1,14 @@ package crazypants.enderio.machine; import java.util.List; +import java.util.Locale; + +import net.minecraft.tileentity.TileEntity; import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.client.gui.button.CycleButton.ICycleEnum; import com.google.common.collect.Lists; -import net.minecraft.tileentity.TileEntity; import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; @@ -25,7 +27,7 @@ public enum RedstoneControlMode implements ICycleEnum { } public String getTooltip() { - return EnderIO.lang.localize("gui.tooltip.redstoneControlMode." + name().toLowerCase()); + return EnderIO.lang.localize("gui.tooltip.redstoneControlMode." + name().toLowerCase(Locale.US)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java index 5489d14a..4173f8ff 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.buffer; import java.util.List; +import java.util.Locale; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -38,7 +39,7 @@ public class BlockItemBuffer extends ItemBlockWithMetadata { } public String getUnlocalizedName() { - return "tile." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(); + return "tile." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(Locale.US); } public static ItemStack getStack(Type type) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java index 7258c295..5e7ab479 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java @@ -230,7 +230,7 @@ public class IoDisplay implements IInfoRenderer { final int color; private HeadingText(int color) { - this.text = EnderIO.lang.localize("capbank.iodisplay.".concat(name().toLowerCase(Locale.ENGLISH))); + this.text = EnderIO.lang.localize("capbank.iodisplay.".concat(name().toLowerCase(Locale.US))); this.color = color; } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 49650ded..2d033e3f 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -473,7 +473,7 @@ public class GuiInventoryPanel extends GuiMachineBase { SortOrder order = view.getSortOrder(); ArrayList list = new ArrayList(); SpecialTooltipHandler.addTooltipFromResources(list, - "enderio.gui.inventorypanel.tooltip.sort." + order.name().toLowerCase(Locale.ENGLISH) + (view.isSortOrderInverted() ? "_up" : "_down") + ".line"); + "enderio.gui.inventorypanel.tooltip.sort." + order.name().toLowerCase(Locale.US) + (view.isSortOrderInverted() ? "_up" : "_down") + ".line"); btnSort.setIcon(getSortOrderIcon()); btnSort.setToolTip(list.toArray(new String[list.size()])); } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java index 839d5253..b0fc1dc8 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java @@ -45,7 +45,7 @@ public class GuiWeatherObelisk extends GuiPoweredMachineBase } private void addButton(IconButton button, WeatherTask task) { - String tt1 = EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.weather.task." + task.name().toLowerCase(Locale.ENGLISH)); + String tt1 = EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.weather.task." + task.name().toLowerCase(Locale.US)); String tt2 = EnumChatFormatting.AQUA + String.format(EnderIO.lang.localize("gui.weather.requireditem"), EnumChatFormatting.WHITE + task.requiredItem().getDisplayName()); String tt3 = String.format("%s%s %s%s", EnumChatFormatting.GREEN, fmt.format(task.power), EnumChatFormatting.WHITE, EnderIO.lang.localize("power.rf")); button.setToolTip(tt1, tt2, tt3); diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java index 9527b6d7..10eca202 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java @@ -434,7 +434,7 @@ public class RecipeConfigParser extends DefaultHandler { if(val == null) { return def; } - val = val.toLowerCase().trim(); + val = val.toLowerCase(Locale.US).trim(); return val.equals("false") ? false : val.equals("true") ? true : def; } @@ -477,7 +477,7 @@ public class RecipeConfigParser extends DefaultHandler { if(val.length() <= 0) { return def; } - val = val.toUpperCase(Locale.ENGLISH); + val = val.toUpperCase(Locale.US); try { return Enum.valueOf(clazz, val); } catch(IllegalArgumentException ex) { diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index 07599dae..90605cdb 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -36,7 +36,7 @@ public class GuiTank extends GuiMachineBase { private VoidMode(IWidgetIcon icon) { this.icon = icon; String prefix = "gui.void.mode"; - String mode = prefix + "." + name().toLowerCase(Locale.ENGLISH); + String mode = prefix + "." + name().toLowerCase(Locale.US); this.unlocTooltips = Lists.newArrayList(prefix, mode, mode + ".desc"); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 151b2141..a9020285 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.transceiver; import java.util.List; +import java.util.Locale; import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; @@ -137,7 +138,7 @@ public class BlockTransceiver extends AbstractMachineBlock { continue; } - tooltip.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("trans." + type.name().toLowerCase())); + tooltip.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("trans." + type.name().toLowerCase(Locale.US))); if(!isEmpty(recieve)) { tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, EnderIO.lang.localize("trans.receiving"), Util.TAB + Util.ALIGNRIGHT diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index dc74ee08..26e69eb8 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -2,6 +2,7 @@ package crazypants.enderio.waila; import java.text.MessageFormat; import java.util.List; +import java.util.Locale; import mcp.mobius.waila.api.ITaggedList; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -182,7 +183,7 @@ public class WailaCompat implements IWailaDataProvider { ForgeDirection side = accessor.getSide(); IoMode mode = machine.getIoMode(side); currenttip.add(EnumChatFormatting.YELLOW - + EnderIO.lang.localize("gui.machine.side", EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.machine.side." + side.name().toLowerCase()))); + + EnderIO.lang.localize("gui.machine.side", EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.machine.side." + side.name().toLowerCase(Locale.US)))); if(!(te instanceof TileInventoryPanel)) { currenttip.add(EnumChatFormatting.YELLOW + EnderIO.lang.localize("gui.machine.ioMode", mode.colorLocalisedName())); }