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

More changes, fixed armor

Browse Source
This commit is contained in:
libraryaddict
2016-11-29 07:30:25 +13:00
parent cfdd7bbecf
commit e5799d7a5e
12 changed files with 357 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/me/libraryaddict/disguise/commands/BaseDisguiseCommand.java
View File

@@ -3,7 +3,6 @@ package me.libraryaddict.disguise.commands;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -39,6 +38,7 @@ import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import me.libraryaddict.disguise.disguisetypes.RabbitType;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
/**
* @author libraryaddict
@@ -157,26 +157,6 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
}
}
protected Method[] getDisguiseWatcherMethods(Class<? extends FlagWatcher> watcherClass) {
Method[] methods = watcherClass.getMethods();
methods = Arrays.copyOf(methods, methods.length + 4);
int i = 4;
for (String methodName : new String[] {
"setViewSelfDisguise", "setHideHeldItemFromSelf", "setHideArmorFromSelf", "setHearSelfDisguise"
}) {
try {
methods[methods.length - i--] = Disguise.class.getMethod(methodName, boolean.class);
}
catch (Exception ex) {
ex.printStackTrace();
}
}
return methods;
}
private Entry<Method, Integer> getMethod(Method[] methods, String methodName, int toStart) {
for (int i = toStart; i < methods.length; i++) {
Method method = methods[i];
@@ -665,7 +645,7 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
System.arraycopy(args, toSkip, newArgs, 0, args.length - toSkip);
args = newArgs;
Method[] methods = this.getDisguiseWatcherMethods(disguise.getWatcher().getClass());
Method[] methods = ReflectionFlagWatchers.getDisguiseWatcherMethods(disguise.getWatcher().getClass());
for (int i = 0; i < args.length; i += 2) {
String methodName = args[i];
@@ -985,9 +965,23 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
private ItemStack parseToItemstack(String string) throws Exception {
String[] split = string.split(":", -1);
int itemId = -1;
if (isNumeric(split[0])) {
int itemId = Integer.parseInt(split[0]);
itemId = Integer.parseInt(split[0]);
}
else {
try {
itemId = Material.valueOf(split[0].toUpperCase()).getId();
}
catch (Exception ex) {
}
}
if (itemId != -1) {
short itemDura = 0;
if (split.length > 1) {
if (isNumeric(split[1])) {
itemDura = Short.parseShort(split[1]);
@@ -996,6 +990,7 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
throw parseToException("item ID:Durability combo", string, "%s");
}
}
return new ItemStack(itemId, 1, itemDura);
}
else {

2
src/me/libraryaddict/disguise/commands/DisguiseCommand.java
View File

@@ -123,7 +123,7 @@ public class DisguiseCommand extends BaseDisguiseCommand implements TabCompleter
addMethods = false;
if (info.isEnums()) {
for (String e : info.getEnums()) {
for (String e : info.getEnums(origArgs[origArgs.length - 1])) {
tabs.add(e);
}
}

2
src/me/libraryaddict/disguise/commands/DisguiseHelpCommand.java
View File

@@ -46,7 +46,7 @@ public class DisguiseHelpCommand extends BaseDisguiseCommand implements TabCompl
if (help != null) {
sender.sendMessage(ChatColor.RED + help.getName() + ": " + ChatColor.GREEN
+ StringUtils.join(help.getEnums(), ChatColor.RED + ", " + ChatColor.GREEN));
+ StringUtils.join(help.getEnums(""), ChatColor.RED + ", " + ChatColor.GREEN));
return true;
}

2
src/me/libraryaddict/disguise/commands/EntityDisguiseCommand.java
View File

@@ -108,7 +108,7 @@ public class EntityDisguiseCommand extends BaseDisguiseCommand implements TabCom
addMethods = false;
if (info.isEnums()) {
for (String e : info.getEnums()) {
for (String e : info.getEnums(origArgs[origArgs.length - 1])) {
tabs.add(e);
}
}

2
src/me/libraryaddict/disguise/commands/PlayerDisguiseCommand.java
View File

@@ -159,7 +159,7 @@ public class PlayerDisguiseCommand extends BaseDisguiseCommand implements TabCom
addMethods = false;
if (info.isEnums()) {
for (String e : info.getEnums()) {
for (String e : info.getEnums(origArgs[origArgs.length - 1])) {
tabs.add(e);
}
}

2
src/me/libraryaddict/disguise/commands/RadiusDisguiseCommand.java
View File

@@ -269,7 +269,7 @@ public class RadiusDisguiseCommand extends BaseDisguiseCommand implements TabCom
addMethods = false;
if (info.isEnums()) {
for (String e : info.getEnums()) {
for (String e : info.getEnums(origArgs[origArgs.length - 1])) {
tabs.add(e);
}
}