Merge remote-tracking branch 'remotes/origin/master' into translate

This commit is contained in:
libraryaddict 2017-06-19 22:03:41 +12:00
commit 894336194c

View file

@ -1,30 +1,23 @@
package me.libraryaddict.disguise.utilities; package me.libraryaddict.disguise.utilities;
import java.lang.reflect.Method; import com.comphenix.protocol.wrappers.BlockPosition;
import java.util.ArrayList; import com.mojang.authlib.GameProfile;
import java.util.Arrays; import me.libraryaddict.disguise.disguisetypes.*;
import java.util.Collections; import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
import java.util.Comparator;
import java.util.Iterator;
import com.mysql.fabric.xmlrpc.base.Param;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Art; import org.bukkit.Art;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.TreeSpecies; import org.bukkit.TreeSpecies;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.*; import org.bukkit.entity.Horse;
import org.bukkit.entity.Llama;
import org.bukkit.entity.Ocelot;
import org.bukkit.entity.Villager;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import com.comphenix.protocol.wrappers.BlockPosition; import java.lang.reflect.Method;
import com.mojang.authlib.GameProfile; import java.util.*;
import me.libraryaddict.disguise.disguisetypes.AnimalColor;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
public class ReflectionFlagWatchers { public class ReflectionFlagWatchers {
public static class ParamInfo { public static class ParamInfo {
@ -151,7 +144,7 @@ public class ReflectionFlagWatchers {
"View all the professions you can set on a villager"); "View all the professions you can set on a villager");
new ParamInfo(BlockFace.class, Arrays.copyOf(BlockFace.values(), 4), "Direction", new ParamInfo(BlockFace.class, Arrays.copyOf(BlockFace.values(), 4), "Direction",
"View the five directions usable on player setSleeping disguise"); "View the five directions usable on player setSleeping disguise");
new ParamInfo(Rabbit.Type.class, "Rabbit Type", "View the kinds of rabbits you can turn into"); new ParamInfo(RabbitType.class, "Rabbit Type", "View the kinds of rabbits you can turn into");
new ParamInfo(TreeSpecies.class, "Tree Species", "View the different types of tree species"); new ParamInfo(TreeSpecies.class, "Tree Species", "View the different types of tree species");
try { try {
@ -182,8 +175,8 @@ public class ReflectionFlagWatchers {
materials) { materials) {
@Override @Override
public String[] getEnums(String tabComplete) { public String[] getEnums(String tabComplete) {
String beginning = tabComplete.substring(0, String beginning = tabComplete
tabComplete.contains(",") ? tabComplete.lastIndexOf(",") + 1 : 0); .substring(0, tabComplete.contains(",") ? tabComplete.lastIndexOf(",") + 1 : 0);
String end = tabComplete.substring(tabComplete.contains(",") ? tabComplete.lastIndexOf(",") + 1 : 0); String end = tabComplete.substring(tabComplete.contains(",") ? tabComplete.lastIndexOf(",") + 1 : 0);
ArrayList<String> toReturn = new ArrayList<>(); ArrayList<String> toReturn = new ArrayList<>();