fix String#toLowerCase() calls to toLowerCase(Locale.ROOT). Fixes #4957

This commit is contained in:
Xander committed 2018-03-24 17:09:44 +08:00
1 parent 2e9b95e187
commit 1415288bcf
28 files changed
+79 -37

No files matched your search

+3 -1
View File
@@ -6,6 +6,8 @@ import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import java.util.Locale;
/**
* Simple color enum for adding colors to in-game GUI strings of text.
* @author AidanBrady
@@ -105,7 +107,7 @@ public enum EnumColor implements IStringSerializable
@Override
public String getName()
{
return unlocalizedName.toLowerCase();
return unlocalizedName.toLowerCase(Locale.ROOT);
}
/**
@@ -2,6 +2,7 @@ package mekanism.api.gas;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import com.google.common.base.Preconditions;
import net.minecraft.client.Minecraft;
@@ -107,7 +108,7 @@ public class GasRegistry
{
for(Gas gas : registeredGasses)
{
if(gas.getName().toLowerCase().equals(name.toLowerCase()))
if(gas.getName().toLowerCase(Locale.ROOT).equals(name.toLowerCase(Locale.ROOT)))
{
return gas;
}
@@ -3,6 +3,7 @@ package mekanism.client.jei;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import mekanism.api.gas.Gas;
@@ -142,7 +143,7 @@ public class MekanismJEI implements IModPlugin
ret += ":" + (((ItemBlockEnergyCube)itemStack.getItem()).getEnergy(itemStack) > 0 ? "filled" : "empty");
}
return ret.isEmpty() ? null : ret.toLowerCase();
return ret.isEmpty() ? null : ret.toLowerCase(Locale.ROOT);
};
@Override
@@ -183,16 +184,16 @@ public class MekanismJEI implements IModPlugin
SolarNeutronRecipeCategory solarNeutronCategory = new SolarNeutronRecipeCategory(registry.getJeiHelpers().getGuiHelper());
ThermalEvaporationRecipeCategory thermalEvaporationCategory = new ThermalEvaporationRecipeCategory(registry.getJeiHelpers().getGuiHelper());
DoubleMachineRecipeCategory doubleMachineRecipeCategoryCombiner = new DoubleMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.COMBINER.name().toLowerCase(), "tile.MachineBlock.Combiner.name", ProgressBar.STONE);
DoubleMachineRecipeCategory doubleMachineRecipeCategoryCombiner = new DoubleMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.COMBINER.name().toLowerCase(Locale.ROOT), "tile.MachineBlock.Combiner.name", ProgressBar.STONE);
AdvancedMachineRecipeCategory advancedMachineRecipeCategoryPurificationChamber = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.PURIFICATION_CHAMBER.name().toLowerCase(), "tile.MachineBlock.PurificationChamber.name", ProgressBar.RED);
AdvancedMachineRecipeCategory advancedMachineRecipeCategoryOsmiumCompressor = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.OSMIUM_COMPRESSOR.name().toLowerCase(), "tile.MachineBlock.OsmiumCompressor.name", ProgressBar.RED);
AdvancedMachineRecipeCategory advancedMachineRecipeCategoryChemicalInjectionChamber = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.CHEMICAL_INJECTION_CHAMBER.name().toLowerCase(), "nei.chemicalInjectionChamber", ProgressBar.YELLOW);
AdvancedMachineRecipeCategory advancedMachineRecipeCategoryPurificationChamber = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.PURIFICATION_CHAMBER.name().toLowerCase(Locale.ROOT), "tile.MachineBlock.PurificationChamber.name", ProgressBar.RED);
AdvancedMachineRecipeCategory advancedMachineRecipeCategoryOsmiumCompressor = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.OSMIUM_COMPRESSOR.name().toLowerCase(Locale.ROOT), "tile.MachineBlock.OsmiumCompressor.name", ProgressBar.RED);
AdvancedMachineRecipeCategory advancedMachineRecipeCategoryChemicalInjectionChamber = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.CHEMICAL_INJECTION_CHAMBER.name().toLowerCase(Locale.ROOT), "nei.chemicalInjectionChamber", ProgressBar.YELLOW);
ChanceMachineRecipeCategory chanceMachineRecipeCategoryPrecisionSawmill = new ChanceMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.PRECISION_SAWMILL.name().toLowerCase(), "tile.MachineBlock2.PrecisionSawmill.name", ProgressBar.PURPLE);
ChanceMachineRecipeCategory chanceMachineRecipeCategoryPrecisionSawmill = new ChanceMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.PRECISION_SAWMILL.name().toLowerCase(Locale.ROOT), "tile.MachineBlock2.PrecisionSawmill.name", ProgressBar.PURPLE);
MachineRecipeCategory machineRecipeCategoryEnrichment = new MachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.ENRICHMENT_CHAMBER.name().toLowerCase(), "tile.MachineBlock.EnrichmentChamber.name", ProgressBar.BLUE);
MachineRecipeCategory machineRecipeCategoryCrusher = new MachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.CRUSHER.name().toLowerCase(), "tile.MachineBlock.Crusher.name", ProgressBar.CRUSH);
MachineRecipeCategory machineRecipeCategoryEnrichment = new MachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.ENRICHMENT_CHAMBER.name().toLowerCase(Locale.ROOT), "tile.MachineBlock.EnrichmentChamber.name", ProgressBar.BLUE);
MachineRecipeCategory machineRecipeCategoryCrusher = new MachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), Recipe.CRUSHER.name().toLowerCase(Locale.ROOT), "tile.MachineBlock.Crusher.name", ProgressBar.CRUSH);
registry.addRecipeCategories(chemicalCrystallizerCategory, chemicalDissolutionChamberCategory, chemicalInfuserCategory, chemicalOxidizerCategory,
chemicalWasherCategory, electrolyticSeparatorCategory, metallurgicInfuserCategory, prcCategory, rotaryCondensentratorCondensentratingCategory, rotaryCondensentratorDecondensentratingCategory, solarNeutronCategory,
@@ -1,6 +1,7 @@
package mekanism.client.render.transmitter;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import mekanism.client.render.MekanismRenderer;
@@ -108,7 +109,7 @@ public abstract class RenderTransmitterBase<T extends TileEntityTransmitter> ext
public IBakedModel getModelForSide(TileEntityTransmitter part, EnumFacing side)
{
String sideName = side.name().toLowerCase();
String sideName = side.name().toLowerCase(Locale.ROOT);
String typeName = part.getConnectionType(side).name().toUpperCase();
String name = sideName + typeName;
@@ -7,6 +7,8 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import java.util.Locale;
public class MekanismFluids
{
public static final Gas Hydrogen = new Gas("hydrogen", "mekanism:blocks/liquid/LiquidHydrogen");
@@ -57,7 +59,7 @@ public class MekanismFluids
for(Resource resource : Resource.values())
{
String name = resource.getName();
String nameLower = name.toLowerCase();
String nameLower = name.toLowerCase(Locale.ROOT);
OreGas clean = new OreGas("clean" + name, "oregas." + nameLower);
clean.setVisible(false).setTint(resource.tint);
+3 -1
View File
@@ -1,5 +1,7 @@
package mekanism.common;
import java.util.Locale;
public enum Resource
{
IRON("Iron", 0xccccd9),
@@ -23,7 +25,7 @@ public enum Resource
{
for(Resource r : values())
{
if(r.name.toLowerCase().equals(s.toLowerCase()))
if(r.name.toLowerCase(Locale.ROOT).equals(s.toLowerCase(Locale.ROOT)))
{
return r;
}
+4 -3
View File
@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import mekanism.api.EnumColor;
import mekanism.common.util.LangUtils;
@@ -64,7 +65,7 @@ public final class Tier
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
}
@@ -127,7 +128,7 @@ public final class Tier
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
}
@@ -648,7 +649,7 @@ public final class Tier
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
}
@@ -1,5 +1,6 @@
package mekanism.common.base;
import java.util.Locale;
import java.util.Map;
import mekanism.api.gas.Gas;
@@ -325,7 +326,7 @@ public interface IFactory
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
}
}
@@ -41,6 +41,7 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import javax.annotation.Nullable;
import java.util.Locale;
public class BlockStateBasic extends ExtendedBlockState
{
@@ -205,7 +206,7 @@ public class BlockStateBasic extends ExtendedBlockState
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
public String getDescription()
@@ -2,6 +2,7 @@ package mekanism.common.block.states;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
@@ -367,7 +368,7 @@ public class BlockStateMachine extends ExtendedBlockState
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
public boolean canRotateTo(EnumFacing side)
@@ -5,6 +5,8 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
/**
* Created by ben on 23/12/14.
*/
@@ -26,7 +28,7 @@ public class BlockStateOre extends BlockStateContainer
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
}
}
@@ -10,6 +10,8 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
import java.util.Locale;
public class BlockStatePlastic extends BlockStateContainer
{
public static PropertyEnum<EnumDyeColor> colorProperty = PropertyEnum.create("color", EnumDyeColor.class);
@@ -30,7 +32,7 @@ public class BlockStatePlastic extends BlockStateContainer
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
}
@@ -16,6 +16,8 @@ import net.minecraftforge.client.model.obj.OBJModel.OBJProperty;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import java.util.Locale;
public class BlockStateTransmitter extends ExtendedBlockState
{
public static final PropertyEnum<TransmitterType> typeProperty = PropertyEnum.create("type", TransmitterType.class);
@@ -54,7 +56,7 @@ public class BlockStateTransmitter extends ExtendedBlockState
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
public String getUnlocalizedName()
@@ -4,6 +4,7 @@ import ic2.api.recipe.Recipes;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
@@ -111,7 +112,7 @@ public final class OreDictManager
RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, resource.ordinal()));
RecipeHandler.addPurificationChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, resource.ordinal()));
RecipeHandler.addChemicalInjectionChamberRecipe(StackUtils.size(ore, 1), MekanismFluids.HydrogenChloride, new ItemStack(MekanismItems.Shard, 4, resource.ordinal()));
RecipeHandler.addChemicalDissolutionChamberRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas(resource.getName().toLowerCase()), 1000));
RecipeHandler.addChemicalDissolutionChamberRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas(resource.getName().toLowerCase(Locale.ROOT)), 1000));
}
for(ItemStack ore : OreDictionary.getOres("ingot" + resource.getName()))
@@ -6,6 +6,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Locale;
public class ItemClump extends ItemMekanism implements IMetaItem
{
public ItemClump()
@@ -41,7 +43,7 @@ public class ItemClump extends ItemMekanism implements IMetaItem
{
if(item.getItemDamage() <= Resource.values().length-1)
{
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Clump";
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase(Locale.ROOT) + "Clump";
}
return "Invalid";
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Random;
import mekanism.api.Coord4D;
@@ -230,7 +231,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool
public String getViewModeText(TransmissionType type)
{
String base = LangUtils.localize("tooltip.configurator.viewMode");
return String.format(base, type.localize().toLowerCase());
return String.format(base, type.localize().toLowerCase(Locale.ROOT));
}
public String getToggleModeText(TransmissionType type)
@@ -6,6 +6,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Locale;
public class ItemCrystal extends ItemMekanism implements IMetaItem
{
public ItemCrystal()
@@ -41,7 +43,7 @@ public class ItemCrystal extends ItemMekanism implements IMetaItem
{
if(item.getItemDamage() <= Resource.values().length-1)
{
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Crystal";
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase(Locale.ROOT) + "Crystal";
}
return "Invalid";
@@ -6,6 +6,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Locale;
public class ItemDust extends ItemMekanism implements IMetaItem
{
public ItemDust()
@@ -41,7 +43,7 @@ public class ItemDust extends ItemMekanism implements IMetaItem
{
if(item.getItemDamage() <= Resource.values().length-1)
{
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Dust";
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase(Locale.ROOT) + "Dust";
}
return "Invalid";
@@ -5,6 +5,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Locale;
public class ItemIngot extends ItemMekanism implements IMetaItem
{
public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze",
@@ -42,6 +44,6 @@ public class ItemIngot extends ItemMekanism implements IMetaItem
@Override
public String getUnlocalizedName(ItemStack item)
{
return "item." + en_USNames[item.getItemDamage()].toLowerCase() + "Ingot";
return "item." + en_USNames[item.getItemDamage()].toLowerCase(Locale.ROOT) + "Ingot";
}
}
@@ -5,6 +5,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Locale;
public class ItemNugget extends ItemMekanism implements IMetaItem
{
public ItemNugget()
@@ -38,6 +40,6 @@ public class ItemNugget extends ItemMekanism implements IMetaItem
@Override
public String getUnlocalizedName(ItemStack item)
{
return "item." + ItemIngot.en_USNames[item.getItemDamage()].toLowerCase() + "Nugget";
return "item." + ItemIngot.en_USNames[item.getItemDamage()].toLowerCase(Locale.ROOT) + "Nugget";
}
}
@@ -5,6 +5,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Locale;
public class ItemOtherDust extends ItemMekanism implements IMetaItem
{
public static String[] subtypes = {"Diamond", "Steel", "null", "Sulfur",
@@ -49,6 +51,6 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem
@Override
public String getUnlocalizedName(ItemStack item)
{
return "item." + subtypes[item.getItemDamage()].toLowerCase() + "Dust";
return "item." + subtypes[item.getItemDamage()].toLowerCase(Locale.ROOT) + "Dust";
}
}
@@ -6,6 +6,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Locale;
public class ItemShard extends ItemMekanism implements IMetaItem
{
public ItemShard()
@@ -41,7 +43,7 @@ public class ItemShard extends ItemMekanism implements IMetaItem
{
if(item.getItemDamage() <= Resource.values().length-1)
{
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Shard";
return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase(Locale.ROOT) + "Shard";
}
return "Invalid";
@@ -15,6 +15,8 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.Locale;
public class ItemTierInstaller extends ItemMekanism implements IMetaItem
{
public ItemTierInstaller()
@@ -87,6 +89,6 @@ public class ItemTierInstaller extends ItemMekanism implements IMetaItem
@Override
public String getUnlocalizedName(ItemStack item)
{
return "item." + BaseTier.values()[item.getItemDamage()].getSimpleName().toLowerCase() + "TierInstaller";
return "item." + BaseTier.values()[item.getItemDamage()].getSimpleName().toLowerCase(Locale.ROOT) + "TierInstaller";
}
}
@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import mcmultipart.api.multipart.IMultipart;
import mekanism.api.Coord4D;
@@ -748,7 +749,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
public String translationKey(){
@@ -20,7 +20,7 @@ public final class ItemRegistryUtils
{
for(Map.Entry<String, ModContainer> entry : Loader.instance().getIndexedModList().entrySet())
{
modIDMap.put(entry.getKey().toLowerCase(), entry.getValue().getName());
modIDMap.put(entry.getKey().toLowerCase(Locale.ROOT), entry.getValue().getName());
}
}
@@ -2,6 +2,7 @@ package mekanism.generators.common.block.states;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import mekanism.common.Mekanism;
import mekanism.common.base.IBlockType;
@@ -219,7 +220,7 @@ public class BlockStateGenerator extends ExtendedBlockState
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
public String getDescription()
@@ -27,6 +27,8 @@ import net.minecraftforge.common.property.IUnlistedProperty;
import com.google.common.base.Predicate;
import java.util.Locale;
public class BlockStateReactor extends ExtendedBlockState
{
public static final PropertyBool activeProperty = PropertyBool.create("active");
@@ -151,7 +153,7 @@ public class BlockStateReactor extends ExtendedBlockState
@Override
public String getName()
{
return name().toLowerCase();
return name().toLowerCase(Locale.ROOT);
}
public String getDescription()
@@ -1,6 +1,7 @@
package mekanism.tools.item;
import java.util.List;
import java.util.Locale;
import mekanism.client.render.ModelCustomArmor;
import mekanism.common.Mekanism;
@@ -40,7 +41,7 @@ public class ItemMekanismArmor extends ItemArmor
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
{
int layer = (slot == EntityEquipmentSlot.LEGS) ? 2 : 1;
return "mekanism:armor/" + getArmorMaterial().name().toLowerCase() + "_" + layer + ".png";
return "mekanism:armor/" + getArmorMaterial().name().toLowerCase(Locale.ROOT) + "_" + layer + ".png";
}
@Override