twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-10 17:52:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

BUILDTOOLS-251: Make much of Bukkit locale independent

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2016-06-26 19:31:59 +10:00
parent b54985de63
commit 7f7f1608e8
17 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java
View File

@@ -60,8 +60,8 @@ public class SimpleCommandMap implements CommandMap {
* {@inheritDoc}
*/
public boolean register(String label, String fallbackPrefix, Command command) {
label = label.toLowerCase().trim();
fallbackPrefix = fallbackPrefix.toLowerCase().trim();
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
boolean registered = register(label, command, false, fallbackPrefix);
Iterator<String> iterator = command.getAliases().iterator();
@@ -128,7 +128,7 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
String sentCommandLabel = args[0].toLowerCase();
String sentCommandLabel = args[0].toLowerCase(java.util.Locale.ENGLISH);
Command target = getCommand(sentCommandLabel);
if (target == null) {
@@ -157,7 +157,7 @@ public class SimpleCommandMap implements CommandMap {
}
public Command getCommand(String name) {
Command target = knownCommands.get(name.toLowerCase());
Command target = knownCommands.get(name.toLowerCase(java.util.Locale.ENGLISH));
return target;
}
@@ -252,9 +252,9 @@ public class SimpleCommandMap implements CommandMap {
// We register these as commands so they have absolute priority.
if (targets.size() > 0) {
knownCommands.put(alias.toLowerCase(), new FormattedCommandAlias(alias.toLowerCase(), targets.toArray(new String[targets.size()])));
knownCommands.put(alias.toLowerCase(java.util.Locale.ENGLISH), new FormattedCommandAlias(alias.toLowerCase(java.util.Locale.ENGLISH), targets.toArray(new String[targets.size()])));
} else {
knownCommands.remove(alias.toLowerCase());
knownCommands.remove(alias.toLowerCase(java.util.Locale.ENGLISH));
}
}
}

2
paper-api/src/main/java/org/bukkit/command/defaults/EnchantCommand.java
View File

@@ -54,7 +54,7 @@ public class EnchantCommand extends VanillaCommand {
String itemName = item.getType().toString().replaceAll("_", " ");
itemName = WordUtils.capitalizeFully(itemName);
Enchantment enchantment = getEnchantment(args[1].toUpperCase());
Enchantment enchantment = getEnchantment(args[1].toUpperCase(java.util.Locale.ENGLISH));
if (enchantment == null) {
sender.sendMessage(String.format("Enchantment does not exist: %s", args[1]));
} else {

4
paper-api/src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java
View File

@@ -436,7 +436,7 @@ public class ScoreboardCommand extends VanillaCommand {
sender.sendMessage(ChatColor.RED + "No team was found by the name '" + teamName + "'");
return false;
}
String option = args[3].toLowerCase();
String option = args[3].toLowerCase(java.util.Locale.ENGLISH);
if (!option.equals("friendlyfire") && !option.equals("color") && !option.equals("seefriendlyinvisibles")) {
sender.sendMessage(ChatColor.RED + "/scoreboard teams option <team> <friendlyfire|color|seefriendlyinvisibles> <value>");
return false;
@@ -448,7 +448,7 @@ public class ScoreboardCommand extends VanillaCommand {
sender.sendMessage(ChatColor.RED + "Valid values for option " + option + " are: true and false");
}
} else {
String value = args[4].toLowerCase();
String value = args[4].toLowerCase(java.util.Locale.ENGLISH);
if (option.equals("color")) {
ChatColor color = TEAMS_OPTION_COLOR.get(value);
if (color == null) {

6
paper-api/src/main/java/org/bukkit/command/defaults/VersionCommand.java
View File

@@ -64,9 +64,9 @@ public class VersionCommand extends BukkitCommand {
}
boolean found = false;
pluginName = pluginName.toLowerCase();
pluginName = pluginName.toLowerCase(java.util.Locale.ENGLISH);
for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
if (plugin.getName().toLowerCase().contains(pluginName)) {
if (plugin.getName().toLowerCase(java.util.Locale.ENGLISH).contains(pluginName)) {
describeToSender(plugin, sender);
found = true;
}
@@ -131,7 +131,7 @@ public class VersionCommand extends BukkitCommand {
if (args.length == 1) {
List<String> completions = new ArrayList<String>();
String toComplete = args[0].toLowerCase();
String toComplete = args[0].toLowerCase(java.util.Locale.ENGLISH);
for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
if (StringUtil.startsWithIgnoreCase(plugin.getName(), toComplete)) {
completions.add(plugin.getName());