Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2025-02-02 23:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set locale for toLowerCase and toUpperCase methods

Browse Source
This commit is contained in:
GeorgH93 2019-08-17 15:00:50 +02:00
parent 96a21e6cfc
commit 515a185046
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
12 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>at.pcgamingfreaks</groupId>
<artifactId>Minepacks</artifactId>
<version>2.0.10-RC1</version>
<version>2.0.10-RC2</version>
<scm>
<connection>scm:git:git@github.com:GeorgH93/Minepacks.git</connection>

7
src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 GeorgH93
* Copyright (C) 2019 GeorgH93
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -32,6 +32,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
public class ClearCommand extends MinepacksCommand
{
@ -92,11 +93,11 @@ public List<String> tabComplete(@NotNull CommandSender commandSender, @NotNull S
{
if(args.length > 0 && (!(commandSender instanceof Player) || commandSender.hasPermission("backpack.clean.other")))
{
String name, arg = args[args.length - 1].toLowerCase();
String name, arg = args[args.length - 1].toLowerCase(Locale.ROOT);
List<String> names = new LinkedList<>();
for(Player player : Bukkit.getOnlinePlayers())
{
name = player.getName().toLowerCase();
name = player.getName().toLowerCase(Locale.ROOT);
if(!name.equalsIgnoreCase(commandSender.getName()) && name.startsWith(arg)) names.add(name);
}
return names;

3
src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java
View File

@ -35,6 +35,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Locale;
public class CommandManager extends CommandExecutorWithSubCommandsGeneric<MinepacksCommand> /*if_not[STANDALONE]*/ implements MinepacksCommandManager /*end[STANDALONE]*/
{
@ -132,7 +133,7 @@ public void sendHelp(CommandSender target, String mainCommandAlias, Collection<H
{
for(HelpData d : data)
{
helpFormat.send(target, mainCommandAlias, d.getTranslatedSubCommand(), d.getParameter(), d.getDescription(), d.getClickAction().name().toLowerCase());
helpFormat.send(target, mainCommandAlias, d.getTranslatedSubCommand(), d.getParameter(), d.getDescription(), d.getClickAction().name().toLowerCase(Locale.ROOT));
}
}
}

5
src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 GeorgH93
* Copyright (C) 2019 GeorgH93
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -26,6 +26,7 @@
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Locale;
public class MigrateCommand extends MinepacksCommand
{
@ -39,7 +40,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull String m
{
if(args.length >= 1)
{
switch(args[0].toLowerCase())
switch(args[0].toLowerCase(Locale.ROOT))
{
case "db": case "database": case "storage": migrateDb(sender, args); break;
}

9
src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java
View File

@ -32,6 +32,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
public class OpenCommand extends MinepacksCommand
{
@ -56,7 +57,7 @@ public OpenCommand(Minepacks plugin)
{
allowedGameModesBuilder.append(", ");
}
allowedGameModesBuilder.append(gameMode.name().toLowerCase());
allowedGameModesBuilder.append(gameMode.name().toLowerCase(Locale.ROOT));
}
allowedGameModes = allowedGameModesBuilder.toString(); //TODO translate
}
@ -84,6 +85,7 @@ public void execute(@NotNull CommandSender sender, @NotNull String main, @NotNul
}
else
{
//noinspection StringToUpperCaseOrToLowerCaseWithoutLocale
messageWrongGameMode.send(player, player.getGameMode().name().toLowerCase(), allowedGameModes);
}
}
@ -106,11 +108,11 @@ public List<String> tabComplete(@NotNull CommandSender commandSender, @NotNull S
{
if(args.length > 0 && (!(commandSender instanceof Player) || commandSender.hasPermission("backpack.open.other")))
{
String name, arg = args[args.length - 1].toLowerCase();
String name, arg = args[args.length - 1].toLowerCase(Locale.ROOT);
List<String> names = new LinkedList<>();
for(Player player : Bukkit.getOnlinePlayers())
{
name = player.getName().toLowerCase();
name = player.getName().toLowerCase(Locale.ROOT);
if(!name.equalsIgnoreCase(commandSender.getName()) && name.startsWith(arg)) names.add(name);
}
return names;
@ -125,7 +127,6 @@ public List<HelpData> getHelp(@NotNull CommandSender requester)
help.add(new HelpData(getTranslatedName(), null, getDescription(), MessageClickEvent.ClickEventAction.RUN_COMMAND));
if(requester.hasPermission("backpack.open.other"))
{
//noinspection ConstantConditions
help.add(new HelpData(getTranslatedName(), helpParam, descriptionOpenOthers));
}
return help;

6
src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java
View File

@ -173,7 +173,7 @@ private void listBackups(final @NotNull CommandSender sender, final @NotNull Str
@Override
public List<String> tabComplete(final @NotNull CommandSender sender, final @NotNull String mainCommandAlias, final @NotNull String alias, final @NotNull String[] args)
{
final String arg = args[args.length - 1].toLowerCase();
final String arg = args[args.length - 1].toLowerCase(Locale.ROOT);
List<String> autoComplete = null;
if(args.length == 1)
{
@ -181,7 +181,7 @@ public List<String> tabComplete(final @NotNull CommandSender sender, final @NotN
autoComplete = new LinkedList<>();
for(String backupId : backups)
{
if(backupId.toLowerCase().startsWith(arg)) autoComplete.add(backupId);
if(backupId.toLowerCase(Locale.ROOT).startsWith(arg)) autoComplete.add(backupId);
}
for(String listCommand : listCommands)
{
@ -193,7 +193,7 @@ else if(args.length == 2)
autoComplete = new LinkedList<>();
for(Player player : Bukkit.getOnlinePlayers())
{
if(player.getName().toLowerCase().startsWith(arg)) autoComplete.add(player.getName());
if(player.getName().toLowerCase(Locale.ROOT).startsWith(arg)) autoComplete.add(player.getName());
}
}
return autoComplete;

11
src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java
View File

@ -32,10 +32,7 @@
import org.jetbrains.annotations.NotNull;
import java.io.FileNotFoundException;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.*;
@SuppressWarnings("ConstantConditions")
public class Config extends Configuration implements DatabaseConnectionConfiguration
@ -125,7 +122,7 @@ public boolean getUseUUIDSeparators()
public String getUnCacheStrategie()
{
return getConfig().getString("Database.Cache.UnCache.Strategie", "interval").toLowerCase();
return getConfig().getString("Database.Cache.UnCache.Strategie", "interval").toLowerCase(Locale.ROOT);
}
public long getUnCacheInterval()
@ -210,7 +207,7 @@ public Collection<GameMode> getAllowedGameModes()
{
try
{
gm = GameMode.valueOf(string.toUpperCase());
gm = GameMode.valueOf(string.toUpperCase(Locale.ROOT));
}
catch(IllegalArgumentException ignored)
{
@ -294,7 +291,7 @@ public Collection<String> getWorldBlacklist()
HashSet<String> blacklist = new HashSet<>();
for(String world : getConfig().getStringList("WorldSettings.Blacklist", new LinkedList<>()))
{
blacklist.add(world.toLowerCase());
blacklist.add(world.toLowerCase(Locale.ROOT));
}
return blacklist;
}

5
src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java
View File

@ -39,6 +39,7 @@
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -85,7 +86,7 @@ public void close()
public static Database getDatabase(Minepacks plugin)
{
String dbType = plugin.getConfiguration().getDatabaseType().toLowerCase();
String dbType = plugin.getConfiguration().getDatabaseType().toLowerCase(Locale.ROOT);
ConnectionProvider connectionProvider = null;
if(dbType.equals("shared") || dbType.equals("external") || dbType.equals("global"))
{
@ -99,7 +100,7 @@ public static Database getDatabase(Minepacks plugin)
plugin.getLogger().warning(ConsoleColor.RED + "The shared connection pool is not initialized correctly!" + ConsoleColor.RESET);
return null;
}
dbType = pool.getDatabaseType().toLowerCase();
dbType = pool.getDatabaseType().toLowerCase(Locale.ROOT);
connectionProvider = pool.getConnectionProvider();
/*end[STANDALONE]*/
}

8
src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationManager.java
View File

@ -24,6 +24,8 @@
import org.bukkit.event.HandlerList;
import java.util.Locale;
public class MigrationManager
{
private final Minepacks plugin;
@ -106,7 +108,7 @@ public Migration getMigrationPerformer(String targetDatabaseType)
try
{
boolean global = false;
if(targetDatabaseType.toLowerCase().equals("external") ||targetDatabaseType.toLowerCase().equals("global") || targetDatabaseType.toLowerCase().equals("shared"))
if(targetDatabaseType.toLowerCase(Locale.ROOT).equals("external") || targetDatabaseType.toLowerCase(Locale.ROOT).equals("global") || targetDatabaseType.toLowerCase(Locale.ROOT).equals("shared"))
{
/*if[STANDALONE]
plugin.getLogger().warning(ConsoleColor.RED + "The shared database connection option is not available in standalone mode!" + ConsoleColor.RESET);
@ -118,11 +120,11 @@ public Migration getMigrationPerformer(String targetDatabaseType)
plugin.getLogger().warning(ConsoleColor.RED + "The shared connection pool is not initialized correctly!" + ConsoleColor.RESET);
return null;
}
targetDatabaseType = pool.getDatabaseType().toLowerCase();
targetDatabaseType = pool.getDatabaseType().toLowerCase(Locale.ROOT);
global = true;
/*end[STANDALONE]*/
}
switch(targetDatabaseType.toLowerCase())
switch(targetDatabaseType.toLowerCase(Locale.ROOT))
{
case "flat":
case "file":

9
src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQL.java
View File

@ -33,10 +33,7 @@
import org.jetbrains.annotations.NotNull;
import java.sql.*;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.*;
public abstract class SQL extends Database
{
@ -142,7 +139,7 @@ public UpdateData(String uuid, int id)
String uuid = res.getString(fieldPlayerUUID);
if(uuid == null)
{
toConvert.put(res.getString(fieldPlayerName).toLowerCase(), new UpdateData(null, res.getInt(fieldPlayerID)));
toConvert.put(res.getString(fieldPlayerName).toLowerCase(Locale.ROOT), new UpdateData(null, res.getInt(fieldPlayerID)));
}
else
{
@ -158,7 +155,7 @@ public UpdateData(String uuid, int id)
Map<String, String> newUUIDs = UUIDConverter.getUUIDsFromNames(toConvert.keySet(), true, useUUIDSeparators);
for(Map.Entry<String, String> entry : newUUIDs.entrySet())
{
UpdateData updateData = toConvert.get(entry.getKey().toLowerCase());
UpdateData updateData = toConvert.get(entry.getKey().toLowerCase(Locale.ROOT));
updateData.uuid = entry.getValue();
toUpdate.add(updateData);
}

3
src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DisableShulkerboxes.java
View File

@ -37,6 +37,7 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
public class DisableShulkerboxes extends MinepacksListener
{ //TODO handle existing shulkerboxes in inventory
@ -103,7 +104,7 @@ public void onInventoryClick(InventoryClickEvent event)
@EventHandler(ignoreCancelled = true)
public void onInventoryOpen(InventoryOpenEvent event)
{
if(event.getInventory().getHolder() != null && event.getInventory().getHolder().getClass().getName().toLowerCase().contains("shulker"))
if(event.getInventory().getHolder() != null && event.getInventory().getHolder().getClass().getName().toLowerCase(Locale.ROOT).contains("shulker"))
{
if(removeExisting)
{

3
src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
View File

@ -53,6 +53,7 @@
import java.io.File;
import java.util.Collection;
import java.util.Locale;
public class Minepacks extends JavaPlugin implements MinepacksPlugin
{
@ -332,7 +333,7 @@ public int getBackpackPermSize(Player player)
public WorldBlacklistMode isDisabled(Player player)
{
if(worldBlacklistMode == WorldBlacklistMode.None || (worldBlacklistMode != WorldBlacklistMode.NoPlugin && player.hasPermission("backpack.ignoreWorldBlacklist"))) return WorldBlacklistMode.None;
if(worldBlacklist.contains(player.getWorld().getName().toLowerCase())) return worldBlacklistMode;
if(worldBlacklist.contains(player.getWorld().getName().toLowerCase(Locale.ROOT))) return worldBlacklistMode;
return WorldBlacklistMode.None;
}