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

Sorted the methods and renamed them

Browse Source
This commit is contained in:
Andrew
2013-11-06 19:02:31 +13:00
parent 03dcdb9c61
commit f202fb7f52
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/me/libraryaddict/disguise/BaseDisguiseCommand.java
View File

@@ -155,11 +155,11 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
value = (double) obj;
}
} else {
throw parseString("number", valueString, methodName);
throw parseToException("number", valueString, methodName);
}
} else if (boolean.class == param) {
if (!("true".equalsIgnoreCase(valueString) || "false".equalsIgnoreCase(valueString)))
throw parseString("true/false", valueString, methodName);
throw parseToException("true/false", valueString, methodName);
value = (boolean) "true".equalsIgnoreCase(valueString);
} else if (param == String.class) {
value = ChatColor.translateAlternateColorCodes('&', valueString);
@@ -167,11 +167,11 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
try {
value = AnimalColor.valueOf(valueString.toUpperCase());
} catch (Exception ex) {
throw parseString("animal color", valueString, methodName);
throw parseToException("animal color", valueString, methodName);
}
} else if (param == ItemStack.class) {
try {
value = parseString(valueString);
value = parseToItemstack(valueString);
} catch (Exception ex) {
throw new Exception(String.format(ex.getMessage(), methodName));
}
@@ -181,15 +181,15 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
if (split.length == 4) {
for (int a = 0; a < 4; a++) {
try {
ItemStack item = parseString(split[a]);
ItemStack item = parseToItemstack(split[a]);
items[a] = item;
} catch (Exception ex) {
throw parseString("item ID,ID,ID,ID" + ChatColor.RED + " or " + ChatColor.GREEN
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 parseString("item ID,ID,ID,ID" + ChatColor.RED + " or " + ChatColor.GREEN
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;
@@ -207,12 +207,12 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
return disguise;
}
private Exception parseString(String expectedValue, String receivedInstead, String methodName) {
private Exception parseToException(String expectedValue, String receivedInstead, String methodName) {
return new Exception(ChatColor.RED + "Expected " + ChatColor.GREEN + expectedValue + ChatColor.RED + ", received "
+ ChatColor.GREEN + receivedInstead + ChatColor.RED + " instead for " + ChatColor.GREEN + methodName);
}
private ItemStack parseString(String string) throws Exception {
private ItemStack parseToItemstack(String string) throws Exception {
String[] split = string.split(":", -1);
if (isNumeric(split[0])) {
int itemId = Integer.parseInt(split[0]);
@@ -221,15 +221,15 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
if (isNumeric(split[1])) {
itemDura = Short.parseShort(split[1]);
} else {
throw parseString("item ID:Durability combo", string, "%s");
throw parseToException("item ID:Durability combo", string, "%s");
}
}
return new ItemStack(itemId, 1, itemDura);
} else {
if (split.length == 1) {
throw parseString("item ID", string, "%s");
throw parseToException("item ID", string, "%s");
} else {
throw parseString("item ID:Durability combo", string, "%s");
throw parseToException("item ID:Durability combo", string, "%s");
}
}
}

54
src/me/libraryaddict/disguise/DisguiseListener.java
View File

@@ -19,6 +19,7 @@ import org.bukkit.scheduler.BukkitRunnable;
public class DisguiseListener implements Listener {
private String currentVersion;
private DisguiseAPI disguiseAPI = new DisguiseAPI();
private HashMap<String, BukkitRunnable> disguiseRunnable = new HashMap<String, BukkitRunnable>();
private HashMap<String, Disguise> disguiseSlap = new HashMap<String, Disguise>();
private String latestVersion;
@@ -27,7 +28,6 @@ public class DisguiseListener implements Listener {
private String updateMessage = ChatColor.RED + "[LibsDisguises] " + ChatColor.DARK_RED
+ "There is a update ready to be downloaded! You are using " + ChatColor.RED + "v%s" + ChatColor.DARK_RED
+ ", the new version is " + ChatColor.RED + "%s" + ChatColor.DARK_RED + "!";
private DisguiseAPI disguiseAPI = new DisguiseAPI();
public DisguiseListener(LibsDisguises libsDisguises) {
plugin = libsDisguises;
@@ -58,32 +58,6 @@ public class DisguiseListener implements Listener {
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onVechileLeave(VehicleExitEvent event) {
if (event.isCancelled())
return;
final Disguise disguise = DisguiseAPI.getDisguise(event.getExited());
if (disguise != null && event.getExited() instanceof Player) {
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
public void run() {
disguiseAPI.setupFakeDisguise(disguise);
((Player) disguise.getEntity()).updateInventory();
}
});
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onVechileEnter(VehicleEnterEvent event) {
if (event.isCancelled())
return;
Disguise disguise = DisguiseAPI.getDisguise(event.getEntered());
if (disguise != null && event.getEntered() instanceof Player) {
disguiseAPI.removeVisibleDisguise((Player) event.getEntered());
((Player) event.getEntered()).updateInventory();
}
}
@EventHandler
public void onJoin(PlayerJoinEvent event) {
Player p = event.getPlayer();
@@ -113,6 +87,32 @@ public class DisguiseListener implements Listener {
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onVechileEnter(VehicleEnterEvent event) {
if (event.isCancelled())
return;
Disguise disguise = DisguiseAPI.getDisguise(event.getEntered());
if (disguise != null && event.getEntered() instanceof Player) {
disguiseAPI.removeVisibleDisguise((Player) event.getEntered());
((Player) event.getEntered()).updateInventory();
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onVechileLeave(VehicleExitEvent event) {
if (event.isCancelled())
return;
final Disguise disguise = DisguiseAPI.getDisguise(event.getExited());
if (disguise != null && event.getExited() instanceof Player) {
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
public void run() {
disguiseAPI.setupFakeDisguise(disguise);
((Player) disguise.getEntity()).updateInventory();
}
});
}
}
public void setSlap(final String player, Disguise disguise) {
if (disguiseSlap.containsKey(player)) {
disguiseSlap.remove(player);