Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-16 17:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

use Locale.ROOT for uppercase as well

Browse Source
This commit is contained in:
Jesse Boyd 2019-07-10 22:26:31 +10:00
parent a98a91e066
commit cafd4bfece
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
17 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java
View File

@ -64,6 +64,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -365,7 +366,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
property = new BooleanProperty(state.a(), ImmutableList.copyOf(state.d())); property = new BooleanProperty(state.a(), ImmutableList.copyOf(state.d()));
} else if (state instanceof BlockStateDirection) { } else if (state instanceof BlockStateDirection) {
property = new DirectionalProperty(state.a(), property = new DirectionalProperty(state.a(),
(List<Direction>) state.d().stream().map(e -> Direction.valueOf(((INamable) e).getName().toUpperCase())).collect(Collectors.toList())); (List<Direction>) state.d().stream().map(e -> Direction.valueOf(((INamable) e).getName().toUpperCase(Locale.ROOT))).collect(Collectors.toList()));
} else if (state instanceof BlockStateEnum) { } else if (state instanceof BlockStateEnum) {
property = new EnumProperty(state.a(), property = new EnumProperty(state.a(),
(List<String>) state.d().stream().map(e -> ((INamable) e).getName()).collect(Collectors.toList())); (List<String>) state.d().stream().map(e -> ((INamable) e).getName()).collect(Collectors.toList()));

3
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java
View File

@ -34,6 +34,7 @@ import com.sk89q.worldedit.world.entity.EntityTypes;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Locale;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -88,7 +89,7 @@ public class BukkitEntity implements Entity {
@Override @Override
public com.sk89q.worldedit.world.entity.EntityType getType() { public com.sk89q.worldedit.world.entity.EntityType getType() {
return EntityTypes.get(type.getName().toUpperCase()); return EntityTypes.get(type.getName().toUpperCase(Locale.ROOT));
} }
@Override @Override

3
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
View File

@ -53,6 +53,7 @@ import org.bukkit.inventory.PlayerInventory;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -185,7 +186,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override @Override
public GameMode getGameMode() { public GameMode getGameMode() {
return GameModes.get(player.getGameMode().name().toLowerCase()); return GameModes.get(player.getGameMode().name().toLowerCase(Locale.ROOT));
} }
@Override @Override

2
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -210,7 +210,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
public void setupRegistries() { public void setupRegistries() {
// Biome // Biome
for (Biome biome : Biome.values()) { for (Biome biome : Biome.values()) {
BiomeType.REGISTRY.register("minecraft:" + biome.name().toLowerCase(), new BiomeType("minecraft:" + biome.name().toLowerCase())); BiomeType.REGISTRY.register("minecraft:" + biome.name().toLowerCase(Locale.ROOT), new BiomeType("minecraft:" + biome.name().toLowerCase(Locale.ROOT)));
} }
// Block & Item // Block & Item
for (Material material : Material.values()) { for (Material material : Material.values()) {

6
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/IBukkitAdapter.java
View File

@ -207,7 +207,7 @@ public interface IBukkitAdapter {
if (!itemType.getId().startsWith("minecraft:")) { if (!itemType.getId().startsWith("minecraft:")) {
throw new IllegalArgumentException("Bukkit only supports Minecraft items"); throw new IllegalArgumentException("Bukkit only supports Minecraft items");
} }
return Material.getMaterial(itemType.getId().substring(10).toUpperCase()); return Material.getMaterial(itemType.getId().substring(10).toUpperCase(Locale.ROOT));
} }
/** /**
@ -221,7 +221,7 @@ public interface IBukkitAdapter {
if (!blockType.getId().startsWith("minecraft:")) { if (!blockType.getId().startsWith("minecraft:")) {
throw new IllegalArgumentException("Bukkit only supports Minecraft blocks"); throw new IllegalArgumentException("Bukkit only supports Minecraft blocks");
} }
String id = blockType.getId().substring(10).toUpperCase(); String id = blockType.getId().substring(10).toUpperCase(Locale.ROOT);
return Material.getMaterial(id); return Material.getMaterial(id);
} }
@ -366,7 +366,7 @@ public interface IBukkitAdapter {
throw new IllegalArgumentException("Bukkit only supports vanilla biomes"); throw new IllegalArgumentException("Bukkit only supports vanilla biomes");
} }
try { try {
return Biome.valueOf(biomeType.getId().substring(10).toUpperCase()); return Biome.valueOf(biomeType.getId().substring(10).toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return null; return null;
} }

10
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java
View File

@ -181,7 +181,7 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
} }
state = LegacyMapper.getInstance().getBlockFromLegacy(id, data); state = LegacyMapper.getInstance().getBlockFromLegacy(id, data);
} else { } else {
BlockType type = BlockTypes.get(split[0].toLowerCase()); BlockType type = BlockTypes.get(split[0].toLowerCase(Locale.ROOT));
if (type != null) { if (type != null) {
int data = Integer.parseInt(split[1]); int data = Integer.parseInt(split[1]);
if (data < 0 || data >= 16) { if (data < 0 || data >= 16) {
@ -247,7 +247,7 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
state = item.getType().getBlockType().getDefaultState(); state = item.getType().getBlockType().getDefaultState();
nbt = item.getNbtData(); nbt = item.getNbtData();
} else { } else {
BlockType type = BlockTypes.parse(typeString.toLowerCase()); BlockType type = BlockTypes.parse(typeString.toLowerCase(Locale.ROOT));
if (type != null) { if (type != null) {
state = type.getDefaultState(); state = type.getDefaultState();
@ -309,15 +309,15 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
if (blockAndExtraData.length > 1) { if (blockAndExtraData.length > 1) {
String mobName = blockAndExtraData[1]; String mobName = blockAndExtraData[1];
for (MobType mobType : MobType.values()) { for (MobType mobType : MobType.values()) {
if (mobType.getName().toLowerCase().equals(mobName.toLowerCase())) { if (mobType.getName().toLowerCase().equals(mobName.toLowerCase(Locale.ROOT))) {
mobName = mobType.getName(); mobName = mobType.getName();
break; break;
} }
} }
if (!worldEdit.getPlatformManager().queryCapability(Capability.USER_COMMANDS).isValidMobType(mobName)) { if (!worldEdit.getPlatformManager().queryCapability(Capability.USER_COMMANDS).isValidMobType(mobName)) {
String finalMobName = mobName.toLowerCase(); String finalMobName = mobName.toLowerCase(Locale.ROOT);
throw new SuggestInputParseException("Unknown mob type '" + mobName + "'", mobName, () -> Stream.of(MobType.values()) throw new SuggestInputParseException("Unknown mob type '" + mobName + "'", mobName, () -> Stream.of(MobType.values())
.map(m -> m.getName().toLowerCase()) .map(m -> m.getName().toLowerCase(Locale.ROOT))
.filter(s -> s.startsWith(finalMobName)) .filter(s -> s.startsWith(finalMobName))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }

3
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/BlockCategoryPatternParser.java
View File

@ -30,6 +30,7 @@ import com.sk89q.worldedit.world.block.BlockCategory;
import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockType;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -49,7 +50,7 @@ public class BlockCategoryPatternParser extends InputParser<Pattern> {
if (!input.startsWith("##")) { if (!input.startsWith("##")) {
return null; return null;
} }
String tag = input.substring(2).toLowerCase(); String tag = input.substring(2).toLowerCase(Locale.ROOT);
boolean anyState = false; boolean anyState = false;
if (tag.startsWith("*")) { if (tag.startsWith("*")) {
tag = tag.substring(1); tag = tag.substring(1);

3
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/DefaultPatternParser.java
View File

@ -49,6 +49,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -107,7 +108,7 @@ public class DefaultPatternParser extends FaweParser<Pattern> {
() -> { () -> {
if (full.length() == 1) return new ArrayList<>(dispatcher.getPrimaryAliases()); if (full.length() == 1) return new ArrayList<>(dispatcher.getPrimaryAliases());
return dispatcher.getAliases().stream().filter( return dispatcher.getAliases().stream().filter(
s -> s.startsWith(command.toLowerCase()) s -> s.startsWith(command.toLowerCase(Locale.ROOT))
).collect(Collectors.toList()); ).collect(Collectors.toList());
} }
); );

11
worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java
View File

@ -50,6 +50,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
/** /**
@ -127,7 +128,7 @@ public class BlockTransformExtent extends ResettableExtent {
case FACING: { case FACING: {
List<Direction> directions = new ArrayList<>(); List<Direction> directions = new ArrayList<>();
for (Object value : values) { for (Object value : values) {
directions.add(Direction.valueOf(value.toString().toUpperCase())); directions.add(Direction.valueOf(value.toString().toUpperCase(Locale.ROOT)));
} }
return adapt(directions.toArray(new Direction[0])); return adapt(directions.toArray(new Direction[0]));
} }
@ -331,10 +332,10 @@ public class BlockTransformExtent extends ResettableExtent {
Object southState = tmp.getState(PropertyKey.SOUTH); Object southState = tmp.getState(PropertyKey.SOUTH);
Object westState = tmp.getState(PropertyKey.WEST); Object westState = tmp.getState(PropertyKey.WEST);
tmp = tmp.with(PropertyKey.valueOf(newNorth.name().toUpperCase()), northState); tmp = tmp.with(PropertyKey.valueOf(newNorth.name().toUpperCase(Locale.ROOT)), northState);
tmp = tmp.with(PropertyKey.valueOf(newEast.name().toUpperCase()), eastState); tmp = tmp.with(PropertyKey.valueOf(newEast.name().toUpperCase(Locale.ROOT)), eastState);
tmp = tmp.with(PropertyKey.valueOf(newSouth.name().toUpperCase()), southState); tmp = tmp.with(PropertyKey.valueOf(newSouth.name().toUpperCase(Locale.ROOT)), southState);
tmp = tmp.with(PropertyKey.valueOf(newWest.name().toUpperCase()), westState); tmp = tmp.with(PropertyKey.valueOf(newWest.name().toUpperCase(Locale.ROOT)), westState);
newMaskedId = tmp.getInternalId(); newMaskedId = tmp.getInternalId();
} }

3
worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/PropertyKey.java
View File

@ -6,6 +6,7 @@ import com.sk89q.util.ReflectionUtil;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
/** /**
@ -100,7 +101,7 @@ public enum PropertyKey {
PropertyKey property = PropertyKey.get(id); PropertyKey property = PropertyKey.get(id);
if (property == null) { if (property == null) {
Fawe.debug("Registering property " + id); Fawe.debug("Registering property " + id);
property = ReflectionUtils.addEnum(PropertyKey.class, id.toUpperCase()); property = ReflectionUtils.addEnum(PropertyKey.class, id.toUpperCase(Locale.ROOT));
if (property.getId() == null) { if (property.getId() == null) {
try { try {
ReflectionUtils.setFailsafeFieldValue(PropertyKey.class.getDeclaredField("id"), property, property.name().toLowerCase()); ReflectionUtils.setFailsafeFieldValue(PropertyKey.class.getDeclaredField("id"), property, property.name().toLowerCase());

5
worldedit-core/src/main/java/com/sk89q/worldedit/util/command/SimpleDispatcher.java
View File

@ -35,6 +35,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -104,12 +105,12 @@ public class SimpleDispatcher implements Dispatcher {
@Override @Override
public boolean contains(String alias) { public boolean contains(String alias) {
return commands.containsKey(alias.toLowerCase()); return commands.containsKey(alias.toLowerCase(Locale.ROOT));
} }
@Override @Override
public CommandMapping get(String alias) { public CommandMapping get(String alias) {
return commands.get(alias.toLowerCase()); return commands.get(alias.toLowerCase(Locale.ROOT));
} }
@Override @Override

3
worldedit-core/src/main/java/com/sk89q/worldedit/util/command/argument/ArgumentUtils.java
View File

@ -23,6 +23,7 @@ import com.google.common.collect.Lists;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Locale;
public final class ArgumentUtils { public final class ArgumentUtils {
@ -35,7 +36,7 @@ public final class ArgumentUtils {
} }
List<String> suggestions = Lists.newArrayList(); List<String> suggestions = Lists.newArrayList();
for (String item : items) { for (String item : items) {
if (item.toLowerCase().startsWith(s)) { if (item.toLowerCase(Locale.ROOT).startsWith(s)) {
suggestions.add(item); suggestions.add(item);
} }
} }

5
worldedit-core/src/main/java/com/sk89q/worldedit/util/command/composition/BranchingCommand.java
View File

@ -30,6 +30,7 @@ import com.sk89q.worldedit.util.command.argument.CommandArgs;
import com.sk89q.worldedit.util.command.argument.MissingArgumentException; import com.sk89q.worldedit.util.command.argument.MissingArgumentException;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -55,7 +56,7 @@ public abstract class BranchingCommand<T> implements CommandExecutor<T> {
public T call(CommandArgs args, CommandLocals locals) throws CommandException { public T call(CommandArgs args, CommandLocals locals) throws CommandException {
try { try {
String classifier = args.next(); String classifier = args.next();
CommandExecutor<? extends T> executor = options.get(classifier.toLowerCase()); CommandExecutor<? extends T> executor = options.get(classifier.toLowerCase(Locale.ROOT));
if (executor != null) { if (executor != null) {
return executor.call(args, locals); return executor.call(args, locals);
} else { } else {
@ -72,7 +73,7 @@ public abstract class BranchingCommand<T> implements CommandExecutor<T> {
public List<String> getSuggestions(CommandArgs args, CommandLocals locals) throws MissingArgumentException { public List<String> getSuggestions(CommandArgs args, CommandLocals locals) throws MissingArgumentException {
String classifier = args.next(); String classifier = args.next();
try { try {
CommandExecutor<? extends T> executor = options.get(classifier.toLowerCase()); CommandExecutor<? extends T> executor = options.get(classifier.toLowerCase(Locale.ROOT));
if (executor != null) { if (executor != null) {
return executor.getSuggestions(args, locals); return executor.getSuggestions(args, locals);
} }

5
worldedit-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java
View File

@ -43,6 +43,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Set; import java.util.Set;
/** /**
@ -348,10 +349,10 @@ public class ParametricCallable extends AParametricCallable {
*/ */
private static String generateName(Type type, Annotation classifier, int index) { private static String generateName(Type type, Annotation classifier, int index) {
if (classifier != null) { if (classifier != null) {
return classifier.annotationType().getSimpleName().toLowerCase(); return classifier.annotationType().getSimpleName().toLowerCase(Locale.ROOT);
} else { } else {
if (type instanceof Class<?>) { if (type instanceof Class<?>) {
return ((Class<?>) type).getSimpleName().toLowerCase(); return ((Class<?>) type).getSimpleName().toLowerCase(Locale.ROOT);
} else { } else {
return "unknown" + index; return "unknown" + index;
} }

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -859,7 +859,7 @@ public final class BlockTypes {
// Get the enum name (remove namespace if minecraft:) // Get the enum name (remove namespace if minecraft:)
int propStart = id.indexOf('['); int propStart = id.indexOf('[');
String typeName = id.substring(0, propStart == -1 ? id.length() : propStart); String typeName = id.substring(0, propStart == -1 ? id.length() : propStart);
String enumName = (typeName.startsWith("minecraft:") ? typeName.substring(10) : typeName).toUpperCase(); String enumName = (typeName.startsWith("minecraft:") ? typeName.substring(10) : typeName).toUpperCase(Locale.ROOT);
BlockType existing = new BlockType(id, internalId, states); BlockType existing = new BlockType(id, internalId, states);

3
worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.world.entity; package com.sk89q.worldedit.world.entity;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Locale;
public class EntityTypes { public class EntityTypes {
@ -162,7 +163,7 @@ public class EntityTypes {
} }
return parse(result.toString()); return parse(result.toString());
} }
switch (id.toLowerCase()) { switch (id.toLowerCase(Locale.ROOT)) {
case "xp_orb": case "xp_orb":
return EntityTypes.EXPERIENCE_ORB; return EntityTypes.EXPERIENCE_ORB;
case "xp_bottle": case "xp_bottle":

3
worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java
View File

@ -24,6 +24,7 @@ import com.sk89q.worldedit.world.registry.LegacyMapper;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collection; import java.util.Collection;
import java.util.Locale;
public final class ItemTypes { public final class ItemTypes {
@ -823,7 +824,7 @@ public final class ItemTypes {
@Nullable @Nullable
public static ItemType parse(String input) { public static ItemType parse(String input) {
input = input.toLowerCase(); input = input.toLowerCase(Locale.ROOT);
if (!Character.isAlphabetic(input.charAt(0))) { if (!Character.isAlphabetic(input.charAt(0))) {
try { try {
ItemType legacy = LegacyMapper.getInstance().getItemFromLegacy(input); ItemType legacy = LegacyMapper.getInstance().getItemFromLegacy(input);