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

Renaming commands, fixing evoker fangs

Browse Source
This commit is contained in:
libraryaddict 2016-11-29 10:47:48 +13:00
parent 1de16cb4d7
commit ce134af4fa
12 changed files with 277 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,14 +21,14 @@ import com.comphenix.protocol.reflect.FieldAccessException;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import me.libraryaddict.disguise.commands.CloneDisguiseCommand;
import me.libraryaddict.disguise.commands.DisguiseCloneCommand;
import me.libraryaddict.disguise.commands.DisguiseCommand;
import me.libraryaddict.disguise.commands.DisguiseHelpCommand;
import me.libraryaddict.disguise.commands.DisguiseViewSelf;
import me.libraryaddict.disguise.commands.EntityDisguiseCommand;
import me.libraryaddict.disguise.commands.DisguiseViewSelfCommand;
import me.libraryaddict.disguise.commands.DisguiseEntityCommand;
import me.libraryaddict.disguise.commands.LibsDisguisesCommand;
import me.libraryaddict.disguise.commands.PlayerDisguiseCommand;
import me.libraryaddict.disguise.commands.RadiusDisguiseCommand;
import me.libraryaddict.disguise.commands.DisguisePlayerCommand;
import me.libraryaddict.disguise.commands.DisguiseRadiusCommand;
import me.libraryaddict.disguise.commands.UndisguiseCommand;
import me.libraryaddict.disguise.commands.UndisguiseEntityCommand;
import me.libraryaddict.disguise.commands.UndisguisePlayerCommand;
@ -98,16 +98,16 @@ public class LibsDisguises extends JavaPlugin {
registerCommand("disguise", new DisguiseCommand());
registerCommand("undisguise", new UndisguiseCommand());
registerCommand("disguiseplayer", new PlayerDisguiseCommand());
registerCommand("disguiseplayer", new DisguisePlayerCommand());
registerCommand("undisguiseplayer", new UndisguisePlayerCommand());
registerCommand("undisguiseentity", new UndisguiseEntityCommand());
registerCommand("disguiseentity", new EntityDisguiseCommand());
registerCommand("disguiseradius", new RadiusDisguiseCommand(getConfig().getInt("DisguiseRadiusMax")));
registerCommand("disguiseentity", new DisguiseEntityCommand());
registerCommand("disguiseradius", new DisguiseRadiusCommand(getConfig().getInt("DisguiseRadiusMax")));
registerCommand("undisguiseradius", new UndisguiseRadiusCommand(getConfig().getInt("UndisguiseRadiusMax")));
registerCommand("disguisehelp", new DisguiseHelpCommand());
registerCommand("disguiseclone", new CloneDisguiseCommand());
registerCommand("disguiseclone", new DisguiseCloneCommand());
registerCommand("libsdisguises", new LibsDisguisesCommand());
registerCommand("disguiseviewself", new DisguiseViewSelf());
registerCommand("disguiseviewself", new DisguiseViewSelfCommand());
registerValues();

26
src/me/libraryaddict/disguise/commands/BaseDisguiseCommand.java → src/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
View File

@ -43,7 +43,7 @@ import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
/**
* @author libraryaddict
*/
public abstract class BaseDisguiseCommand implements CommandExecutor {
public abstract class DisguiseBaseCommand implements CommandExecutor {
public class DisguiseParseException extends Exception {
private static final long serialVersionUID = 1276971370793124510L;
@ -123,6 +123,23 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
return newArgs.toArray(new String[0]);
}
public String getPermNode() {
if (this instanceof DisguiseCommand) {
return "disguise";
}
else if (this instanceof DisguiseEntityCommand) {
return "disguiseentity";
}
else if (this instanceof DisguisePlayerCommand) {
return "disguiseplayer";
}
else if (this instanceof DisguiseRadiusCommand) {
return "disguiseradius";
}
else
throw new UnsupportedOperationException("Unknown disguise command, perm node not found");
}
protected HashMap<String, Boolean> getDisguiseOptions(CommandSender sender, DisguiseType type) {
switch (type) {
case PLAYER:
@ -133,7 +150,7 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
case DROPPED_ITEM:
HashMap<String, Boolean> returns = new HashMap<>();
String beginning = "libsdisguises.options." + getClass().getSimpleName().toLowerCase().replace("command", "") + ".";
String beginning = "libsdisguises.options." + getPermNode() + ".";
for (PermissionAttachmentInfo permission : sender.getEffectivePermissions()) {
String lowerPerm = permission.getPermission().toLowerCase();
@ -192,7 +209,7 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
}
protected HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> getPermissions(CommandSender sender) {
return getPermissions(sender, "libsdisguises." + getClass().getSimpleName().replace("Command", "").toLowerCase() + ".");
return getPermissions(sender, "libsdisguises." + getPermNode() + ".");
}
/**
@ -309,6 +326,7 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
for (String perm : perms.keySet()) {
if (!perms.get(perm)) {
perm = perm.substring(permissionNode.length());
String disguiseType = perm.split("\\.")[0];
DisguiseType dType = null;
@ -424,7 +442,7 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
* @param args
* @param map
* @return
* @throws BaseDisguiseCommand.DisguiseParseException
* @throws DisguiseBaseCommand.DisguiseParseException
* @throws java.lang.IllegalAccessException
* @throws java.lang.reflect.InvocationTargetException
*/

2
src/me/libraryaddict/disguise/commands/CloneDisguiseCommand.java → src/me/libraryaddict/disguise/commands/DisguiseCloneCommand.java
View File

@ -14,7 +14,7 @@ import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
public class CloneDisguiseCommand extends BaseDisguiseCommand implements TabCompleter {
public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabCompleter {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (sender.getName().equals("CONSOLE")) {

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

@ -21,7 +21,7 @@ import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
public class DisguiseCommand extends BaseDisguiseCommand implements TabCompleter {
public class DisguiseCommand extends DisguiseBaseCommand implements TabCompleter {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (sender.getName().equals("CONSOLE")) {

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

@ -21,7 +21,7 @@ import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
public class EntityDisguiseCommand extends BaseDisguiseCommand implements TabCompleter {
public class DisguiseEntityCommand extends DisguiseBaseCommand implements TabCompleter {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (sender.getName().equals("CONSOLE")) {

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

@ -18,7 +18,7 @@ import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
public class DisguiseHelpCommand extends BaseDisguiseCommand implements TabCompleter {
public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompleter {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
@ -149,6 +149,7 @@ public class DisguiseHelpCommand extends BaseDisguiseCommand implements TabCompl
}
}
}
sender.sendMessage(ChatColor.RED + "You are forbidden to use this command.");
return true;
}

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

@ -21,7 +21,7 @@ import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
public class PlayerDisguiseCommand extends BaseDisguiseCommand implements TabCompleter {
public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCompleter {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

4
src/me/libraryaddict/disguise/commands/RadiusDisguiseCommand.java → src/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
View File

@ -26,11 +26,11 @@ import me.libraryaddict.disguise.utilities.ClassGetter;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers;
import me.libraryaddict.disguise.utilities.ReflectionFlagWatchers.ParamInfo;
public class RadiusDisguiseCommand extends BaseDisguiseCommand implements TabCompleter {
public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCompleter {
private int maxRadius = 30;
private ArrayList<Class<? extends Entity>> validClasses = new ArrayList<>();
public RadiusDisguiseCommand(int maxRadius) {
public DisguiseRadiusCommand(int maxRadius) {
this.maxRadius = maxRadius;
for (Class c : ClassGetter.getClassesForPackage("org.bukkit.entity")) {
if (c != Entity.class && Entity.class.isAssignableFrom(c) && c.getAnnotation(Deprecated.class) == null) {

2
src/me/libraryaddict/disguise/commands/DisguiseViewSelf.java → src/me/libraryaddict/disguise/commands/DisguiseViewSelfCommand.java
View File

@ -11,7 +11,7 @@ import me.libraryaddict.disguise.DisguiseAPI;
/**
* @author Navid
*/
public class DisguiseViewSelf implements CommandExecutor {
public class DisguiseViewSelfCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {

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

@ -215,8 +215,16 @@ public abstract class Disguise {
DisguiseUtilities.refreshTrackers(disguise);
}
}
else if (getType() == DisguiseType.EVOKER_FANGS) {
refreshDisguise++;
if (getType() == DisguiseType.ITEM_FRAME) {
if (refreshDisguise % 20 == 0) {
refreshDisguise = 0;
DisguiseUtilities.refreshTrackers(disguise);
}
}
else if (getType() == DisguiseType.ITEM_FRAME) {
Location loc = getEntity().getLocation();
int newFacing = (((int) loc.getYaw() + 720 + 45) / 90) % 4;

670
src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

File diff suppressed because it is too large Load Diff

1
src/me/libraryaddict/disguise/utilities/PacketsManager.java
View File

@ -186,7 +186,6 @@ public class PacketsManager {
ItemStack itemstack = disguise.getWatcher().getItemStack(slot);
if (itemstack == null || itemstack.getType() == Material.AIR) {
System.out.println("Not wearing anything for " + slot.name());
continue;
}