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

Fixed bugs, added custom disguises support, create your own disguises

Browse Source
This commit is contained in:
libraryaddict 2016-12-01 06:38:43 +13:00
parent 49910a4fa5
commit 24f88338c8
25 changed files with 1471 additions and 1256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
disguises.yml Normal file
View File

@ -0,0 +1,7 @@
# Here you can create your own disguises and disguise into them using the normal disguise commands
# To create them is super simple, you're using it just like you would in a command. The only tricky thing is that it must be valid yaml. TIP: Enclose the strings in '
# Please note that this is parsed exactly like a command, no spaces in your playername.
# The following disguises will work if you remove the '#' at the beginning of the line, this creates a disguise which you can use by /disguise libraryaddict. So simple!
Disguises:
# libraryaddict: 'player libraryaddict setArmor GOLD_BOOTS,GOLD_LEGGINGS,GOLD_CHESTPLATE,GOLD_HELMET setItemInMainHand WRITTEN_BOOK setGlowing setSkin {"id":"a149f81bf7844f8987c554afdd4db533","name":"libraryaddict","properties":[{"signature":"afoGOO45t3iGvTyQ732AlugPOvj13/RNjM0/utYlD4PZ4ab4Jopbzr8Px75+ALdkyegoKNcfaH4aXzylMvL6mIwaRdL0af7pfGibMMCMJ8F1RAMl2WqRslKBKXHGS1OXxMweoXW+RRatGgZsUC1BjxHMwd4RuXxrV9ZZ7x1r4xouUXmMzn19wqNO9EeG2q8AgF/hZdrnJPdTTrqJs04r4vCQiFiQsTWiY/B5CBOTh6fw4NpOHeeiJwHOLvN+6xKnAm77nKawaKCSciDwt54EeZoE/Q5ReQUEFgj++jdyHb5PJbhGytr//mazpTVzvlDnO06CZqigbiueV2/ush2gKSXQeimCXeNZzcj/CFgqAmMSEZQW3qHp+DgoqqtBNabJa0FBzpbQQ/jQWzoHfmUC/hTf0A0+hgOe4NqDc+xXYf4A9M/6/0JHz0voWhQJi8QriM699DeeUa31bVdTdKjcyK6Zw6/HIOJt++eFnkf++/zKt0fMiqfdRamSqR/K3w+Kk7cs2D345BNubl5L83YWmLbebUcAPKaza5gi17lUW+h/FitzfKAJZ+xsfSdj27nQLa24xYsyB3Fi5DcFLI2oQt5BYAvViT37sabGOXbDBsrijS4t3++mIbC+pCDiKi0hwZzvy0TPRTle2RMhJ6D66DmpykwqBOxzD73fEsieWX4=","name":"textures","value":"eyJ0aW1lc3RhbXAiOjE0ODA1MjA3NjAxNTksInByb2ZpbGVJZCI6ImExNDlmODFiZjc4NDRmODk4N2M1NTRhZmRkNGRiNTMzIiwicHJvZmlsZU5hbWUiOiJsaWJyYXJ5YWRkaWN0Iiwic2lnbmF0dXJlUmVxdWlyZWQiOnRydWUsInRleHR1cmVzIjp7IlNLSU4iOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84ZTQ5NDVkMzZjZjVhNjI1OGZjOGY4ZTM5NmZlZWYzMzY1ZjM2MjgyYjE2MjY0OWI2M2NmZWQzNzNmNzY1OSJ9LCJDQVBFIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZWZkNjFjM2M0YWM4OGYxYTM0NjhmYmRlZWY0NWNlYzg5ZTVhZmI4N2I5N2ExYTg0NWJmYjNjNjRmZDBiODgzIn19fQ=="}]}'
# Warrior: 'zombie setArmor DIAMOND_BOOTS,DIAMOND_LEGGINGS,DIAMOND_CHESTPLATE,DIAMOND_HELMET setItemInMainHand DIAMOND_SWORD setItemInOffHand SHIELD'

3
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>LibsDisguises</artifactId> <artifactId>LibsDisguises</artifactId>
<version>9.1.1</version> <version>9.1.1-SNAPSHOT</version>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
@ -19,6 +19,7 @@
<includes> <includes>
<include>plugin.yml</include> <include>plugin.yml</include>
<include>config.yml</include> <include>config.yml</include>
<include>disguises.yml</include>
<include>README.md</include> <include>README.md</include>
</includes> </includes>
</resource> </resource>

72
src/me/libraryaddict/disguise/DisguiseConfig.java
View File

