SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't set default locale, instead use Locale.ENGLISH where possible

Browse Source
This commit is contained in:
libraryaddict
2020-09-14 15:01:05 +12:00
parent 4ff00ee828
commit c295011015
27 changed files with 86 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoManager.java
View File

@@ -21,6 +21,7 @@ import javax.annotation.Nullable;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
public class ParamInfoManager {
private static List<ParamInfo> paramList;
@@ -79,7 +80,7 @@ public class ParamInfoManager {
public static ParamInfo getParamInfo(DisguiseType disguiseType, String methodName) {
for (Method method : getDisguiseWatcherMethods(disguiseType.getWatcherClass())) {
if (!method.getName().toLowerCase().equals(methodName.toLowerCase()))
if (!method.getName().toLowerCase(Locale.ENGLISH).equals(methodName.toLowerCase(Locale.ENGLISH)))
continue;
return getParamInfo(method);

2
src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoTypes.java
View File

@@ -207,7 +207,7 @@ public class ParamInfoTypes {
String[] split = string.split("_");
for (int i = 0; i < split.length; i++) {
split[i] = split[i].substring(0, 1) + split[i].substring(1).toLowerCase();
split[i] = split[i].substring(0, 1) + split[i].substring(1).toLowerCase(Locale.ENGLISH);
}
return StringUtils.join(split, "_");

7
src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockData.java
View File

@@ -9,6 +9,7 @@ import org.bukkit.block.data.BlockData;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
/**
@@ -72,7 +73,7 @@ public class ParamInfoBlockData extends ParamInfo {
@Override
public Set<String> getEnums(String tabComplete) {
String s = tabComplete.toLowerCase();
String s = tabComplete.toLowerCase(Locale.ENGLISH);
HashSet<String> returns = new HashSet<>();
if (s.matches("[a-z_:]+\\[.*")) {
@@ -83,11 +84,11 @@ public class ParamInfoBlockData extends ParamInfo {
continue;
}
if (!m.name().toLowerCase().startsWith(s) && !m.getKey().toString().startsWith(s)) {
if (!m.name().toLowerCase(Locale.ENGLISH).startsWith(s) && !m.getKey().toString().startsWith(s)) {
continue;
}
if (m.name().toLowerCase().startsWith(s)) {
if (m.name().toLowerCase(Locale.ENGLISH).startsWith(s)) {
returns.add(m.name());
} else {
returns.add(m.getKey().toString());

5
src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemBlock.java
View File

@@ -6,6 +6,7 @@ import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import java.util.Arrays;
import java.util.Locale;
/**
* Created by libraryaddict on 16/02/2020.
@@ -48,10 +49,10 @@ public class ParamInfoItemBlock extends ParamInfoItemStack {
throw new IllegalArgumentException();
}
Material material = ReflectionManager.getMaterial(split[0].toLowerCase());
Material material = ReflectionManager.getMaterial(split[0].toLowerCase(Locale.ENGLISH));
if (material == null || material == Material.AIR) {
material = Material.getMaterial(split[0].toUpperCase());
material = Material.getMaterial(split[0].toUpperCase(Locale.ENGLISH));
}
if (material == null || (material == Material.AIR && !split[0].equalsIgnoreCase("air"))) {

7
src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStack.java
View File

@@ -15,6 +15,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Locale;
/**
* Created by libraryaddict on 7/09/2018.
@@ -130,10 +131,10 @@ public class ParamInfoItemStack extends ParamInfoEnum {
split = string.split("[ -]");
}
Material material = ReflectionManager.getMaterial(split[0].toLowerCase());
Material material = ReflectionManager.getMaterial(split[0].toLowerCase(Locale.ENGLISH));
if (material == null) {
material = Material.getMaterial(split[0].toUpperCase());
material = Material.getMaterial(split[0].toUpperCase(Locale.ENGLISH));
}
if (material == null || (material == Material.AIR && !split[0].equalsIgnoreCase("air"))) {
@@ -164,7 +165,7 @@ public class ParamInfoItemStack extends ParamInfoEnum {
return null;
}
Material material = Material.getMaterial(split[0].toUpperCase());
Material material = Material.getMaterial(split[0].toUpperCase(Locale.ENGLISH));
if (material == null || (material == Material.AIR && !split[0].equalsIgnoreCase("air"))) {
throw new IllegalArgumentException();

3
src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStackArray.java
View File

@@ -6,6 +6,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;
/**
@@ -37,7 +38,7 @@ public class ParamInfoItemStackArray extends ParamInfoItemStack {
String lastEntry = split.remove(split.size() - 1);
for (String material : super.getEnums(null)) {
if (!split.isEmpty() && !material.toLowerCase().startsWith(lastEntry.toLowerCase()))
if (!split.isEmpty() && !material.toLowerCase(Locale.ENGLISH).startsWith(lastEntry.toLowerCase(Locale.ENGLISH)))
continue;
toReturn.add(StringUtils.join(split, ",") + (split.isEmpty() ? "" : ",") + material);

3
src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoParticle.java
View File

@@ -14,6 +14,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
/**
@@ -38,7 +39,7 @@ public class ParamInfoParticle extends ParamInfoEnum {
enums = new HashSet<>(enums);
tabComplete = tabComplete.toUpperCase();
tabComplete = tabComplete.toUpperCase(Locale.ENGLISH);
for (Particle particle : new Particle[]{Particle.BLOCK_CRACK, Particle.BLOCK_DUST, Particle.ITEM_CRACK}) {
for (Material mat : materials) {