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

Cleaned up classes

Browse Source
This commit is contained in:
Andrew 2013-11-06 05:53:53 +13:00
parent 48029b8849
commit e8d821619c
6 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,12 @@
package me.libraryaddict.disguise.commands; package me.libraryaddict.disguise.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import me.libraryaddict.disguise.BaseDisguiseCommand; import me.libraryaddict.disguise.BaseDisguiseCommand;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

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

@ -1,20 +1,12 @@
package me.libraryaddict.disguise.commands; package me.libraryaddict.disguise.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import me.libraryaddict.disguise.BaseDisguiseCommand; import me.libraryaddict.disguise.BaseDisguiseCommand;
import me.libraryaddict.disguise.DisguiseListener; import me.libraryaddict.disguise.DisguiseListener;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class DisguiseEntityCommand extends BaseDisguiseCommand { public class DisguiseEntityCommand extends BaseDisguiseCommand {

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

@ -5,19 +5,11 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import me.libraryaddict.disguise.BaseDisguiseCommand; import me.libraryaddict.disguise.BaseDisguiseCommand;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class DisguiseHelpCommand extends BaseDisguiseCommand { public class DisguiseHelpCommand extends BaseDisguiseCommand {

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

@ -1,21 +1,12 @@
package me.libraryaddict.disguise.commands; package me.libraryaddict.disguise.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import me.libraryaddict.disguise.BaseDisguiseCommand; import me.libraryaddict.disguise.BaseDisguiseCommand;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
import me.libraryaddict.disguise.disguisetypes.MobDisguise;
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

16
src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java
View File

@ -132,19 +132,12 @@ public enum DisguiseType {
return DisguiseType.valueOf(entityType.name()); return DisguiseType.valueOf(entityType.name());
} }
public String toReadable() {
String[] split = name().split("_");
for (int i = 0; i < split.length; i++)
split[i] = split[i].substring(0, 1) + split[i].substring(1).toLowerCase();
return StringUtils.join(split, " ");
}
private int defaultData; private int defaultData;
private int defaultId; private int defaultId;
private int entityId; private int entityId;
private EntityType entityType; private EntityType entityType;
private Class watcherClass; private Class watcherClass;
private DisguiseType(EntityType newType, int... obj) { private DisguiseType(EntityType newType, int... obj) {
entityType = newType; entityType = newType;
for (int i = 0; i < obj.length; i++) { for (int i = 0; i < obj.length; i++) {
@ -200,4 +193,11 @@ public enum DisguiseType {
public void setWatcherClass(Class c) { public void setWatcherClass(Class c) {
watcherClass = c; watcherClass = c;
} }
public String toReadable() {
String[] split = name().split("_");
for (int i = 0; i < split.length; i++)
split[i] = split[i].substring(0, 1) + split[i].substring(1).toLowerCase();
return StringUtils.join(split, " ");
}
} }

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

@ -49,12 +49,12 @@ public class FlagWatcher {
classTypes.put(ItemStack.class, 5); classTypes.put(ItemStack.class, 5);
classTypes.put(ChunkCoordinates.class, 6); classTypes.put(ChunkCoordinates.class, 6);
} }
private Disguise disguise;
private HashMap<Integer, Object> entityValues = new HashMap<Integer, Object>();
/** /**
* This is the entity values I need to add else it could crash them.. * This is the entity values I need to add else it could crash them..
*/ */
private HashMap<Integer, Object> backupEntityValues = new HashMap<Integer, Object>(); private HashMap<Integer, Object> backupEntityValues = new HashMap<Integer, Object>();
private Disguise disguise;
private HashMap<Integer, Object> entityValues = new HashMap<Integer, Object>();
private boolean hasDied; private boolean hasDied;
private org.bukkit.inventory.ItemStack[] items = new org.bukkit.inventory.ItemStack[5]; private org.bukkit.inventory.ItemStack[] items = new org.bukkit.inventory.ItemStack[5];
@ -226,6 +226,10 @@ public class FlagWatcher {
setItemStack(i, itemstack[i]); setItemStack(i, itemstack[i]);
} }
protected void setBackupValue(int no, Object value) {
backupEntityValues.put(no, value);
}
public void setBurning(boolean setBurning) { public void setBurning(boolean setBurning) {
setFlag(0, 0, setBurning); setFlag(0, 0, setBurning);
sendData(0); sendData(0);
@ -320,8 +324,4 @@ public class FlagWatcher {
entityValues.put(no, value); entityValues.put(no, value);
} }
protected void setBackupValue(int no, Object value) {
backupEntityValues.put(no, value);
}
} }