@ -1,8 +1,17 @@
package me.libraryaddict.disguise; package me.libraryaddict.disguise;
import java.io.File;
import java.util.HashMap;
import java.util.Map.Entry;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.utilities.DisguiseParser;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguiseParseException;
import me.libraryaddict.disguise.utilities.PacketsManager; import me.libraryaddict.disguise.utilities.PacketsManager;
public class DisguiseConfig { public class DisguiseConfig {
@ -45,6 +54,7 @@ public class DisguiseConfig {
private static String updateNotificationPermission; private static String updateNotificationPermission;
private static boolean viewSelfDisguise; private static boolean viewSelfDisguise;
private static boolean witherSkullEnabled; private static boolean witherSkullEnabled;
private static HashMap<String, Disguise> customDisguises = new HashMap<String, Disguise>();
public static String getDisguiseBlownMessage() { public static String getDisguiseBlownMessage() {
return disguiseBlownMessage; return disguiseBlownMessage;
@ -109,6 +119,68 @@ public class DisguiseConfig {
setStopShulkerDisguisesFromMoving(config.getBoolean("StopShulkerDisguisesFromMoving", true)); setStopShulkerDisguisesFromMoving(config.getBoolean("StopShulkerDisguisesFromMoving", true));
setHideDisguisedPlayers(config.getBoolean("HideDisguisedPlayersFromTab")); setHideDisguisedPlayers(config.getBoolean("HideDisguisedPlayersFromTab"));
setShowDisguisedPlayersInTab(config.getBoolean("ShowPlayerDisguisesInTab")); setShowDisguisedPlayersInTab(config.getBoolean("ShowPlayerDisguisesInTab"));
customDisguises.clear();
File disguisesFile = new File("plugins/LibsDisguises/disguises.yml");
if (!disguisesFile.exists())
return;
YamlConfiguration disguisesConfig = YamlConfiguration.loadConfiguration(disguisesFile);
ConfigurationSection section = disguisesConfig.getConfigurationSection("Disguises");
if (section == null) {
return;
}
for (String key : section.getKeys(false)) {
String toParse = section.getString(key);
if (getCustomDisguise(toParse) != null) {
System.err
.println("[LibsDisguises] Cannot create the custom disguise '" + key + "' as there is a name conflict!");
continue;
}
try {
Disguise disguise = DisguiseParser.parseDisguise(Bukkit.getConsoleSender(), "disguise", toParse.split(" "),
DisguiseParser.getPermissions(Bukkit.getConsoleSender(), "disguise"));
customDisguises.put(key, disguise);
System.out.println("[LibsDisguises] Loaded custom disguise " + key);
}
catch (DisguiseParseException e) {
System.err.println("[LibsDisguises] Error while loading custom disguise '" + key + "'"
+ (e.getMessage() == null ? "" : ": " + e.getMessage()));
if (e.getMessage() == null)
e.printStackTrace();
}
catch (Exception e) {
e.printStackTrace();
}
}
System.out.println("[LibsDisguises] Loaded " + customDisguises.size() + " custom disguise"
+ (customDisguises.size() == 1 ? "" : "s"));
}
public static HashMap<String, Disguise> getCustomDisguises() {
return customDisguises;
}
public static Entry<String, Disguise> getCustomDisguise(String disguise) {
for (Entry<String, Disguise> entry : customDisguises.entrySet()) {
if (!entry.getKey().equalsIgnoreCase(disguise) && !entry.getKey().replaceAll("_", "").equalsIgnoreCase(disguise))
continue;
return entry;
}
return null;
} }
public static boolean isAnimationPacketsEnabled() { public static boolean isAnimationPacketsEnabled() {

14
src/me/libraryaddict/disguise/LibsDisguises.java
View File

@ -1,5 +1,6 @@
package me.libraryaddict.disguise; package me.libraryaddict.disguise;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -81,13 +82,20 @@ public class LibsDisguises extends JavaPlugin {
return; return;
} }
instance = this;
saveDefaultConfig();
getLogger().info("Discovered MC version: " + ReflectionManager.getBukkitVersion()); getLogger().info("Discovered MC version: " + ReflectionManager.getBukkitVersion());
saveDefaultConfig(); if (!new File(getDataFolder(), "disguises.yml").exists()) {
saveResource("disguises.yml", false);
}
PacketsManager.init(this); PacketsManager.init(this);
DisguiseUtilities.init(this); DisguiseUtilities.init(this);
registerValues();
DisguiseConfig.initConfig(getConfig()); DisguiseConfig.initConfig(getConfig());
PacketsManager.addPacketListeners(); PacketsManager.addPacketListeners();
@ -109,10 +117,6 @@ public class LibsDisguises extends JavaPlugin {
registerCommand("libsdisguises", new LibsDisguisesCommand()); registerCommand("libsdisguises", new LibsDisguisesCommand());
registerCommand("disguiseviewself", new DisguiseViewSelfCommand()); registerCommand("disguiseviewself", new DisguiseViewSelfCommand());
registerValues();
instance = this;
try { try {
Metrics metrics = new Metrics(this); Metrics metrics = new Metrics(this);
metrics.start(); metrics.start();

950
src/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
View File

@ -1,81 +1,21 @@
package me.libraryaddict.disguise.commands; package me.libraryaddict.disguise.commands;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import java.util.regex.Pattern;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.BlockFace;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.Animals;
import org.bukkit.entity.Llama;
import org.bukkit.entity.Monster;
import org.bukkit.inventory.ItemStack;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.potion.PotionEffectType;
import com.comphenix.protocol.wrappers.BlockPosition; import me.libraryaddict.disguise.utilities.DisguiseParser;
import com.comphenix.protocol.wrappers.WrappedGameProfile; import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
import com.comphenix.protocol.wrappers.WrappedSignedProperty;
import com.google.gson.Gson;
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.disguisetypes.MiscDisguise;
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 * @author libraryaddict
*/ */
public abstract class DisguiseBaseCommand implements CommandExecutor { public abstract class DisguiseBaseCommand implements CommandExecutor {
public class DisguiseParseException extends Exception {
private static final long serialVersionUID = 1276971370793124510L;
public DisguiseParseException() {
super();
}
public DisguiseParseException(String string) {
super(string);
}
}
private Object callValueOf(Class<?> param, String valueString, String methodName, String description)
throws DisguiseParseException {
Object value;
try {
value = param.getMethod("valueOf", String.class).invoke(null, valueString.toUpperCase());
}
catch (Exception ex) {
throw parseToException(description, valueString, methodName);
}
return value;
}
private void doCheck(HashMap<ArrayList<String>, Boolean> optionPermissions, ArrayList<String> usedOptions)
throws DisguiseParseException {
if (!passesCheck(optionPermissions, usedOptions)) {
throw new DisguiseParseException(ChatColor.RED + "You do not have the permission to use the option "
+ usedOptions.get(usedOptions.size() - 1));
}
}
protected ArrayList<String> filterTabs(ArrayList<String> list, String[] origArgs) { protected ArrayList<String> filterTabs(ArrayList<String> list, String[] origArgs) {
if (origArgs.length == 0) if (origArgs.length == 0)
@ -93,14 +33,17 @@ public abstract class DisguiseBaseCommand implements CommandExecutor {
itel.remove(); itel.remove();
} }
return list; return new ArrayList<String>(new HashSet<String>(list));
} }
protected ArrayList<String> getAllowedDisguises(HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> hashMap) { protected ArrayList<String> getAllowedDisguises(HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> hashMap) {
ArrayList<String> allowedDisguises = new ArrayList<>(); ArrayList<String> allowedDisguises = new ArrayList<>();
for (DisguiseType type : hashMap.keySet()) { for (DisguisePerm type : hashMap.keySet()) {
allowedDisguises.add(type.toReadable().replace(" ", "_")); if (type.isUnknown())
continue;
allowedDisguises.add(type.toReadable().replaceAll(" ", "_"));
} }
Collections.sort(allowedDisguises, String.CASE_INSENSITIVE_ORDER); Collections.sort(allowedDisguises, String.CASE_INSENSITIVE_ORDER);
@ -140,287 +83,8 @@ public abstract class DisguiseBaseCommand implements CommandExecutor {
throw new UnsupportedOperationException("Unknown disguise command, perm node not found"); throw new UnsupportedOperationException("Unknown disguise command, perm node not found");
} }
protected HashMap<String, Boolean> getDisguiseOptions(CommandSender sender, DisguiseType type) { protected HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> getPermissions(CommandSender sender) {
switch (type) { return DisguiseParser.getPermissions(sender, "libsdisguises." + getPermNode() + ".");
case PLAYER:
case FALLING_BLOCK:
case PAINTING:
case SPLASH_POTION:
case FISHING_HOOK:
case DROPPED_ITEM:
HashMap<String, Boolean> returns = new HashMap<>();
String beginning = "libsdisguises.options." + getPermNode() + ".";
for (PermissionAttachmentInfo permission : sender.getEffectivePermissions()) {
String lowerPerm = permission.getPermission().toLowerCase();
if (lowerPerm.startsWith(beginning)) {
String[] split = lowerPerm.substring(beginning.length()).split("\\.");
if (split.length > 1) {
if (split[0].replace("_", "").equals(type.name().toLowerCase().replace("_", ""))) {
for (int i = 1; i < split.length; i++) {
returns.put(split[i], permission.getValue());
}
}
}
}
}
return returns;
default:
return new HashMap<>();
}
}
private Entry<Method, Integer> getMethod(Method[] methods, String methodName, int toStart) {
for (int i = toStart; i < methods.length; i++) {
Method method = methods[i];
if (!method.getName().startsWith("get") && method.getName().equalsIgnoreCase(methodName)
&& method.getAnnotation(Deprecated.class) == null && method.getParameterTypes().length == 1) {
return new HashMap.SimpleEntry(method, ++i);
}
}
return null;
}
private HashMap<ArrayList<String>, Boolean> getOptions(String perm) {
ArrayList<String> list = new ArrayList<>();
boolean isRemove = true;
String[] split = perm.split("\\.");
for (int i = 1; i < split.length; i++) {
String option = split[i];
boolean value = option.startsWith("-");
if (value) {
option = option.substring(1);
isRemove = false;
}
if (option.equals("baby")) {
option = "setbaby";
}
list.add(option);
}
HashMap<ArrayList<String>, Boolean> options = new HashMap<>();
options.put(list, isRemove);
return options;
}
protected HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> getPermissions(CommandSender sender) {
return getPermissions(sender, "libsdisguises." + getPermNode() + ".");
}
/**
* Get perms for the node. Returns a hashmap of allowed disguisetypes and their options
*
* @param sender
* @param permissionNode
* @return
*/
protected HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> getPermissions(CommandSender sender,
String permissionNode) {
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> singleDisguises = new HashMap<>();
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> rangeDisguises = new HashMap<>();
HashMap<String, Boolean> perms = new HashMap<>();
for (PermissionAttachmentInfo permission : sender.getEffectivePermissions()) {
String perm = permission.getPermission().toLowerCase();
if (perm.startsWith(permissionNode) && (!perms.containsKey(perm) || !permission.getValue())) {
perms.put(perm, permission.getValue());
}
}
if (!perms.containsKey(permissionNode + "*") && sender.hasPermission(permissionNode + "*")) {
perms.put(permissionNode + "*", true);
}
if (!perms.containsKey(permissionNode + "*.*") && sender.hasPermission(permissionNode + "*.*")) {
perms.put(permissionNode + "*.*", true);
}
for (String perm : perms.keySet()) {
if (perms.get(perm)) {
perm = perm.substring(permissionNode.length());
String disguiseType = perm.split("\\.")[0];
DisguiseType dType = null;
for (DisguiseType t : DisguiseType.values()) {
if (t.name().replace("_", "").equalsIgnoreCase(disguiseType.replace("_", ""))) {
dType = t;
break;
}
}
if (dType != null) {
HashMap<ArrayList<String>, Boolean> list;
if (singleDisguises.containsKey(dType)) {
list = singleDisguises.get(dType);
}
else {
list = new HashMap<>();
singleDisguises.put(dType, list);
}
HashMap<ArrayList<String>, Boolean> map1 = getOptions(perm);
list.put(map1.keySet().iterator().next(), map1.values().iterator().next());
}
else {
for (DisguiseType type : DisguiseType.values()) {
HashMap<ArrayList<String>, Boolean> options = null;
Class entityClass = type.getEntityClass();
if (disguiseType.equals("mob")) {
if (type.isMob()) {
options = getOptions(perm);
}
}
else if (disguiseType.equals("animal") || disguiseType.equals("animals")) {
if (Animals.class.isAssignableFrom(entityClass)) {
options = getOptions(perm);
}
}
else if (disguiseType.equals("monster") || disguiseType.equals("monsters")) {
if (Monster.class.isAssignableFrom(entityClass)) {
options = getOptions(perm);
}
}
else if (disguiseType.equals("misc")) {
if (type.isMisc()) {
options = getOptions(perm);
}
}
else if (disguiseType.equals("ageable")) {
if (Ageable.class.isAssignableFrom(entityClass)) {
options = getOptions(perm);
}
}
else if (disguiseType.equals("*")) {
options = getOptions(perm);
}
if (options != null) {
HashMap<ArrayList<String>, Boolean> list;
if (rangeDisguises.containsKey(type)) {
list = rangeDisguises.get(type);
}
else {
list = new HashMap<>();
rangeDisguises.put(type, list);
}
HashMap<ArrayList<String>, Boolean> map1 = getOptions(perm);
list.put(map1.keySet().iterator().next(), map1.values().iterator().next());
}
}
}
}
}
for (String perm : perms.keySet()) {
if (!perms.get(perm)) {
perm = perm.substring(permissionNode.length());
String disguiseType = perm.split("\\.")[0];
DisguiseType dType = null;
for (DisguiseType t : DisguiseType.values()) {
if (t.name().replace("_", "").equalsIgnoreCase(disguiseType.replace("_", ""))) {
dType = t;
break;
}
}
if (dType != null) {
singleDisguises.remove(dType);
rangeDisguises.remove(dType);
}
else {
for (DisguiseType type : DisguiseType.values()) {
boolean foundHim = false;
Class entityClass = type.getEntityClass();
switch (disguiseType) {
case "mob":
if (type.isMob()) {
foundHim = true;
}
break;
case "animal":
case "animals":
if (Animals.class.isAssignableFrom(entityClass)) {
foundHim = true;
}
break;
case "monster":
case "monsters":
if (Monster.class.isAssignableFrom(entityClass)) {
foundHim = true;
}
break;
case "misc":
if (type.isMisc()) {
foundHim = true;
}
break;
case "ageable":
if (Ageable.class.isAssignableFrom(entityClass)) {
foundHim = true;
}
break;
case "*":
foundHim = true;
break;
}
if (foundHim) {
rangeDisguises.remove(type);
}
}
}
}
}
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map = new HashMap<>();
for (DisguiseType type : DisguiseType.values()) {
HashMap<ArrayList<String>, Boolean> temp = new HashMap<>();
if (singleDisguises.containsKey(type)) {
temp.putAll(singleDisguises.get(type));
}
if (rangeDisguises.containsKey(type)) {
temp.putAll(rangeDisguises.get(type));
}
if (!temp.isEmpty()) {
map.put(type, temp);
}
}
return map;
}
protected boolean isDouble(String string) {
try {
Float.parseFloat(string);
return true;
}
catch (Exception ex) {
return false;
}
} }
protected boolean isNumeric(String string) { protected boolean isNumeric(String string) {
@ -433,594 +97,6 @@ public abstract class DisguiseBaseCommand implements CommandExecutor {
} }
} }
/**
* Returns the disguise if it all parsed correctly. Returns a exception with a complete message if it didn't. The
* commandsender is purely used for checking permissions. Would defeat the purpose otherwise. To reach this point, the
* disguise has been feed a proper disguisetype.
*
* @param sender
* @param args
* @param map
* @return
* @throws DisguiseBaseCommand.DisguiseParseException
* @throws java.lang.IllegalAccessException
* @throws java.lang.reflect.InvocationTargetException
*/
protected Disguise parseDisguise(CommandSender sender, String[] args,
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map)
throws DisguiseParseException, IllegalAccessException, InvocationTargetException {
if (map.isEmpty()) {
throw new DisguiseParseException(ChatColor.RED + "You are forbidden to use this command.");
}
if (args.length == 0) {
sendCommandUsage(sender, map);
throw new DisguiseParseException();
}
// How many args to skip due to the disugise being constructed
// Time to start constructing the disguise.
// We will need to check between all 3 kinds of disguises
int toSkip = 1;
ArrayList<String> usedOptions = new ArrayList<>();
Disguise disguise = null;
HashMap<ArrayList<String>, Boolean> optionPermissions;
if (args[0].startsWith("@")) {
if (sender.hasPermission("libsdisguises.disguise.disguiseclone")) {
disguise = DisguiseUtilities.getClonedDisguise(args[0].toLowerCase());
if (disguise == null) {
throw new DisguiseParseException(ChatColor.RED + "Cannot find a disguise under the reference " + args[0]);
}
}
else {
throw new DisguiseParseException(ChatColor.RED + "You do not have perimssion to use disguise references!");
}
optionPermissions = (map.containsKey(disguise.getType()) ? map.get(disguise.getType())
: new HashMap<ArrayList<String>, Boolean>());
}
else {
DisguiseType disguiseType = null;
if (args[0].equalsIgnoreCase("p")) {
disguiseType = DisguiseType.PLAYER;
}
else {
for (DisguiseType type : DisguiseType.values()) {
if (args[0].equalsIgnoreCase(type.name()) || args[0].equalsIgnoreCase(type.name().replace("_", ""))) {
disguiseType = type;
break;
}
}
}
if (disguiseType == null) {
throw new DisguiseParseException(
ChatColor.RED + "Error! The disguise " + ChatColor.GREEN + args[0] + ChatColor.RED + " doesn't exist!");
}
if (disguiseType.isUnknown()) {
throw new DisguiseParseException(ChatColor.RED + "Error! You cannot disguise as " + ChatColor.GREEN + "Unknown!");
}
if (disguiseType.getEntityType() == null) {
throw new DisguiseParseException(ChatColor.RED + "Error! This version of minecraft does not have that disguise!");
}
if (!map.containsKey(disguiseType)) {
throw new DisguiseParseException(ChatColor.RED + "You are forbidden to use this disguise.");
}
optionPermissions = map.get(disguiseType);
HashMap<String, Boolean> disguiseOptions = this.getDisguiseOptions(sender, disguiseType);
if (disguiseType.isPlayer()) {
// If he is doing a player disguise
if (args.length == 1) {
// He needs to give the player name
throw new DisguiseParseException(ChatColor.RED + "Error! You need to give a player name!");
}
else {
if (!disguiseOptions.isEmpty() && (!disguiseOptions.containsKey(args[1].toLowerCase())
|| !disguiseOptions.get(args[1].toLowerCase()))) {
throw new DisguiseParseException(ChatColor.RED + "Error! You don't have permission to use that name!");
}
args[1] = args[1].replace("\\_", " ");
// Construct the player disguise
disguise = new PlayerDisguise(ChatColor.translateAlternateColorCodes('&', args[1]));
toSkip++;
}
}
else {
if (disguiseType.isMob()) { // Its a mob, use the mob constructor
boolean adult = true;
if (args.length > 1) {
if (args[1].equalsIgnoreCase("baby") || args[1].equalsIgnoreCase("adult")) {
usedOptions.add("setbaby");
doCheck(optionPermissions, usedOptions);
adult = args[1].equalsIgnoreCase("adult");
toSkip++;
}
}
disguise = new MobDisguise(disguiseType, adult);
}
else if (disguiseType.isMisc()) {
// Its a misc, we are going to use the MiscDisguise constructor.
int miscId = -1;
int miscData = -1;
String secondArg = null;
if (args.length > 1) {
// They have defined more arguments!
// If the first arg is a number
if (args[1].contains(":")) {
String[] split = args[1].split(":");
if (isNumeric(split[1])) {
secondArg = split[1];
}
args[1] = split[0];
}
if (isNumeric(args[1])) {
miscId = Integer.parseInt(args[1]);
}
else {
if (disguiseType == DisguiseType.FALLING_BLOCK || disguiseType == DisguiseType.DROPPED_ITEM) {
for (Material mat : Material.values()) {
if (mat.name().replace("_", "").equalsIgnoreCase(args[1].replace("_", ""))) {
miscId = mat.getId();
break;
}
}
}
}
if (miscId != -1) {
switch (disguiseType) {
case PAINTING:
case FALLING_BLOCK:
case SPLASH_POTION:
case DROPPED_ITEM:
case FISHING_HOOK:
case ARROW:
case TIPPED_ARROW:
case SPECTRAL_ARROW:
case SMALL_FIREBALL:
case FIREBALL:
case WITHER_SKULL:
break;
default:
throw new DisguiseParseException(ChatColor.RED + "Error! " + disguiseType.toReadable()
+ " doesn't know what to do with " + args[1] + "!");
}
toSkip++;
// If they also defined a data value
if (args.length > 2 && secondArg == null && isNumeric(args[2])) {
secondArg = args[2];
toSkip++;
}
if (secondArg != null) {
if (disguiseType != DisguiseType.FALLING_BLOCK && disguiseType != DisguiseType.DROPPED_ITEM) {
throw new DisguiseParseException(ChatColor.RED + "Error! Only the disguises "
+ DisguiseType.FALLING_BLOCK.toReadable() + " and "
+ DisguiseType.DROPPED_ITEM.toReadable() + " uses a second number!");
}
miscData = Integer.parseInt(secondArg);
}
}
}
if (!disguiseOptions.isEmpty() && miscId != -1) {
String toCheck = "" + miscId;
if (miscData == 0 || miscData == -1) {
if (!disguiseOptions.containsKey(toCheck) || !disguiseOptions.get(toCheck)) {
toCheck += ":0";
}
}
else {
toCheck += ":" + miscData;
}
if (!disguiseOptions.containsKey(toCheck) || !disguiseOptions.get(toCheck)) {
throw new DisguiseParseException(
ChatColor.RED + "Error! You do not have permission to use the parameter " + toCheck
+ " on the " + disguiseType.toReadable() + " disguise!");
}
}
if (miscId != -1) {
if (disguiseType == DisguiseType.FALLING_BLOCK) {
usedOptions.add("setblock");
doCheck(optionPermissions, usedOptions);
}
else if (disguiseType == DisguiseType.PAINTING) {
usedOptions.add("setpainting");
doCheck(optionPermissions, usedOptions);
}
else if (disguiseType == DisguiseType.SPLASH_POTION) {
usedOptions.add("setpotionid");
doCheck(optionPermissions, usedOptions);
}
}
// Construct the disguise
disguise = new MiscDisguise(disguiseType, miscId, miscData);
}
}
}
// Copy strings to their new range
String[] newArgs = new String[args.length - toSkip];
System.arraycopy(args, toSkip, newArgs, 0, args.length - toSkip);
args = newArgs;
Method[] methods = ReflectionFlagWatchers.getDisguiseWatcherMethods(disguise.getWatcher().getClass());
for (int i = 0; i < args.length; i += 2) {
String methodName = args[i];
String valueString = (args.length - 1 == i ? null : args[i + 1]);
Method methodToUse = null;
Object value = null;
DisguiseParseException storedEx = null;
int c = 0;
while (c < methods.length) {
try {
Entry<Method, Integer> entry = getMethod(methods, methodName, c);
if (entry == null) {
break;
}
methodToUse = entry.getKey();
c = entry.getValue();
methodName = methodToUse.getName();
Class<?>[] types = methodToUse.getParameterTypes();
Class param = types[0];
if (valueString != null) {
if (int.class == param) {
// Parse to integer
if (isNumeric(valueString)) {
value = Integer.parseInt(valueString);
}
else {
throw parseToException("number", valueString, methodName);
}
}
else if (WrappedGameProfile.class == param && valueString.length() > 20) {
try {
Map<String, Object> response = new Gson().fromJson(valueString, Map.class);
String id = (String) response.get("id");
if (!id.contains("-")) {
id = Pattern
.compile(
"([0-9a-fA-F]{8})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]+)")
.matcher(id).replaceFirst("$1-$2-$3-$4-$5");
}
WrappedGameProfile gameProfile = new WrappedGameProfile(UUID.fromString(id),
(String) response.get("name"));
if (response.containsKey("properties")) {
ArrayList<Map<String, String>> properties = (ArrayList) response.get("properties");
for (Map<String, String> s : properties) {
String gName = null;
String gValue = null;
String gSigned = null;
if (s.containsKey("name"))
gName = s.get("name");
if (s.containsKey("value"))
gValue = s.get("value");
if (s.containsKey("signature"))
gSigned = s.get("signature");
gameProfile.getProperties().put(gName, new WrappedSignedProperty(gName, gValue, gSigned));
}
}
value = gameProfile;
}
catch (Exception ex) {
throw parseToException("gameprofile", valueString, methodName);
}
}
else if (float.class == param || double.class == param) {
// Parse to number
if (isDouble(valueString)) {
float obj = Float.parseFloat(valueString);
if (param == float.class) {
value = obj;
}
else if (param == double.class) {
value = (double) obj;
}
}
else {
throw parseToException("number.0", valueString, methodName);
}
}
else if (param == String.class) {
if (methodName.equalsIgnoreCase("setskin") && valueString.length() > 20)
continue;
// Parse to string
value = ChatColor.translateAlternateColorCodes('&', valueString);
}
else if (param == AnimalColor.class) {
// Parse to animal color
try {
value = AnimalColor.valueOf(valueString.toUpperCase());
}
catch (Exception ex) {
throw parseToException("animal color", valueString, methodName);
}
}
else if (param == Llama.Color.class) {
try {
value = Llama.Color.valueOf(valueString.toUpperCase());
}
catch (Exception ex) {
throw parseToException("llama color", valueString, methodName);
}
}
else if (param == ItemStack.class) {
// Parse to itemstack
try {
value = parseToItemstack(valueString);
}
catch (Exception ex) {
throw new DisguiseParseException(String.format(ex.getMessage(), methodName));
}
}
else if (param == ItemStack[].class) {
// Parse to itemstack array
ItemStack[] items = new ItemStack[4];
String[] split = valueString.split(",");
if (split.length == 4) {
for (int a = 0; a < 4; a++) {
try {
items[a] = parseToItemstack(split[a]);
}
catch (Exception ex) {
throw parseToException("item ID,ID,ID,ID" + ChatColor.RED + " or " + ChatColor.GREEN
+ "ID:Data,ID:Data,ID:Data,ID:Data combo", valueString, methodName);
}
}
}
else {
throw parseToException("item ID,ID,ID,ID" + ChatColor.RED + " or " + ChatColor.GREEN
+ "ID:Data,ID:Data,ID:Data,ID:Data combo", valueString, methodName);
}
value = items;
}
else if (param.getSimpleName().equals("Color")) {
// Parse to horse color
value = callValueOf(param, valueString, methodName, "a horse color");
}
else if (param.getSimpleName().equals("Style")) {
// Parse to horse style
value = callValueOf(param, valueString, methodName, "a horse style");
}
else if (param.getSimpleName().equals("Profession")) {
// Parse to villager profession
value = callValueOf(param, valueString, methodName, "a villager profession");
}
else if (param.getSimpleName().equals("Art")) {
// Parse to art type
value = callValueOf(param, valueString, methodName, "a painting art");
}
else if (param.getSimpleName().equals("Type")) {
// Parse to ocelot type
value = callValueOf(param, valueString, methodName, "a ocelot type");
}
else if (param == PotionEffectType.class) {
// Parse to potion effect
try {
PotionEffectType potionType = PotionEffectType.getByName(valueString.toUpperCase());
if (potionType == null && isNumeric(valueString)) {
potionType = PotionEffectType.getById(Integer.parseInt(valueString));
}
if (potionType == null) {
throw new DisguiseParseException();
}
value = potionType;
}
catch (Exception ex) {
throw parseToException("a potioneffect type", valueString, methodName);
}
}
else if (param == int[].class) {
String[] split = valueString.split(",");
int[] values = new int[split.length];
for (int b = 0; b < values.length; b++) {
try {
values[b] = Integer.parseInt(split[b]);
}
catch (NumberFormatException ex) {
throw parseToException("Number,Number,Number...", valueString, methodName);
}
}
value = values;
}
else if (param == BlockFace.class) {
try {
BlockFace face = BlockFace.valueOf(valueString.toUpperCase());
if (face.ordinal() > 5) {
throw new DisguiseParseException();
}
value = face;
}
catch (Exception ex) {
throw parseToException("a direction (north, east, south, west, up, down)", valueString,
methodName);
}
}
else if (param == RabbitType.class) {
try {
for (RabbitType type : RabbitType.values()) {
if (type.name().replace("_", "")
.equalsIgnoreCase(valueString.replace("_", "").replace(" ", ""))) {
value = type;
break;
}
}
if (value == null) {
throw new Exception();
}
}
catch (Exception ex) {
throw parseToException("rabbit type (white, brown, patches...)", valueString, methodName);
}
}
else if (param == BlockPosition.class) {
try {
String[] split = valueString.split(",");
assert split.length == 3;
value = new BlockPosition(Integer.parseInt(split[0]), Integer.parseInt(split[1]),
Integer.parseInt(split[2]));
}
catch (Exception ex) {
throw parseToException("three numbers Number,Number,Number", valueString, methodName);
}
}
}
if (value == null && boolean.class == param) {
if (valueString == null) {
value = true;
i--;
}
else if (valueString.equalsIgnoreCase("true")) {
value = true;
}
else if (valueString.equalsIgnoreCase("false")) {
value = false;
}
else {
if (getMethod(methods, valueString, 0) == null) {
throw parseToException("true/false", valueString, methodName);
}
else {
value = true;
i--;
}
}
}
if (value != null) {
break;
}
}
catch (DisguiseParseException ex) {
storedEx = ex;
methodToUse = null;
}
catch (Exception ex) {
ex.printStackTrace();
methodToUse = null;
}
}
if (methodToUse == null) {
if (storedEx != null) {
throw storedEx;
}
throw new DisguiseParseException(ChatColor.RED + "Cannot find the option " + methodName);
}
if (value == null) {
throw new DisguiseParseException(ChatColor.RED + "No value was given for the option " + methodName);
}
if (!usedOptions.contains(methodName.toLowerCase())) {
usedOptions.add(methodName.toLowerCase());
}
doCheck(optionPermissions, usedOptions);
if (FlagWatcher.class.isAssignableFrom(methodToUse.getDeclaringClass())) {
methodToUse.invoke(disguise.getWatcher(), value);
}
else {
methodToUse.invoke(disguise, value);
}
}
// Alright. We've constructed our disguise.
return disguise;
}
private DisguiseParseException parseToException(String expectedValue, String receivedInstead, String methodName) {
return new DisguiseParseException(
ChatColor.RED + "Expected " + ChatColor.GREEN + expectedValue + ChatColor.RED + ", received " + ChatColor.GREEN
+ receivedInstead + ChatColor.RED + " instead for " + ChatColor.GREEN + methodName);
}
private ItemStack parseToItemstack(String string) throws Exception {
String[] split = string.split(":", -1);
int itemId = -1;
if (isNumeric(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]);
}
else {
throw parseToException("item ID:Durability combo", string, "%s");
}
}
return new ItemStack(itemId, 1, itemDura);
}
else {
if (split.length == 1) {
throw parseToException("item ID", string, "%s");
}
else {
throw parseToException("item ID:Durability combo", string, "%s");
}
}
}
public boolean passesCheck(HashMap<ArrayList<String>, Boolean> theirPermissions, ArrayList<String> usedOptions) { public boolean passesCheck(HashMap<ArrayList<String>, Boolean> theirPermissions, ArrayList<String> usedOptions) {
boolean hasPermission = false; boolean hasPermission = false;
@ -1043,5 +119,5 @@ public abstract class DisguiseBaseCommand implements CommandExecutor {
} }
protected abstract void sendCommandUsage(CommandSender sender, protected abstract void sendCommandUsage(CommandSender sender,
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map); HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map);
} }

4
src/me/libraryaddict/disguise/commands/DisguiseCloneCommand.java
View File

@ -12,7 +12,7 @@ import org.bukkit.command.TabCompleter;
import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabCompleter { public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabCompleter {
@Override @Override
@ -79,7 +79,7 @@ public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabComp
* Send the player the information * Send the player the information
*/ */
@Override @Override
protected void sendCommandUsage(CommandSender sender, HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map) { protected void sendCommandUsage(CommandSender sender, HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map) {
sender.sendMessage(ChatColor.DARK_GREEN sender.sendMessage(ChatColor.DARK_GREEN
+ "Right click a entity to get a disguise reference you can pass to other disguise commands!"); + "Right click a entity to get a disguise reference you can pass to other disguise commands!");
sender.sendMessage(ChatColor.DARK_GREEN sender.sendMessage(ChatColor.DARK_GREEN

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

@ -18,6 +18,9 @@ import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.DisguiseParser;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguiseParseException;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
@ -29,10 +32,15 @@ public class DisguiseCommand extends DisguiseBaseCommand implements TabCompleter
return true; return true;
} }
if (args.length == 0) {
sendCommandUsage(sender, getPermissions(sender));
return true;
}
Disguise disguise; Disguise disguise;
try { try {
disguise = parseDisguise(sender, args, getPermissions(sender)); disguise = DisguiseParser.parseDisguise(sender, getPermNode(), args, getPermissions(sender));
} }
catch (DisguiseParseException ex) { catch (DisguiseParseException ex) {
if (ex.getMessage() != null) { if (ex.getMessage() != null) {
@ -73,25 +81,21 @@ public class DisguiseCommand extends DisguiseBaseCommand implements TabCompleter
ArrayList<String> tabs = new ArrayList<String>(); ArrayList<String> tabs = new ArrayList<String>();
String[] args = getArgs(origArgs); String[] args = getArgs(origArgs);
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender); HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender);
if (args.length == 0) { if (args.length == 0) {
for (DisguiseType type : perms.keySet()) { for (String type : getAllowedDisguises(perms)) {
tabs.add(type.toReadable().replaceAll(" ", "_")); tabs.add(type);
} }
} }
else { else {
DisguiseType disguiseType; DisguisePerm disguiseType = DisguiseParser.getDisguisePerm(args[0]);
try { if (disguiseType == null)
disguiseType = DisguiseType.valueOf(args[0].toUpperCase());
}
catch (Exception ex) {
// No disguisetype specificied, cannot help.
return filterTabs(tabs, origArgs); return filterTabs(tabs, origArgs);
} // No disguisetype specificied, cannot help.
if (args.length == 1 && disguiseType == DisguiseType.PLAYER) { if (args.length == 1 && disguiseType.getType() == DisguiseType.PLAYER) {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
tabs.add(player.getName()); tabs.add(player.getName());
} }
@ -100,7 +104,7 @@ public class DisguiseCommand extends DisguiseBaseCommand implements TabCompleter
ArrayList<String> usedOptions = new ArrayList<String>(); ArrayList<String> usedOptions = new ArrayList<String>();
for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) { for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) {
for (int i = disguiseType == DisguiseType.PLAYER ? 2 : 1; i < args.length; i++) { for (int i = disguiseType.getType() == DisguiseType.PLAYER ? 2 : 1; i < args.length; i++) {
String arg = args[i]; String arg = args[i];
if (!method.getName().equalsIgnoreCase(arg)) if (!method.getName().equalsIgnoreCase(arg))
@ -154,7 +158,7 @@ public class DisguiseCommand extends DisguiseBaseCommand implements TabCompleter
* Send the player the information * Send the player the information
*/ */
@Override @Override
protected void sendCommandUsage(CommandSender sender, HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map) { protected void sendCommandUsage(CommandSender sender, HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map) {
ArrayList<String> allowedDisguises = getAllowedDisguises(map); ArrayList<String> allowedDisguises = getAllowedDisguises(map);
sender.sendMessage(ChatColor.DARK_GREEN + "Choose a disguise to become the disguise!"); sender.sendMessage(ChatColor.DARK_GREEN + "Choose a disguise to become the disguise!");
sender.sendMessage(ChatColor.DARK_GREEN + "You can use the disguises: " + ChatColor.GREEN sender.sendMessage(ChatColor.DARK_GREEN + "You can use the disguises: " + ChatColor.GREEN

32
src/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
View File

@ -18,6 +18,9 @@ import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.utilities.DisguiseParser;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguiseParseException;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
@ -29,10 +32,15 @@ public class DisguiseEntityCommand extends DisguiseBaseCommand implements TabCom
return true; return true;
} }
if (args.length == 0) {
sendCommandUsage(sender, getPermissions(sender));
return true;
}
Disguise disguise; Disguise disguise;
try { try {
disguise = parseDisguise(sender, args, getPermissions(sender)); disguise = DisguiseParser.parseDisguise(sender, getPermNode(), args, getPermissions(sender));
} }
catch (DisguiseParseException ex) { catch (DisguiseParseException ex) {
if (ex.getMessage() != null) { if (ex.getMessage() != null) {
@ -58,25 +66,20 @@ public class DisguiseEntityCommand extends DisguiseBaseCommand implements TabCom
ArrayList<String> tabs = new ArrayList<String>(); ArrayList<String> tabs = new ArrayList<String>();
String[] args = getArgs(origArgs); String[] args = getArgs(origArgs);
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender); HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender);
if (args.length == 0) { if (args.length == 0) {
for (DisguiseType type : perms.keySet()) { for (String type : getAllowedDisguises(perms)) {
tabs.add(type.toReadable().replaceAll(" ", "_")); tabs.add(type);
} }
} }
else { else {
DisguiseType disguiseType; DisguisePerm disguiseType = DisguiseParser.getDisguisePerm(args[0]);
try { if (disguiseType == null)
disguiseType = DisguiseType.valueOf(args[0].toUpperCase());
}
catch (Exception ex) {
// No disguisetype specificied, cannot help.
return filterTabs(tabs, origArgs); return filterTabs(tabs, origArgs);
}
if (args.length == 1 && disguiseType == DisguiseType.PLAYER) { if (args.length == 1 && disguiseType.getType() == DisguiseType.PLAYER) {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
tabs.add(player.getName()); tabs.add(player.getName());
} }
@ -85,7 +88,7 @@ public class DisguiseEntityCommand extends DisguiseBaseCommand implements TabCom
ArrayList<String> usedOptions = new ArrayList<String>(); ArrayList<String> usedOptions = new ArrayList<String>();
for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) { for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) {
for (int i = disguiseType == DisguiseType.PLAYER ? 2 : 1; i < args.length; i++) { for (int i = disguiseType.getType() == DisguiseType.PLAYER ? 2 : 1; i < args.length; i++) {
String arg = args[i]; String arg = args[i];
if (!method.getName().equalsIgnoreCase(arg)) if (!method.getName().equalsIgnoreCase(arg))
@ -142,8 +145,9 @@ public class DisguiseEntityCommand extends DisguiseBaseCommand implements TabCom
* @param map * @param map
*/ */
@Override @Override
protected void sendCommandUsage(CommandSender sender, HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map) { protected void sendCommandUsage(CommandSender sender, HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map) {
ArrayList<String> allowedDisguises = getAllowedDisguises(map); ArrayList<String> allowedDisguises = getAllowedDisguises(map);
sender.sendMessage(ChatColor.DARK_GREEN + "Choose a disguise then right click a entity to disguise it!"); sender.sendMessage(ChatColor.DARK_GREEN + "Choose a disguise then right click a entity to disguise it!");
sender.sendMessage(ChatColor.DARK_GREEN + "You can use the disguises: " + ChatColor.GREEN sender.sendMessage(ChatColor.DARK_GREEN + "You can use the disguises: " + ChatColor.GREEN
+ StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN)); + StringUtils.join(allowedDisguises, ChatColor.RED + ", " + ChatColor.GREEN));

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

@ -12,9 +12,10 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter; import org.bukkit.command.TabCompleter;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.DisguiseParser;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
@ -25,8 +26,9 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
for (String node : new String[] { for (String node : new String[] {
"disguise", "disguiseradius", "disguiseentity", "disguiseplayer" "disguise", "disguiseradius", "disguiseentity", "disguiseplayer"
}) { }) {
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> permMap = getPermissions(sender, HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> permMap = DisguiseParser.getPermissions(sender,
"libsdisguises." + node + "."); "libsdisguises." + node + ".");
if (!permMap.isEmpty()) { if (!permMap.isEmpty()) {
if (args.length == 0) { if (args.length == 0) {
sendCommandUsage(sender, null); sendCommandUsage(sender, null);
@ -50,16 +52,7 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
return true; return true;
} }
DisguiseType type = null; DisguisePerm type = DisguiseParser.getDisguisePerm(args[0]);
for (DisguiseType disguiseType : DisguiseType.values()) {
if (args[0].equalsIgnoreCase(disguiseType.name())
|| disguiseType.name().replace("_", "").equalsIgnoreCase(args[0])) {
type = disguiseType;
break;
}
}
if (type == null) { if (type == null) {
sender.sendMessage(ChatColor.RED + "Cannot find the disguise " + args[0]); sender.sendMessage(ChatColor.RED + "Cannot find the disguise " + args[0]);
@ -143,8 +136,9 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
if (ignored > 0) { if (ignored > 0) {
sender.sendMessage(ChatColor.RED + "Ignored " + ignored sender.sendMessage(ChatColor.RED + "Ignored " + ignored
+ " options you do not have permission to view. Add 'show' to view unusable options."); + " options you do not have permission to use. Add 'show' to view unusable options.");
} }
return true; return true;
} }
} }
@ -159,10 +153,17 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
ArrayList<String> tabs = new ArrayList<String>(); ArrayList<String> tabs = new ArrayList<String>();
String[] args = getArgs(origArgs); String[] args = getArgs(origArgs);
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender); for (String node : new String[] {
"disguise", "disguiseradius", "disguiseentity", "disguiseplayer"
}) {
HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> perms = DisguiseParser.getPermissions(sender,
"libsdisguises." + node + ".");
if (args.length == 0) { if (args.length == 0) {
for (DisguiseType type : perms.keySet()) { for (DisguisePerm type : perms.keySet()) {
if (type.isUnknown())
continue;
tabs.add(type.toReadable().replaceAll(" ", "_")); tabs.add(type.toReadable().replaceAll(" ", "_"));
} }
@ -170,14 +171,9 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
tabs.add(s.getName().replaceAll(" ", "")); tabs.add(s.getName().replaceAll(" ", ""));
} }
} }
else { else if (DisguiseParser.getDisguisePerm(args[0]) == null) {
try {
DisguiseType.valueOf(args[0].toUpperCase());
}
catch (Exception ex) {
tabs.add("Show"); tabs.add("Show");
} }
} }
return filterTabs(tabs, origArgs); return filterTabs(tabs, origArgs);
@ -187,7 +183,7 @@ public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompl
* Send the player the information * Send the player the information
*/ */
@Override @Override
protected void sendCommandUsage(CommandSender sender, HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map) { protected void sendCommandUsage(CommandSender sender, HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map) {
sender.sendMessage(ChatColor.RED + "/disguisehelp <DisguiseType> " + ChatColor.GREEN sender.sendMessage(ChatColor.RED + "/disguisehelp <DisguiseType> " + ChatColor.GREEN
+ "- View the options you can set on a disguise. Add 'show' to reveal the options you don't have permission to use"); + "- View the options you can set on a disguise. Add 'show' to reveal the options you don't have permission to use");

34
src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java
View File

@ -18,6 +18,9 @@ import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.DisguiseParser;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguiseParseException;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
@ -25,7 +28,7 @@ public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCom
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map = getPermissions(sender); HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map = getPermissions(sender);
if (map.isEmpty()) { if (map.isEmpty()) {
sender.sendMessage(ChatColor.RED + "You are forbidden to use this command."); sender.sendMessage(ChatColor.RED + "You are forbidden to use this command.");
@ -52,9 +55,15 @@ public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCom
String[] newArgs = new String[args.length - 1]; String[] newArgs = new String[args.length - 1];
System.arraycopy(args, 1, newArgs, 0, newArgs.length); System.arraycopy(args, 1, newArgs, 0, newArgs.length);
if (newArgs.length == 0) {
sendCommandUsage(sender, map);
return true;
}
Disguise disguise; Disguise disguise;
try { try {
disguise = parseDisguise(sender, newArgs, map); disguise = DisguiseParser.parseDisguise(sender, getPermNode(), newArgs, map);
} }
catch (DisguiseParseException ex) { catch (DisguiseParseException ex) {
if (ex.getMessage() != null) { if (ex.getMessage() != null) {
@ -104,7 +113,7 @@ public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCom
ArrayList<String> tabs = new ArrayList<String>(); ArrayList<String> tabs = new ArrayList<String>();
String[] args = getArgs(origArgs); String[] args = getArgs(origArgs);
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender); HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender);
if (args.length == 0) { if (args.length == 0) {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
@ -112,22 +121,17 @@ public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCom
} }
} }
else if (args.length == 1) { else if (args.length == 1) {
for (DisguiseType type : perms.keySet()) { for (String type : getAllowedDisguises(perms)) {
tabs.add(type.toReadable().replaceAll(" ", "_")); tabs.add(type);
} }
} }
else { else {
DisguiseType disguiseType; DisguisePerm disguiseType = DisguiseParser.getDisguisePerm(args[1]);
try { if (disguiseType == null)
disguiseType = DisguiseType.valueOf(args[1].toUpperCase());
}
catch (Exception ex) {
// No disguisetype specificied, cannot help.
return filterTabs(tabs, origArgs); return filterTabs(tabs, origArgs);
}
if (args.length == 2 && disguiseType == DisguiseType.PLAYER) { if (args.length == 2 && disguiseType.getType() == DisguiseType.PLAYER) {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
tabs.add(player.getName()); tabs.add(player.getName());
} }
@ -136,7 +140,7 @@ public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCom
ArrayList<String> usedOptions = new ArrayList<String>(); ArrayList<String> usedOptions = new ArrayList<String>();
for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) { for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) {
for (int i = disguiseType == DisguiseType.PLAYER ? 3 : 2; i < args.length; i++) { for (int i = disguiseType.getType() == DisguiseType.PLAYER ? 3 : 2; i < args.length; i++) {
String arg = args[i]; String arg = args[i];
if (!method.getName().equalsIgnoreCase(arg)) if (!method.getName().equalsIgnoreCase(arg))
@ -190,7 +194,7 @@ public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCom
* Send the player the information * Send the player the information
*/ */
@Override @Override
protected void sendCommandUsage(CommandSender sender, HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map) { protected void sendCommandUsage(CommandSender sender, HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map) {
ArrayList<String> allowedDisguises = getAllowedDisguises(map); ArrayList<String> allowedDisguises = getAllowedDisguises(map);
sender.sendMessage(ChatColor.DARK_GREEN + "Disguise another player!"); sender.sendMessage(ChatColor.DARK_GREEN + "Disguise another player!");

35
src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
View File

@ -23,6 +23,9 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.ClassGetter; import me.libraryaddict.disguise.utilities.ClassGetter;
import me.libraryaddict.disguise.utilities.DisguiseParser;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguiseParseException;
import me.libraryaddict.disguise.utilities.DisguiseParser.DisguisePerm;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo; import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
@ -46,7 +49,7 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
return true; return true;
} }
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map = getPermissions(sender); HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map = getPermissions(sender);
if (map.isEmpty()) { if (map.isEmpty()) {
sender.sendMessage(ChatColor.RED + "You are forbidden to use this command."); sender.sendMessage(ChatColor.RED + "You are forbidden to use this command.");
@ -125,8 +128,13 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
System.arraycopy(args, starting + 1, newArgs, 0, newArgs.length); System.arraycopy(args, starting + 1, newArgs, 0, newArgs.length);
Disguise disguise; Disguise disguise;
if (newArgs.length == 0) {
sendCommandUsage(sender, map);
return true;
}
try { try {
disguise = parseDisguise(sender, newArgs, map); disguise = DisguiseParser.parseDisguise(sender, getPermNode(), newArgs, map);
} }
catch (DisguiseParseException ex) { catch (DisguiseParseException ex) {
if (ex.getMessage() != null) { if (ex.getMessage() != null) {
@ -195,7 +203,7 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
ArrayList<String> tabs = new ArrayList<String>(); ArrayList<String> tabs = new ArrayList<String>();
String[] args = getArgs(origArgs); String[] args = getArgs(origArgs);
HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender); HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> perms = getPermissions(sender);
if (args.length == 0) { if (args.length == 0) {
for (Class<? extends Entity> entityClass : validClasses) { for (Class<? extends Entity> entityClass : validClasses) {
@ -222,22 +230,18 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
} }
if (args.length == starting) { if (args.length == starting) {
for (DisguiseType type : perms.keySet()) { for (String type : getAllowedDisguises(perms)) {
tabs.add(type.toReadable().replaceAll(" ", "_")); tabs.add(type);
} }
} }
else { else {
DisguiseType disguiseType;
try { DisguisePerm disguiseType = DisguiseParser.getDisguisePerm(args[starting]);
disguiseType = DisguiseType.valueOf(args[starting].toUpperCase());
} if (disguiseType == null)
catch (Exception ex) {
// No disguisetype specificied, cannot help.
return filterTabs(tabs, origArgs); return filterTabs(tabs, origArgs);
}
if (args.length == 1 + starting && disguiseType == DisguiseType.PLAYER) { if (args.length == 1 + starting && disguiseType.getType() == DisguiseType.PLAYER) {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
tabs.add(player.getName()); tabs.add(player.getName());
} }
@ -246,7 +250,8 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
ArrayList<String> usedOptions = new ArrayList<String>(); ArrayList<String> usedOptions = new ArrayList<String>();
for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) { for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) {
for (int i = disguiseType == DisguiseType.PLAYER ? starting + 2 : starting + 1; i < args.length; i++) { for (int i = disguiseType.getType() == DisguiseType.PLAYER ? starting + 2
: starting + 1; i < args.length; i++) {
String arg = args[i]; String arg = args[i];
if (!method.getName().equalsIgnoreCase(arg)) if (!method.getName().equalsIgnoreCase(arg))
@ -300,7 +305,7 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
* Send the player the information * Send the player the information
*/ */
@Override @Override
protected void sendCommandUsage(CommandSender sender, HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map) { protected void sendCommandUsage(CommandSender sender, HashMap<DisguisePerm, HashMap<ArrayList<String>, Boolean>> map) {
ArrayList<String> allowedDisguises = getAllowedDisguises(map); ArrayList<String> allowedDisguises = getAllowedDisguises(map);
sender.sendMessage(ChatColor.DARK_GREEN + "Disguise all entities in a radius! Caps at " + maxRadius + " blocks!"); sender.sendMessage(ChatColor.DARK_GREEN + "Disguise all entities in a radius! Caps at " + maxRadius + " blocks!");

18
src/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -71,6 +71,10 @@ public abstract class Disguise {
private boolean viewSelfDisguise = DisguiseConfig.isViewDisguises(); private boolean viewSelfDisguise = DisguiseConfig.isViewDisguises();
private FlagWatcher watcher; private FlagWatcher watcher;
public Disguise(DisguiseType disguiseType) {
this.disguiseType = disguiseType;
}
@Override @Override
public abstract Disguise clone(); public abstract Disguise clone();
@ -80,18 +84,12 @@ public abstract class Disguise {
* @param newType * @param newType
* The disguise * The disguise
*/ */
protected void createDisguise(DisguiseType newType) { protected void createDisguise() {
if (getWatcher() != null) { if (getType().getEntityType() == null) {
return; throw new RuntimeException("DisguiseType " + getType()
}
if (newType.getEntityType() == null) {
throw new RuntimeException("DisguiseType " + newType
+ " was used in a futile attempt to construct a disguise, but this Minecraft version does not have that entity"); + " was used in a futile attempt to construct a disguise, but this Minecraft version does not have that entity");
} }
// Set the disguise type
disguiseType = newType;
// Get if they are a adult now.. // Get if they are a adult now..
boolean isAdult = true; boolean isAdult = true;
@ -100,6 +98,7 @@ public abstract class Disguise {
isAdult = ((MobDisguise) this).isAdult(); isAdult = ((MobDisguise) this).isAdult();
} }
if (getWatcher() == null) {
try { try {
// Construct the FlagWatcher from the stored class // Construct the FlagWatcher from the stored class
setWatcher((FlagWatcher) getType().getWatcherClass().getConstructor(Disguise.class).newInstance(this)); setWatcher((FlagWatcher) getType().getWatcherClass().getConstructor(Disguise.class).newInstance(this));
@ -107,6 +106,7 @@ public abstract class Disguise {
catch (Exception e) { catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}
// Set the disguise if its a baby or not // Set the disguise if its a baby or not
if (!isAdult) { if (!isAdult) {

6
src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
View File

@ -47,7 +47,7 @@ public class FlagWatcher {
private byte addEntityAnimations(byte originalValue, byte entityValue) { private byte addEntityAnimations(byte originalValue, byte entityValue) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
if ((entityValue & 1 << i) != 0 && !modifiedEntityAnimations[i]) { if ((entityValue & 1 << i) != 0 && !modifiedEntityAnimations[i - 1]) {
originalValue = (byte) (originalValue | 1 << i); originalValue = (byte) (originalValue | 1 << i);
} }
} }
@ -401,7 +401,7 @@ public class FlagWatcher {
} }
private void setEntityFlag(int byteValue, boolean flag) { private void setEntityFlag(int byteValue, boolean flag) {
modifiedEntityAnimations[byteValue] = true; modifiedEntityAnimations[byteValue - 1] = true;
byte b0 = (byte) getData(FlagType.ENTITY_META); byte b0 = (byte) getData(FlagType.ENTITY_META);
@ -447,7 +447,7 @@ public class FlagWatcher {
} }
public void setItemStack(EquipmentSlot slot, ItemStack itemStack) { public void setItemStack(EquipmentSlot slot, ItemStack itemStack) {
setItemStack(slot, itemStack); equipment.setItem(slot, itemStack);
sendItemStack(slot, itemStack); sendItemStack(slot, itemStack);
} }

2
src/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java
View File

@ -6,7 +6,7 @@ import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
public class LibsEquipment implements EntityEquipment { public class LibsEquipment implements EntityEquipment {
private ItemStack[] equipment = new ItemStack[6]; private ItemStack[] equipment = new ItemStack[EquipmentSlot.values().length];
private FlagWatcher flagWatcher; private FlagWatcher flagWatcher;
public LibsEquipment(FlagWatcher flagWatcher) { public LibsEquipment(FlagWatcher flagWatcher) {

105
src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
View File

@ -12,33 +12,31 @@ import me.libraryaddict.disguise.disguisetypes.watchers.FallingBlockWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.PaintingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.PaintingWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.SplashPotionWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.SplashPotionWatcher;
public class MiscDisguise extends TargetedDisguise public class MiscDisguise extends TargetedDisguise {
{
private int id = -1, data = 0; private int id = -1, data = 0;
public MiscDisguise(DisguiseType disguiseType) public MiscDisguise(DisguiseType disguiseType) {
{
this(disguiseType, -1, disguiseType.getDefaultData()); this(disguiseType, -1, disguiseType.getDefaultData());
} }
public MiscDisguise(DisguiseType disguiseType, int id) public MiscDisguise(DisguiseType disguiseType, int id) {
{
this(disguiseType, id, disguiseType.getDefaultData()); this(disguiseType, id, disguiseType.getDefaultData());
} }
public MiscDisguise(DisguiseType disguiseType, int id, int data) public MiscDisguise(DisguiseType disguiseType, int id, int data) {
{ super(disguiseType);
if (!disguiseType.isMisc())
{ if (!disguiseType.isMisc()) {
throw new InvalidParameterException("Expected a non-living DisguiseType while constructing MiscDisguise. Received " throw new InvalidParameterException("Expected a non-living DisguiseType while constructing MiscDisguise. Received "
+ disguiseType + " instead. Please use " + (disguiseType.isPlayer() ? "PlayerDisguise" : "MobDisguise") + disguiseType + " instead. Please use " + (disguiseType.isPlayer() ? "PlayerDisguise" : "MobDisguise")
+ " instead"); + " instead");
} }
createDisguise(disguiseType);
createDisguise();
this.id = getType().getTypeId(); this.id = getType().getTypeId();
this.data = getType().getDefaultData(); this.data = getType().getDefaultData();
switch (disguiseType) switch (disguiseType) {
{
// The only disguises which should use a custom data. // The only disguises which should use a custom data.
case PAINTING: case PAINTING:
((PaintingWatcher) getWatcher()).setArt(Art.values()[Math.max(0, id) % Art.values().length]); ((PaintingWatcher) getWatcher()).setArt(Art.values()[Math.max(0, id) % Art.values().length]);
@ -51,8 +49,7 @@ public class MiscDisguise extends TargetedDisguise
break; break;
case DROPPED_ITEM: case DROPPED_ITEM:
if (id > 0) if (id > 0) {
{
((DroppedItemWatcher) getWatcher()).setItemStack(new ItemStack(id, Math.max(1, data))); ((DroppedItemWatcher) getWatcher()).setItemStack(new ItemStack(id, Math.max(1, data)));
} }
break; break;
@ -71,20 +68,17 @@ public class MiscDisguise extends TargetedDisguise
} }
@Override @Override
public MiscDisguise addPlayer(Player player) public MiscDisguise addPlayer(Player player) {
{
return (MiscDisguise) super.addPlayer(player); return (MiscDisguise) super.addPlayer(player);
} }
@Override @Override
public MiscDisguise addPlayer(String playername) public MiscDisguise addPlayer(String playername) {
{
return (MiscDisguise) super.addPlayer(playername); return (MiscDisguise) super.addPlayer(playername);
} }
@Override @Override
public MiscDisguise clone() public MiscDisguise clone() {
{
MiscDisguise disguise = new MiscDisguise(getType(), getData()); MiscDisguise disguise = new MiscDisguise(getType(), getData());
disguise.setReplaceSounds(isSoundsReplaced()); disguise.setReplaceSounds(isSoundsReplaced());
disguise.setViewSelfDisguise(isSelfDisguiseVisible()); disguise.setViewSelfDisguise(isSelfDisguiseVisible());
@ -94,8 +88,7 @@ public class MiscDisguise extends TargetedDisguise
disguise.setVelocitySent(isVelocitySent()); disguise.setVelocitySent(isVelocitySent());
disguise.setModifyBoundingBox(isModifyBoundingBox()); disguise.setModifyBoundingBox(isModifyBoundingBox());
if (getWatcher() != null) if (getWatcher() != null) {
{
disguise.setWatcher(getWatcher().clone(disguise)); disguise.setWatcher(getWatcher().clone(disguise));
} }
return disguise; return disguise;
@ -104,10 +97,8 @@ public class MiscDisguise extends TargetedDisguise
/** /**
* This is the getId of everything but falling block. * This is the getId of everything but falling block.
*/ */
public int getData() public int getData() {
{ switch (getType()) {
switch (getType())
{
case FALLING_BLOCK: case FALLING_BLOCK:
return (int) ((FallingBlockWatcher) getWatcher()).getBlock().getDurability(); return (int) ((FallingBlockWatcher) getWatcher()).getBlock().getDurability();
case PAINTING: case PAINTING:
@ -122,120 +113,100 @@ public class MiscDisguise extends TargetedDisguise
/** /**
* Only falling block should use this * Only falling block should use this
*/ */
public int getId() public int getId() {
{ if (getType() == DisguiseType.FALLING_BLOCK) {
if (getType() == DisguiseType.FALLING_BLOCK)
{
return ((FallingBlockWatcher) getWatcher()).getBlock().getTypeId(); return ((FallingBlockWatcher) getWatcher()).getBlock().getTypeId();
} }
return id; return id;
} }
@Override @Override
public boolean isMiscDisguise() public boolean isMiscDisguise() {
{
return true; return true;
} }
@Override @Override
public MiscDisguise removePlayer(Player player) public MiscDisguise removePlayer(Player player) {
{
return (MiscDisguise) super.removePlayer(player); return (MiscDisguise) super.removePlayer(player);
} }
@Override @Override
public MiscDisguise removePlayer(String playername) public MiscDisguise removePlayer(String playername) {
{
return (MiscDisguise) super.removePlayer(playername); return (MiscDisguise) super.removePlayer(playername);
} }
@Override @Override
public MiscDisguise setDisguiseTarget(TargetType newTargetType) public MiscDisguise setDisguiseTarget(TargetType newTargetType) {
{
return (MiscDisguise) super.setDisguiseTarget(newTargetType); return (MiscDisguise) super.setDisguiseTarget(newTargetType);
} }
@Override @Override
public MiscDisguise setEntity(Entity entity) public MiscDisguise setEntity(Entity entity) {
{
return (MiscDisguise) super.setEntity(entity); return (MiscDisguise) super.setEntity(entity);
} }
@Override @Override
public MiscDisguise setHearSelfDisguise(boolean hearSelfDisguise) public MiscDisguise setHearSelfDisguise(boolean hearSelfDisguise) {
{
return (MiscDisguise) super.setHearSelfDisguise(hearSelfDisguise); return (MiscDisguise) super.setHearSelfDisguise(hearSelfDisguise);
} }
@Override @Override
public MiscDisguise setHideArmorFromSelf(boolean hideArmor) public MiscDisguise setHideArmorFromSelf(boolean hideArmor) {
{
return (MiscDisguise) super.setHideArmorFromSelf(hideArmor); return (MiscDisguise) super.setHideArmorFromSelf(hideArmor);
} }
@Override @Override
public MiscDisguise setHideHeldItemFromSelf(boolean hideHeldItem) public MiscDisguise setHideHeldItemFromSelf(boolean hideHeldItem) {
{
return (MiscDisguise) super.setHideHeldItemFromSelf(hideHeldItem); return (MiscDisguise) super.setHideHeldItemFromSelf(hideHeldItem);
} }
@Override @Override
public MiscDisguise setKeepDisguiseOnEntityDespawn(boolean keepDisguise) public MiscDisguise setKeepDisguiseOnEntityDespawn(boolean keepDisguise) {
{
return (MiscDisguise) super.setKeepDisguiseOnEntityDespawn(keepDisguise); return (MiscDisguise) super.setKeepDisguiseOnEntityDespawn(keepDisguise);
} }
@Override @Override
public MiscDisguise setKeepDisguiseOnPlayerDeath(boolean keepDisguise) public MiscDisguise setKeepDisguiseOnPlayerDeath(boolean keepDisguise) {
{
return (MiscDisguise) super.setKeepDisguiseOnPlayerDeath(keepDisguise); return (MiscDisguise) super.setKeepDisguiseOnPlayerDeath(keepDisguise);
} }
@Override @Override
public MiscDisguise setKeepDisguiseOnPlayerLogout(boolean keepDisguise) public MiscDisguise setKeepDisguiseOnPlayerLogout(boolean keepDisguise) {
{
return (MiscDisguise) super.setKeepDisguiseOnPlayerLogout(keepDisguise); return (MiscDisguise) super.setKeepDisguiseOnPlayerLogout(keepDisguise);
} }
@Override @Override
public MiscDisguise setModifyBoundingBox(boolean modifyBox) public MiscDisguise setModifyBoundingBox(boolean modifyBox) {
{
return (MiscDisguise) super.setModifyBoundingBox(modifyBox); return (MiscDisguise) super.setModifyBoundingBox(modifyBox);
} }
@Override @Override
public MiscDisguise setReplaceSounds(boolean areSoundsReplaced) public MiscDisguise setReplaceSounds(boolean areSoundsReplaced) {
{
return (MiscDisguise) super.setReplaceSounds(areSoundsReplaced); return (MiscDisguise) super.setReplaceSounds(areSoundsReplaced);
} }
@Override @Override
public MiscDisguise setVelocitySent(boolean sendVelocity) public MiscDisguise setVelocitySent(boolean sendVelocity) {
{
return (MiscDisguise) super.setVelocitySent(sendVelocity); return (MiscDisguise) super.setVelocitySent(sendVelocity);
} }
@Override @Override
public MiscDisguise setViewSelfDisguise(boolean viewSelfDisguise) public MiscDisguise setViewSelfDisguise(boolean viewSelfDisguise) {
{
return (MiscDisguise) super.setViewSelfDisguise(viewSelfDisguise); return (MiscDisguise) super.setViewSelfDisguise(viewSelfDisguise);
} }
@Override @Override
public MiscDisguise setWatcher(FlagWatcher newWatcher) public MiscDisguise setWatcher(FlagWatcher newWatcher) {
{
return (MiscDisguise) super.setWatcher(newWatcher); return (MiscDisguise) super.setWatcher(newWatcher);
} }
@Override @Override
public MiscDisguise silentlyAddPlayer(String playername) public MiscDisguise silentlyAddPlayer(String playername) {
{
return (MiscDisguise) super.silentlyAddPlayer(playername); return (MiscDisguise) super.silentlyAddPlayer(playername);
} }
@Override @Override
public MiscDisguise silentlyRemovePlayer(String playername) public MiscDisguise silentlyRemovePlayer(String playername) {
{
return (MiscDisguise) super.silentlyRemovePlayer(playername); return (MiscDisguise) super.silentlyRemovePlayer(playername);
} }

102
src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java
View File

@ -9,43 +9,38 @@ import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
public class MobDisguise extends TargetedDisguise public class MobDisguise extends TargetedDisguise {
{
private boolean isAdult; private boolean isAdult;
public MobDisguise(DisguiseType disguiseType) public MobDisguise(DisguiseType disguiseType) {
{
this(disguiseType, true); this(disguiseType, true);
} }
public MobDisguise(DisguiseType disguiseType, boolean isAdult) public MobDisguise(DisguiseType disguiseType, boolean isAdult) {
{ super(disguiseType);
if (!disguiseType.isMob())
{ if (!disguiseType.isMob()) {
throw new InvalidParameterException("Expected a living DisguiseType while constructing MobDisguise. Received " throw new InvalidParameterException("Expected a living DisguiseType while constructing MobDisguise. Received "
+ disguiseType + " instead. Please use " + (disguiseType.isPlayer() ? "PlayerDisguise" : "MiscDisguise") + disguiseType + " instead. Please use " + (disguiseType.isPlayer() ? "PlayerDisguise" : "MiscDisguise")
+ " instead"); + " instead");
} }
this.isAdult = isAdult; this.isAdult = isAdult;
createDisguise(disguiseType); createDisguise();
} }
@Override @Override
public MobDisguise addPlayer(Player player) public MobDisguise addPlayer(Player player) {
{
return (MobDisguise) super.addPlayer(player); return (MobDisguise) super.addPlayer(player);
} }
@Override @Override
public MobDisguise addPlayer(String playername) public MobDisguise addPlayer(String playername) {
{
return (MobDisguise) super.addPlayer(playername); return (MobDisguise) super.addPlayer(playername);
} }
@Override @Override
public MobDisguise clone() public MobDisguise clone() {
{
MobDisguise disguise = new MobDisguise(getType(), isAdult()); MobDisguise disguise = new MobDisguise(getType(), isAdult());
disguise.setReplaceSounds(isSoundsReplaced()); disguise.setReplaceSounds(isSoundsReplaced());
disguise.setViewSelfDisguise(isSelfDisguiseVisible()); disguise.setViewSelfDisguise(isSelfDisguiseVisible());
@ -55,35 +50,28 @@ public class MobDisguise extends TargetedDisguise
disguise.setVelocitySent(isVelocitySent()); disguise.setVelocitySent(isVelocitySent());
disguise.setModifyBoundingBox(isModifyBoundingBox()); disguise.setModifyBoundingBox(isModifyBoundingBox());
if (getWatcher() != null) if (getWatcher() != null) {
{
disguise.setWatcher(getWatcher().clone(disguise)); disguise.setWatcher(getWatcher().clone(disguise));
} }
return disguise; return disguise;
} }
public boolean doesDisguiseAge() public boolean doesDisguiseAge() {
{
return getWatcher() != null && (getWatcher() instanceof AgeableWatcher || getWatcher() instanceof ZombieWatcher); return getWatcher() != null && (getWatcher() instanceof AgeableWatcher || getWatcher() instanceof ZombieWatcher);
} }
@Override @Override
public LivingWatcher getWatcher() public LivingWatcher getWatcher() {
{
return (LivingWatcher) super.getWatcher(); return (LivingWatcher) super.getWatcher();
} }
public boolean isAdult() public boolean isAdult() {
{ if (getWatcher() != null) {
if (getWatcher() != null) if (getWatcher() instanceof AgeableWatcher) {
{
if (getWatcher() instanceof AgeableWatcher)
{
return ((AgeableWatcher) getWatcher()).isAdult(); return ((AgeableWatcher) getWatcher()).isAdult();
} }
else if (getWatcher() instanceof ZombieWatcher) else if (getWatcher() instanceof ZombieWatcher) {
{
return ((ZombieWatcher) getWatcher()).isAdult(); return ((ZombieWatcher) getWatcher()).isAdult();
} }
return true; return true;
@ -92,110 +80,92 @@ public class MobDisguise extends TargetedDisguise
} }
@Override @Override
public boolean isMobDisguise() public boolean isMobDisguise() {
{
return true; return true;
} }
@Override @Override
public MobDisguise removePlayer(Player player) public MobDisguise removePlayer(Player player) {
{
return (MobDisguise) super.removePlayer(player); return (MobDisguise) super.removePlayer(player);
} }
@Override @Override
public MobDisguise removePlayer(String playername) public MobDisguise removePlayer(String playername) {
{
return (MobDisguise) super.removePlayer(playername); return (MobDisguise) super.removePlayer(playername);
} }
@Override @Override
public MobDisguise setDisguiseTarget(TargetType newTargetType) public MobDisguise setDisguiseTarget(TargetType newTargetType) {
{
return (MobDisguise) super.setDisguiseTarget(newTargetType); return (MobDisguise) super.setDisguiseTarget(newTargetType);
} }
@Override @Override
public MobDisguise setEntity(Entity entity) public MobDisguise setEntity(Entity entity) {
{
return (MobDisguise) super.setEntity(entity); return (MobDisguise) super.setEntity(entity);
} }
@Override @Override
public MobDisguise setHearSelfDisguise(boolean hearSelfDisguise) public MobDisguise setHearSelfDisguise(boolean hearSelfDisguise) {
{
return (MobDisguise) super.setHearSelfDisguise(hearSelfDisguise); return (MobDisguise) super.setHearSelfDisguise(hearSelfDisguise);
} }
@Override @Override
public MobDisguise setHideArmorFromSelf(boolean hideArmor) public MobDisguise setHideArmorFromSelf(boolean hideArmor) {
{
return (MobDisguise) super.setHideArmorFromSelf(hideArmor); return (MobDisguise) super.setHideArmorFromSelf(hideArmor);
} }
@Override @Override
public MobDisguise setHideHeldItemFromSelf(boolean hideHeldItem) public MobDisguise setHideHeldItemFromSelf(boolean hideHeldItem) {
{
return (MobDisguise) super.setHideHeldItemFromSelf(hideHeldItem); return (MobDisguise) super.setHideHeldItemFromSelf(hideHeldItem);
} }
@Override @Override
public MobDisguise setKeepDisguiseOnEntityDespawn(boolean keepDisguise) public MobDisguise setKeepDisguiseOnEntityDespawn(boolean keepDisguise) {
{
return (MobDisguise) super.setKeepDisguiseOnEntityDespawn(keepDisguise); return (MobDisguise) super.setKeepDisguiseOnEntityDespawn(keepDisguise);
} }
@Override @Override
public MobDisguise setKeepDisguiseOnPlayerDeath(boolean keepDisguise) public MobDisguise setKeepDisguiseOnPlayerDeath(boolean keepDisguise) {
{
return (MobDisguise) super.setKeepDisguiseOnPlayerDeath(keepDisguise); return (MobDisguise) super.setKeepDisguiseOnPlayerDeath(keepDisguise);
} }
@Override @Override
public MobDisguise setKeepDisguiseOnPlayerLogout(boolean keepDisguise) public MobDisguise setKeepDisguiseOnPlayerLogout(boolean keepDisguise) {
{
return (MobDisguise) super.setKeepDisguiseOnPlayerLogout(keepDisguise); return (MobDisguise) super.setKeepDisguiseOnPlayerLogout(keepDisguise);
} }
@Override @Override
public MobDisguise setModifyBoundingBox(boolean modifyBox) public MobDisguise setModifyBoundingBox(boolean modifyBox) {
{
return (MobDisguise) super.setModifyBoundingBox(modifyBox); return (MobDisguise) super.setModifyBoundingBox(modifyBox);
} }
@Override @Override
public MobDisguise setReplaceSounds(boolean areSoundsReplaced) public MobDisguise setReplaceSounds(boolean areSoundsReplaced) {
{
return (MobDisguise) super.setReplaceSounds(areSoundsReplaced); return (MobDisguise) super.setReplaceSounds(areSoundsReplaced);
} }
@Override @Override
public MobDisguise setVelocitySent(boolean sendVelocity) public MobDisguise setVelocitySent(boolean sendVelocity) {
{
return (MobDisguise) super.setVelocitySent(sendVelocity); return (MobDisguise) super.setVelocitySent(sendVelocity);
} }
@Override @Override
public MobDisguise setViewSelfDisguise(boolean viewSelfDisguise) public MobDisguise setViewSelfDisguise(boolean viewSelfDisguise) {
{
return (MobDisguise) super.setViewSelfDisguise(viewSelfDisguise); return (MobDisguise) super.setViewSelfDisguise(viewSelfDisguise);
} }
@Override @Override
public MobDisguise setWatcher(FlagWatcher newWatcher) public MobDisguise setWatcher(FlagWatcher newWatcher) {
{
return (MobDisguise) super.setWatcher(newWatcher); return (MobDisguise) super.setWatcher(newWatcher);
} }
@Override @Override
public MobDisguise silentlyAddPlayer(String playername) public MobDisguise silentlyAddPlayer(String playername) {
{
return (MobDisguise) super.silentlyAddPlayer(playername); return (MobDisguise) super.silentlyAddPlayer(playername);
} }
@Override @Override
public MobDisguise silentlyRemovePlayer(String playername) public MobDisguise silentlyRemovePlayer(String playername) {
{
return (MobDisguise) super.silentlyRemovePlayer(playername); return (MobDisguise) super.silentlyRemovePlayer(playername);
} }
} }

30
src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
View File

@ -32,7 +32,7 @@ public class PlayerDisguise extends TargetedDisguise {
private UUID uuid = UUID.randomUUID(); private UUID uuid = UUID.randomUUID();
private PlayerDisguise() { private PlayerDisguise() {
// Internal usage only super(DisguiseType.PLAYER);
} }
public PlayerDisguise(Player player) { public PlayerDisguise(Player player) {
@ -44,35 +44,43 @@ public class PlayerDisguise extends TargetedDisguise {
} }
public PlayerDisguise(String name) { public PlayerDisguise(String name) {
this();
setName(name); setName(name);
setSkin(name); setSkin(name);
createDisguise(DisguiseType.PLAYER); createDisguise();
} }
public PlayerDisguise(String name, String skinToUse) { public PlayerDisguise(String name, String skinToUse) {
this();
setName(name); setName(name);
setSkin(skinToUse); setSkin(skinToUse);
createDisguise(DisguiseType.PLAYER); createDisguise();
} }
public PlayerDisguise(WrappedGameProfile gameProfile) { public PlayerDisguise(WrappedGameProfile gameProfile) {
this();
setName(gameProfile.getName()); setName(gameProfile.getName());
this.gameProfile = ReflectionManager.getGameProfileWithThisSkin(uuid, gameProfile.getName(), gameProfile); this.gameProfile = ReflectionManager.getGameProfileWithThisSkin(uuid, gameProfile.getName(), gameProfile);
createDisguise(DisguiseType.PLAYER); createDisguise();
} }
public PlayerDisguise(WrappedGameProfile gameProfile, WrappedGameProfile skinToUse) { public PlayerDisguise(WrappedGameProfile gameProfile, WrappedGameProfile skinToUse) {
this();
setName(gameProfile.getName()); setName(gameProfile.getName());
this.gameProfile = ReflectionManager.getGameProfile(uuid, gameProfile.getName()); this.gameProfile = ReflectionManager.getGameProfile(uuid, gameProfile.getName());
setSkin(skinToUse); setSkin(skinToUse);
createDisguise(DisguiseType.PLAYER); createDisguise();
} }
@Override @Override
@ -112,7 +120,7 @@ public class PlayerDisguise extends TargetedDisguise {
disguise.setWatcher(getWatcher().clone(disguise)); disguise.setWatcher(getWatcher().clone(disguise));
} }
disguise.createDisguise(DisguiseType.PLAYER); disguise.createDisguise();
return disguise; return disguise;
} }
@ -230,6 +238,16 @@ public class PlayerDisguise extends TargetedDisguise {
} }
public PlayerDisguise setSkin(String newSkin) { public PlayerDisguise setSkin(String newSkin) {
if (newSkin != null && newSkin.length() > 50) {
try {
setSkin(ReflectionManager.parseGameProfile(newSkin));
}
catch (Exception ex) {
throw new IllegalArgumentException(
"The skin is too long to be a playername, but cannot be parsed to a GameProfile!");
}
}
skinToUse = newSkin; skinToUse = newSkin;
if (newSkin == null) { if (newSkin == null) {

4
src/me/libraryaddict/disguise/disguisetypes/TargetedDisguise.java
View File

@ -23,6 +23,10 @@ import me.libraryaddict.disguise.utilities.ReflectionManager;
public abstract class TargetedDisguise extends Disguise { public abstract class TargetedDisguise extends Disguise {
public TargetedDisguise(DisguiseType disguiseType) {
super(disguiseType);
}
public enum TargetType { public enum TargetType {
HIDE_DISGUISE_TO_EVERYONE_BUT_THESE_PLAYERS, SHOW_TO_EVERYONE_BUT_THESE_PLAYERS HIDE_DISGUISE_TO_EVERYONE_BUT_THESE_PLAYERS, SHOW_TO_EVERYONE_BUT_THESE_PLAYERS
} }

21
src/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
View File

@ -8,40 +8,33 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.FlagWatcher; import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.DisguiseUtilities;
public class FallingBlockWatcher extends FlagWatcher public class FallingBlockWatcher extends FlagWatcher {
{
private ItemStack block; private ItemStack block;
public FallingBlockWatcher(Disguise disguise) public FallingBlockWatcher(Disguise disguise) {
{
super(disguise); super(disguise);
} }
@Override @Override
public FallingBlockWatcher clone(Disguise disguise) public FallingBlockWatcher clone(Disguise disguise) {
{
FallingBlockWatcher watcher = (FallingBlockWatcher) super.clone(disguise); FallingBlockWatcher watcher = (FallingBlockWatcher) super.clone(disguise);
watcher.setBlock(getBlock()); watcher.setBlock(getBlock());
return watcher; return watcher;
} }
public ItemStack getBlock() public ItemStack getBlock() {
{
return block; return block;
} }
public void setBlock(ItemStack block) public void setBlock(ItemStack block) {
{
this.block = block; this.block = block;
if (block.getType() == null || block.getType() == Material.AIR) if (block == null || block.getType() == null || block.getType() == Material.AIR) {
{
block.setType(Material.STONE); block.setType(Material.STONE);
} }
if (DisguiseAPI.isDisguiseInUse(getDisguise()) && getDisguise().getWatcher() == this) if (DisguiseAPI.isDisguiseInUse(getDisguise()) && getDisguise().getWatcher() == this) {
{
DisguiseUtilities.refreshTrackers(getDisguise()); DisguiseUtilities.refreshTrackers(getDisguise());
} }
} }

16
src/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java
View File

@ -6,28 +6,24 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.FlagType; import me.libraryaddict.disguise.disguisetypes.FlagType;
import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.DisguiseUtilities;
public class VillagerWatcher extends AgeableWatcher public class VillagerWatcher extends AgeableWatcher {
{
public VillagerWatcher(Disguise disguise) public VillagerWatcher(Disguise disguise) {
{
super(disguise); super(disguise);
setProfession(Profession.values()[DisguiseUtilities.random.nextInt(Profession.values().length)]); setProfession(Profession.values()[DisguiseUtilities.random.nextInt(Profession.values().length)]);
} }
public Profession getProfession() public Profession getProfession() {
{
return Profession.values()[getData(FlagType.VILLAGER_PROFESSION)]; return Profession.values()[getData(FlagType.VILLAGER_PROFESSION)];
} }
public void setProfession(int professionId) @Deprecated
{ public void setProfession(int professionId) {
setData(FlagType.VILLAGER_PROFESSION, professionId); setData(FlagType.VILLAGER_PROFESSION, professionId);
sendData(FlagType.VILLAGER_PROFESSION); sendData(FlagType.VILLAGER_PROFESSION);
} }
public void setProfession(Profession newProfession) public void setProfession(Profession newProfession) {
{
setProfession(newProfession.ordinal()); setProfession(newProfession.ordinal());
} }
} }

1
src/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java
View File

@ -43,6 +43,7 @@ public class ZombieVillagerWatcher extends ZombieWatcher {
* *
* @param id * @param id
*/ */
@Deprecated
public void setProfession(int id) { public void setProfession(int id) {
setData(FlagType.ZOMBIE_VILLAGER_PROFESSION, id); setData(FlagType.ZOMBIE_VILLAGER_PROFESSION, id);
sendData(FlagType.ZOMBIE_VILLAGER_PROFESSION); sendData(FlagType.ZOMBIE_VILLAGER_PROFESSION);

1043
src/me/libraryaddict/disguise/utilities/DisguiseParser.java Normal file
View File

File diff suppressed because it is too large Load Diff

5
src/me/libraryaddict/disguise/utilities/ReflectionFlagWatchers.java
View File

@ -26,6 +26,7 @@ import me.libraryaddict.disguise.disguisetypes.AnimalColor;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.FlagWatcher; 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 {
@ -107,6 +108,10 @@ public class ReflectionFlagWatchers {
return null; return null;
} }
public static ParamInfo getParamInfo(DisguisePerm disguiseType, String methodName) {
return getParamInfo(disguiseType.getType(), methodName);
}
public static ParamInfo getParamInfo(DisguiseType disguiseType, String methodName) { public static ParamInfo getParamInfo(DisguiseType disguiseType, String methodName) {
for (Method method : getDisguiseWatcherMethods(disguiseType.getWatcherClass())) { for (Method method : getDisguiseWatcherMethods(disguiseType.getWatcherClass())) {
if (!method.getName().toLowerCase().equals(methodName.toLowerCase())) if (!method.getName().toLowerCase().equals(methodName.toLowerCase()))

41
src/me/libraryaddict/disguise/utilities/ReflectionManager.java
View File

@ -5,7 +5,10 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Pattern;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -33,8 +36,10 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer; import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject; import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedGameProfile; import com.comphenix.protocol.wrappers.WrappedGameProfile;
import com.comphenix.protocol.wrappers.WrappedSignedProperty;
import com.comphenix.protocol.wrappers.WrappedWatchableObject; import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.gson.Gson;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
@ -91,6 +96,42 @@ public class ReflectionManager {
entityCountField.setAccessible(true); entityCountField.setAccessible(true);
} }
public static WrappedGameProfile parseGameProfile(String toParse) {
Map<String, Object> response = new Gson().fromJson(toParse, Map.class);
String id = (String) response.get("id");
if (!id.contains("-")) {
id = Pattern.compile("([0-9a-fA-F]{8})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]+)").matcher(id)
.replaceFirst("$1-$2-$3-$4-$5");
}
WrappedGameProfile gameProfile = new WrappedGameProfile(UUID.fromString(id), (String) response.get("name"));
if (response.containsKey("properties")) {
ArrayList<Map<String, String>> properties = (ArrayList) response.get("properties");
for (Map<String, String> s : properties) {
String gName = null;
String gValue = null;
String gSigned = null;
if (s.containsKey("name"))
gName = s.get("name");
if (s.containsKey("value"))
gValue = s.get("value");
if (s.containsKey("signature"))
gSigned = s.get("signature");
gameProfile.getProperties().put(gName, new WrappedSignedProperty(gName, gValue, gSigned));
}
}
return gameProfile;
}
public static Object createEntityInstance(String entityName) { public static Object createEntityInstance(String entityName) {
try { try {
Class<?> entityClass = getNmsClass("Entity" + entityName); Class<?> entityClass = getNmsClass("Entity" + entityName);