From 73ac6488cec1e32eb9aa3366ebf5721bc86e83e7 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 3 Jun 2015 14:11:56 -0600 Subject: [PATCH] Run IntelliJ IDEA inspections --- .../AlternativeCommandsHandler.java | 8 +- .../com/earth2me/essentials/Essentials.java | 6 +- .../essentials/EssentialsPlayerListener.java | 3 +- .../essentials/EssentialsUpgrade.java | 21 ++--- .../com/earth2me/essentials/ExecuteTimer.java | 4 +- .../src/com/earth2me/essentials/IConf.java | 2 +- .../src/com/earth2me/essentials/IReplyTo.java | 4 +- .../src/com/earth2me/essentials/ITarget.java | 2 +- .../src/com/earth2me/essentials/IUser.java | 4 +- .../src/com/earth2me/essentials/Mob.java | 8 +- .../src/com/earth2me/essentials/MobData.java | 6 +- .../src/com/earth2me/essentials/UUIDMap.java | 1 - .../src/com/earth2me/essentials/User.java | 4 +- .../src/com/earth2me/essentials/UserData.java | 5 +- .../com/earth2me/essentials/api/IItemDb.java | 6 +- .../earth2me/essentials/api/ITeleport.java | 8 +- .../essentials/commands/Commandcondense.java | 4 +- .../essentials/commands/Commandenchant.java | 2 +- .../essentials/commands/Commandlist.java | 11 +-- .../essentials/commands/Commandnick.java | 5 +- .../essentials/commands/Commandnuke.java | 2 +- .../essentials/commands/Commandpotion.java | 2 +- .../essentials/commands/Commandptime.java | 4 +- .../essentials/commands/Commandpweather.java | 6 +- .../essentials/commands/Commandrecipe.java | 2 +- .../essentials/commands/Commandremove.java | 12 +-- .../essentials/commands/Commandrepair.java | 2 +- .../essentials/commands/Commandseen.java | 2 +- .../essentials/commands/Commandsetwarp.java | 3 +- .../essentials/commands/Commandthunder.java | 4 +- .../essentials/commands/Commandtime.java | 6 +- .../essentials/commands/Commandvanish.java | 2 +- .../essentials/commands/Commandwarp.java | 2 +- .../essentials/commands/Commandwhois.java | 2 +- .../essentials/craftbukkit/SetExpFix.java | 4 +- .../essentials/metrics/MetricsStarter.java | 2 - .../essentials/perm/PermissionsHandler.java | 1 - .../essentials/register/payment/Method.java | 88 +++++++++---------- .../essentials/signs/EssentialsSign.java | 8 +- .../com/earth2me/essentials/signs/Signs.java | 2 +- .../essentials/storage/BukkitConstructor.java | 2 +- .../textreader/KeywordReplacer.java | 2 +- .../essentials/utils/LocationUtil.java | 5 +- .../com/earth2me/essentials/FakeServer.java | 5 +- .../com/earth2me/essentials/StorageTest.java | 2 +- .../essentials/antibuild/AntiBuildConfig.java | 6 +- 46 files changed, 134 insertions(+), 158 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java index 1822f2cd2..1fbe26a62 100644 --- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java +++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java @@ -13,8 +13,8 @@ import java.util.logging.Logger; public class AlternativeCommandsHandler { private static final Logger LOGGER = Logger.getLogger("Essentials"); - private final transient Map> altcommands = new HashMap>(); - private final transient Map disabledList = new HashMap(); + private final transient Map> altcommands = new HashMap<>(); + private final transient Map disabledList = new HashMap<>(); private final transient IEssentials ess; public AlternativeCommandsHandler(final IEssentials ess) { @@ -35,7 +35,7 @@ public class AlternativeCommandsHandler { for (Command command : commands) { final PluginCommand pc = (PluginCommand) command; - final List labels = new ArrayList(pc.getAliases()); + final List labels = new ArrayList<>(pc.getAliases()); labels.add(pc.getName()); PluginCommand reg = ess.getServer().getPluginCommand(pluginName + ":" + pc.getName().toLowerCase(Locale.ENGLISH)); @@ -48,7 +48,7 @@ public class AlternativeCommandsHandler { for (String label : labels) { List plugincommands = altcommands.get(label.toLowerCase(Locale.ENGLISH)); if (plugincommands == null) { - plugincommands = new ArrayList(); + plugincommands = new ArrayList<>(); altcommands.put(label.toLowerCase(Locale.ENGLISH), plugincommands); } boolean found = false; diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 7e4cb7f2b..83cf99e9c 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -94,7 +94,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { private transient I18n i18n; private transient Metrics metrics; private transient EssentialsTimer timer; - private final transient List vanishedPlayers = new ArrayList(); + private final transient List vanishedPlayers = new ArrayList<>(); private transient Method oldGetOnlinePlayers; private transient SpawnerUtil spawnerUtil; @@ -128,7 +128,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { userMap = new UserMap(this); permissionsHandler = new PermissionsHandler(this, false); Economy.setEss(this); - confList = new ArrayList(); + confList = new ArrayList<>(); jails = new Jails(this); registerListeners(server.getPluginManager()); } @@ -160,7 +160,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { final EssentialsUpgrade upgrade = new EssentialsUpgrade(this); upgrade.beforeSettings(); execTimer.mark("Upgrade"); - confList = new ArrayList(); + confList = new ArrayList<>(); settings = new Settings(this); confList.add(settings); execTimer.mark("Settings"); diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index fbd2ff6ca..b3b72d77c 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -291,8 +291,7 @@ public class EssentialsPlayerListener implements Listener { loc = user.getBase().getBedSpawnLocation(); } if (loc != null) { - final Location updateLoc = loc; - user.getBase().setCompassTarget(updateLoc); + user.getBase().setCompassTarget(loc); } } diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java index d07304940..59cbc88c4 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -136,9 +136,9 @@ public class EssentialsUpgrade { } for (Map.Entry entry : powertools.entrySet()) { if (entry.getValue() instanceof String) { - List temp = new ArrayList(); + List temp = new ArrayList<>(); temp.add((String) entry.getValue()); - ((Map) powertools).put(entry.getKey(), temp); + powertools.put(entry.getKey(), temp); } } config.forceSave(); @@ -274,7 +274,7 @@ public class EssentialsUpgrade { final File file = new File(ess.getDataFolder(), "items.csv"); if (file.exists()) { try { - final Set oldconfigs = new HashSet(); + final Set oldconfigs = new HashSet<>(); oldconfigs.add(new BigInteger("66ec40b09ac167079f558d1099e39f10", 16)); // sep 1 oldconfigs.add(new BigInteger("34284de1ead43b0bee2aae85e75c041d", 16)); // crlf oldconfigs.add(new BigInteger("c33bc9b8ee003861611bbc2f48eb6f4f", 16)); // jul 24 @@ -282,13 +282,10 @@ public class EssentialsUpgrade { MessageDigest digest = ManagedFile.getDigest(); final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); - final DigestInputStream dis = new DigestInputStream(bis, digest); final byte[] buffer = new byte[1024]; - try { + try (DigestInputStream dis = new DigestInputStream(bis, digest)) { while (dis.read(buffer) != -1) { } - } finally { - dis.close(); } BigInteger hash = new BigInteger(1, digest.digest()); @@ -323,11 +320,8 @@ public class EssentialsUpgrade { if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old"))) { throw new Exception(tl("fileRenameError", "spawn.yml")); } - PrintWriter writer = new PrintWriter(configFile); - try { + try (PrintWriter writer = new PrintWriter(configFile)) { new YamlStorageWriter(writer).save(spawns); - } finally { - writer.close(); } } } catch (Exception ex) { @@ -358,11 +352,8 @@ public class EssentialsUpgrade { if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old"))) { throw new Exception(tl("fileRenameError", "jail.yml")); } - PrintWriter writer = new PrintWriter(configFile); - try { + try (PrintWriter writer = new PrintWriter(configFile)) { new YamlStorageWriter(writer).save(jails); - } finally { - writer.close(); } } } catch (Exception ex) { diff --git a/Essentials/src/com/earth2me/essentials/ExecuteTimer.java b/Essentials/src/com/earth2me/essentials/ExecuteTimer.java index 65061697e..2fefc189d 100644 --- a/Essentials/src/com/earth2me/essentials/ExecuteTimer.java +++ b/Essentials/src/com/earth2me/essentials/ExecuteTimer.java @@ -38,8 +38,8 @@ public class ExecuteTimer { double duration; for (ExecuteRecord pair : times) { - mark = (String) pair.getMark(); - time2 = (Long) pair.getTime(); + mark = pair.getMark(); + time2 = pair.getTime(); if (time1 > 0) { duration = (time2 - time1) / 1000000.0; output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - "); diff --git a/Essentials/src/com/earth2me/essentials/IConf.java b/Essentials/src/com/earth2me/essentials/IConf.java index 251084d69..b94d87c15 100644 --- a/Essentials/src/com/earth2me/essentials/IConf.java +++ b/Essentials/src/com/earth2me/essentials/IConf.java @@ -1,5 +1,5 @@ package com.earth2me.essentials; public interface IConf { - public void reloadConfig(); + void reloadConfig(); } diff --git a/Essentials/src/com/earth2me/essentials/IReplyTo.java b/Essentials/src/com/earth2me/essentials/IReplyTo.java index 562a86fe4..a02a458a9 100644 --- a/Essentials/src/com/earth2me/essentials/IReplyTo.java +++ b/Essentials/src/com/earth2me/essentials/IReplyTo.java @@ -6,12 +6,12 @@ public interface IReplyTo { * * @param user */ - public void setReplyTo(CommandSource user); + void setReplyTo(CommandSource user); /** * Gets the user the sender should reply to * * @return */ - public CommandSource getReplyTo(); + CommandSource getReplyTo(); } diff --git a/Essentials/src/com/earth2me/essentials/ITarget.java b/Essentials/src/com/earth2me/essentials/ITarget.java index 23ed4a0c0..d96e368de 100644 --- a/Essentials/src/com/earth2me/essentials/ITarget.java +++ b/Essentials/src/com/earth2me/essentials/ITarget.java @@ -4,5 +4,5 @@ import org.bukkit.Location; public interface ITarget { - public Location getLocation(); + Location getLocation(); } \ No newline at end of file diff --git a/Essentials/src/com/earth2me/essentials/IUser.java b/Essentials/src/com/earth2me/essentials/IUser.java index b8dffbae3..2eac0bd9d 100644 --- a/Essentials/src/com/earth2me/essentials/IUser.java +++ b/Essentials/src/com/earth2me/essentials/IUser.java @@ -92,7 +92,7 @@ public interface IUser { boolean isIgnoreExempt(); - public void sendMessage(String message); + void sendMessage(String message); /* * UserData @@ -142,5 +142,5 @@ public interface IUser { CommandSource getSource(); - public String getName(); + String getName(); } diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java index 7768e3c26..427e02ca0 100644 --- a/Essentials/src/com/earth2me/essentials/Mob.java +++ b/Essentials/src/com/earth2me/essentials/Mob.java @@ -61,14 +61,14 @@ public enum Mob { public static final Logger logger = Logger.getLogger("Essentials"); - private Mob(String n, Enemies en, String s, EntityType type) { + Mob(String n, Enemies en, String s, EntityType type) { this.suffix = s; this.name = n; this.type = en; this.bukkitType = type; } - private Mob(String n, Enemies en, EntityType type) { + Mob(String n, Enemies en, EntityType type) { this.name = n; this.type = en; this.bukkitType = type; @@ -93,7 +93,7 @@ public enum Mob { } public Entity spawn(final World world, final Server server, final Location loc) throws MobException { - final Entity entity = world.spawn(loc, (Class) this.bukkitType.getEntityClass()); + final Entity entity = world.spawn(loc, this.bukkitType.getEntityClass()); if (entity == null) { logger.log(Level.WARNING, tl("unableToSpawnMob")); throw new MobException(); @@ -107,7 +107,7 @@ public enum Mob { NEUTRAL("neutral"), ENEMY("enemy"); - private Enemies(final String type) { + Enemies(final String type) { this.type = type; } diff --git a/Essentials/src/com/earth2me/essentials/MobData.java b/Essentials/src/com/earth2me/essentials/MobData.java index a81def700..a43fe863e 100644 --- a/Essentials/src/com/earth2me/essentials/MobData.java +++ b/Essentials/src/com/earth2me/essentials/MobData.java @@ -114,12 +114,12 @@ public enum MobData { TAMED, COLORABLE, EXP, - SIZE; + SIZE } public static final Logger logger = Logger.getLogger("Essentials"); - private MobData(String n, Object type, Object value, boolean isPublic) { + MobData(String n, Object type, Object value, boolean isPublic) { this.nickname = n; this.matched = n; this.helpMessage = n; @@ -128,7 +128,7 @@ public enum MobData { this.isPublic = isPublic; } - private MobData(String n, String h, Object type, Object value, boolean isPublic) { + MobData(String n, String h, Object type, Object value, boolean isPublic) { this.nickname = n; this.matched = n; this.helpMessage = h; diff --git a/Essentials/src/com/earth2me/essentials/UUIDMap.java b/Essentials/src/com/earth2me/essentials/UUIDMap.java index 188f0ab7c..e0c645777 100644 --- a/Essentials/src/com/earth2me/essentials/UUIDMap.java +++ b/Essentials/src/com/earth2me/essentials/UUIDMap.java @@ -84,7 +84,6 @@ public class UUIDMap { } try { Future future = _writeUUIDMap(); - ; if (future != null) { future.get(); } diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index a12cd2df4..4f36cd2dc 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -119,7 +119,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es @Override public void giveMoney(final BigDecimal value) throws MaxMoneyException { - giveMoney(value, (CommandSource) null); + giveMoney(value, null); } @Override @@ -151,7 +151,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es @Override public void takeMoney(final BigDecimal value) { - takeMoney(value, (CommandSource) null); + takeMoney(value, null); } @Override diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index 45de8d113..4fb81914f 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -200,10 +200,7 @@ public abstract class UserData extends PlayerExtension implements IConf { } public boolean hasHome() { - if (config.hasProperty("home")) { - return true; - } - return false; + return config.hasProperty("home"); } private String nickname; diff --git a/Essentials/src/com/earth2me/essentials/api/IItemDb.java b/Essentials/src/com/earth2me/essentials/api/IItemDb.java index b5755bcd3..dbddf0c07 100644 --- a/Essentials/src/com/earth2me/essentials/api/IItemDb.java +++ b/Essentials/src/com/earth2me/essentials/api/IItemDb.java @@ -11,11 +11,11 @@ public interface IItemDb { ItemStack get(final String name) throws Exception; - public String names(ItemStack item); + String names(ItemStack item); - public String name(ItemStack item); + String name(ItemStack item); List getMatching(User user, String[] args) throws Exception; - public String serialize(ItemStack is); + String serialize(ItemStack is); } diff --git a/Essentials/src/com/earth2me/essentials/api/ITeleport.java b/Essentials/src/com/earth2me/essentials/api/ITeleport.java index fe7d6d1d3..a67459333 100644 --- a/Essentials/src/com/earth2me/essentials/api/ITeleport.java +++ b/Essentials/src/com/earth2me/essentials/api/ITeleport.java @@ -87,7 +87,7 @@ public interface ITeleport { * * @throws Exception */ - public void respawn(final Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void respawn(final Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; /** * Teleport wrapper used to handle /warp teleports @@ -99,7 +99,7 @@ public interface ITeleport { * * @throws Exception */ - public void warp(IUser otherUser, String warp, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void warp(IUser otherUser, String warp, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; /** * Teleport wrapper used to handle /back teleports @@ -108,13 +108,13 @@ public interface ITeleport { * * @throws Exception */ - public void back(Trade chargeFor) throws Exception; + void back(Trade chargeFor) throws Exception; /** * Teleport wrapper used to handle throwing user home after a jail sentence * * @throws Exception */ - public void back() throws Exception; + void back() throws Exception; } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcondense.java b/Essentials/src/com/earth2me/essentials/commands/Commandcondense.java index b95c57a0d..418bf7785 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandcondense.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandcondense.java @@ -22,11 +22,11 @@ public class Commandcondense extends EssentialsCommand { super("condense"); } - private Map condenseList = new HashMap(); + private Map condenseList = new HashMap<>(); @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - List is = new ArrayList(); + List is = new ArrayList<>(); boolean validateReverse = false; if (args.length > 0) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java index c3416260f..d33cdd54b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java @@ -30,7 +30,7 @@ public class Commandenchant extends EssentialsCommand { throw new Exception(tl("nothingInHand")); } if (args.length == 0) { - final Set enchantmentslist = new TreeSet(); + final Set enchantmentslist = new TreeSet<>(); for (Map.Entry entry : Enchantments.entrySet()) { final String enchantmentName = entry.getValue().getName().toLowerCase(Locale.ENGLISH); if (enchantmentslist.contains(enchantmentName) || (user.isAuthorized("essentials.enchantments." + enchantmentName) && entry.getValue().canEnchantItem(stack))) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java index 56ae8f1d1..18914f8b6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java @@ -38,7 +38,7 @@ public class Commandlist extends EssentialsCommand { // Output the standard /list output, when no group is specified private void sendGroupedList(CommandSource sender, String commandLabel, Map> playerList) { final Set configGroups = ess.getSettings().getListGroupConfig().keySet(); - final List asterisk = new ArrayList(); + final List asterisk = new ArrayList<>(); // Loop through the custom defined groups and display them for (String oConfigGroup : configGroups) { @@ -57,7 +57,7 @@ public class Commandlist extends EssentialsCommand { continue; } - List outputUserList = new ArrayList(); + List outputUserList = new ArrayList<>(); final List matchedList = playerList.get(configGroup); // If the group value is an int, then we might need to truncate it @@ -85,19 +85,20 @@ public class Commandlist extends EssentialsCommand { sender.sendMessage(PlayerList.outputFormat(oConfigGroup, PlayerList.listUsers(ess, outputUserList, ", "))); } - String[] onlineGroups = playerList.keySet().toArray(new String[0]); + Set var = playerList.keySet(); + String[] onlineGroups = var.toArray(new String[var.size()]); Arrays.sort(onlineGroups, String.CASE_INSENSITIVE_ORDER); // If we have an asterisk group, then merge all remaining groups if (!asterisk.isEmpty()) { - List asteriskUsers = new ArrayList(); + List asteriskUsers = new ArrayList<>(); for (String onlineGroup : onlineGroups) { asteriskUsers.addAll(playerList.get(onlineGroup)); } for (String key : asterisk) { playerList.put(key, asteriskUsers); } - onlineGroups = asterisk.toArray(new String[0]); + onlineGroups = asterisk.toArray(new String[asterisk.size()]); } // If we have any groups remaining after the custom groups loop through and display them diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java index f8c6e5c5d..b2ab028d1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java @@ -93,10 +93,7 @@ public class Commandnick extends EssentialsLoopCommand { return true; } } - if (ess.getUser(lowerNick) != null && ess.getUser(lowerNick) != target) { - return true; - } - return false; + return ess.getUser(lowerNick) != null && ess.getUser(lowerNick) != target; } private void setNickname(final Server server, final CommandSource sender, final User target, final String nickname) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java b/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java index 83e464656..47f95b765 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java @@ -22,7 +22,7 @@ public class Commandnuke extends EssentialsCommand { protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws NoSuchFieldException, NotEnoughArgumentsException { Collection targets; if (args.length > 0) { - targets = new ArrayList(); + targets = new ArrayList<>(); int pos = 0; for (String arg : args) { targets.add(getPlayer(server, sender, args, pos).getBase()); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java b/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java index 5db524300..2c6a0a3bd 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java @@ -29,7 +29,7 @@ public class Commandpotion extends EssentialsCommand { final ItemStack stack = user.getBase().getItemInHand(); if (args.length == 0) { - final Set potionslist = new TreeSet(); + final Set potionslist = new TreeSet<>(); for (Map.Entry entry : Potions.entrySet()) { final String potionName = entry.getValue().getName().toLowerCase(Locale.ENGLISH); if (potionslist.contains(potionName) || (user.isAuthorized("essentials.potion." + potionName))) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java index acc5360c7..45f6303e6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java @@ -13,7 +13,7 @@ import static com.earth2me.essentials.I18n.tl; public class Commandptime extends EssentialsCommand { - private static final Set getAliases = new HashSet(); + private static final Set getAliases = new HashSet<>(); static { getAliases.add("get"); @@ -146,7 +146,7 @@ public class Commandptime extends EssentialsCommand { * Used to parse an argument of the type "users(s) selector" */ private Set getUsers(final Server server, final CommandSource sender, final String selector) throws Exception { - final Set users = new TreeSet(new UserNameComparator()); + final Set users = new TreeSet<>(new UserNameComparator()); // If there is no selector we want the sender itself. Or all users if sender isn't a user. if (selector == null) { if (sender.isPlayer()) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java b/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java index 6784011ea..ec0bfcfd3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java @@ -12,8 +12,8 @@ import static com.earth2me.essentials.I18n.tl; public class Commandpweather extends EssentialsCommand { - public static final Set getAliases = new HashSet(); - public static final Map weatherAliases = new HashMap(); + public static final Set getAliases = new HashSet<>(); + public static final Map weatherAliases = new HashMap<>(); static { getAliases.add("get"); @@ -113,7 +113,7 @@ public class Commandpweather extends EssentialsCommand { * Used to parse an argument of the type "users(s) selector" */ private Set getUsers(final Server server, final CommandSource sender, final String selector) throws Exception { - final Set users = new TreeSet(new UserNameComparator()); + final Set users = new TreeSet<>(new UserNameComparator()); // If there is no selector we want the sender itself. Or all users if sender isn't a user. if (selector == null) { if (sender.isPlayer()) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java b/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java index 5df59efc9..3355e986b 100755 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java @@ -95,7 +95,7 @@ public class Commandrecipe extends EssentialsCommand { } } } else { - final HashMap colorMap = new HashMap(); + final HashMap colorMap = new HashMap<>(); int i = 1; for (Character c : "abcdefghi".toCharArray()) { ItemStack item = recipeMap.get(c); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java index 617d53087..f6ddbf947 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java @@ -54,8 +54,8 @@ public class Commandremove extends EssentialsCommand { } private void parseCommand(Server server, CommandSource sender, String[] args, World world, int radius) throws Exception { - List types = new ArrayList(); - List customTypes = new ArrayList(); + List types = new ArrayList<>(); + List customTypes = new ArrayList<>(); if (world == null) { throw new Exception(tl("invalidWorld")); @@ -88,8 +88,8 @@ public class Commandremove extends EssentialsCommand { radius *= radius; } - ArrayList removeTypes = new ArrayList(); - ArrayList customRemoveTypes = new ArrayList(); + ArrayList removeTypes = new ArrayList<>(); + ArrayList customRemoveTypes = new ArrayList<>(); for (String s : types) { removeTypes.add(ToRemove.valueOf(s)); @@ -129,7 +129,7 @@ public class Commandremove extends EssentialsCommand { } // We should skip any NAMED animals unless we are specifially targetting them. - if (e instanceof LivingEntity && ((LivingEntity) e).getCustomName() != null && !removeTypes.contains(ToRemove.NAMED)) { + if (e instanceof LivingEntity && e.getCustomName() != null && !removeTypes.contains(ToRemove.NAMED)) { continue; } @@ -141,7 +141,7 @@ public class Commandremove extends EssentialsCommand { } break; case NAMED: - if (e instanceof LivingEntity && ((LivingEntity) e).getCustomName() != null) { + if (e instanceof LivingEntity && e.getCustomName() != null) { e.remove(); removed++; } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java index 601f7e983..897094da7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java @@ -58,7 +58,7 @@ public class Commandrepair extends EssentialsCommand { } public void repairAll(User user) throws Exception { - final List repaired = new ArrayList(); + final List repaired = new ArrayList<>(); repairItems(user.getBase().getInventory().getContents(), user, repaired); if (user.isAuthorized("essentials.repair.armor")) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java index dadd71e86..cbd690a24 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java @@ -156,7 +156,7 @@ public class Commandseen extends EssentialsCommand { ess.runTaskAsynchronously(new Runnable() { @Override public void run() { - final List matches = new ArrayList(); + final List matches = new ArrayList<>(); for (final UUID u : userMap.getAllUniqueUsers()) { final User user = ess.getUserMap().getUser(u); if (user == null) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java index d3dc74f97..796fa1fb4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java @@ -32,8 +32,7 @@ public class Commandsetwarp extends EssentialsCommand { try { warpLoc = warps.getWarp(args[0]); - } catch (WarpNotFoundException ex) { - } catch (InvalidWorldException ex) { + } catch (WarpNotFoundException | InvalidWorldException ex) { } if (warpLoc == null || user.isAuthorized("essentials.warp.overwrite." + StringUtil.safeString(args[0]))) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java b/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java index 7f8197599..522150230 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java @@ -22,12 +22,12 @@ public class Commandthunder extends EssentialsCommand { final boolean setThunder = args[0].equalsIgnoreCase("true"); if (args.length > 1) { - world.setThundering(setThunder ? true : false); + world.setThundering(setThunder); world.setThunderDuration(Integer.parseInt(args[1]) * 20); user.sendMessage(tl("thunderDuration", (setThunder ? tl("enabled") : tl("disabled")), Integer.parseInt(args[1]))); } else { - world.setThundering(setThunder ? true : false); + world.setThundering(setThunder); user.sendMessage(tl("thunder", setThunder ? tl("enabled") : tl("disabled"))); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java index 1fb94d763..3f2755677 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java @@ -20,7 +20,7 @@ public class Commandtime extends EssentialsCommand { @Override public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { boolean add = false; - final List argList = new ArrayList(Arrays.asList(args)); + final List argList = new ArrayList<>(Arrays.asList(args)); if (argList.remove("set") && !argList.isEmpty() && NumberUtil.isInt(argList.get(0))) { argList.set(0, argList.get(0) + "t"); } @@ -28,7 +28,7 @@ public class Commandtime extends EssentialsCommand { add = true; argList.set(0, argList.get(0) + "t"); } - final String[] validArgs = argList.toArray(new String[0]); + final String[] validArgs = argList.toArray(new String[argList.size()]); // Which World(s) are we interested in? String worldSelector = null; @@ -112,7 +112,7 @@ public class Commandtime extends EssentialsCommand { * Used to parse an argument of the type "world(s) selector" */ private Set getWorlds(final Server server, final CommandSource sender, final String selector) throws Exception { - final Set worlds = new TreeSet(new WorldNameComparator()); + final Set worlds = new TreeSet<>(new WorldNameComparator()); // If there is no selector we want the world the user is currently in. Or all worlds if it isn't a user. if (selector == null) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java b/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java index e3d54145d..839023e00 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java @@ -42,7 +42,7 @@ public class Commandvanish extends EssentialsToggleCommand { user.setVanished(enabled); user.sendMessage(tl("vanish", user.getDisplayName(), enabled ? tl("enabled") : tl("disabled"))); - if (enabled == true) { + if (enabled) { user.sendMessage(tl("vanished")); } if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java index 06d016973..922edd16e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java @@ -63,7 +63,7 @@ public class Commandwarp extends EssentialsCommand { //TODO: Use one of the new text classes, like /help ? private void warpList(final CommandSource sender, final String[] args, final IUser user) throws Exception { final IWarps warps = ess.getWarps(); - final List warpNameList = new ArrayList(warps.getList()); + final List warpNameList = new ArrayList<>(warps.getList()); if (user != null) { final Iterator iterator = warpNameList.iterator(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index a7d87d948..c3b00ed77 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -37,7 +37,7 @@ public class Commandwhois extends EssentialsCommand { } sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); final String location = user.getGeoLocation(); - if (location != null && (sender.isPlayer() ? ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show") : true)) { + if (location != null && (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) { sender.sendMessage(tl("whoisGeoLocation", location)); } sender.sendMessage(tl("whoisGamemode", tl(user.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)))); diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java b/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java index ad398f796..9e07cc404 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java +++ b/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java @@ -63,7 +63,7 @@ public class SetExpFix { //This method is required because the bukkit player.getTotalExperience() method, shows exp that has been 'spent'. //Without this people would be able to use exp and then still sell it. public static int getTotalExperience(final Player player) { - int exp = (int) Math.round(getExpAtLevel(player) * player.getExp()); + int exp = Math.round(getExpAtLevel(player) * player.getExp()); int currentLevel = player.getLevel(); while (currentLevel > 0) { @@ -77,7 +77,7 @@ public class SetExpFix { } public static int getExpUntilNextLevel(final Player player) { - int exp = (int) Math.round(getExpAtLevel(player) * player.getExp()); + int exp = Math.round(getExpAtLevel(player) * player.getExp()); int nextLevel = player.getLevel(); return getExpAtLevel(nextLevel) - exp; } diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java index fcd6ad00e..cb2ab41fd 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java +++ b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java @@ -28,8 +28,6 @@ public class MetricsStarter implements Runnable { EssentialsXMPP } - ; - public MetricsStarter(final IEssentials plugin) { ess = plugin; try { diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java index c26250ad7..f2e13d0cd 100644 --- a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java @@ -109,7 +109,6 @@ public class PermissionsHandler implements IPermissionsHandler { if (vaultAPI != null && vaultAPI.isEnabled()) { if (!(handler instanceof AbstractVaultHandler)) { AbstractVaultHandler vaultHandler; - // No switch statements for Strings, this is Java 6 switch (enabledPermsPlugin) { case "PermissionsEx": vaultHandler = new PermissionsExHandler(); diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Method.java b/Essentials/src/com/earth2me/essentials/register/payment/Method.java index 41ad59070..3d2f62bdb 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/Method.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/Method.java @@ -24,35 +24,35 @@ public interface Method { * @see #getName() * @see #getVersion() */ - public Object getPlugin(); + Object getPlugin(); /** * Returns the actual name of this method. * * @return String Plugin name. */ - public String getName(); + String getName(); /** * Returns the reported name of this method. * * @return String Plugin name. */ - public String getLongName(); + String getLongName(); /** * Returns the actual version of this method. * * @return String Plugin version. */ - public String getVersion(); + String getVersion(); /** * Returns the amount of decimal places that get stored NOTE: it will return -1 if there is no rounding * * @return int for each decimal place */ - public int fractionalDigits(); + int fractionalDigits(); /** * Formats amounts into this payment methods style of currency display. @@ -61,14 +61,14 @@ public interface Method { * * @return String - Formatted Currency Display. */ - public String format(double amount); + String format(double amount); /** * Allows the verification of bank API existence in this payment method. * * @return boolean */ - public boolean hasBanks(); + boolean hasBanks(); /** * Determines the existence of a bank via name. @@ -79,7 +79,7 @@ public interface Method { * * @see #hasBanks */ - public boolean hasBank(String bank); + boolean hasBank(String bank); /** * Determines the existence of an account via name. @@ -88,7 +88,7 @@ public interface Method { * * @return boolean */ - public boolean hasAccount(String name); + boolean hasAccount(String name); /** * Check to see if an account name is tied to a bank. @@ -98,7 +98,7 @@ public interface Method { * * @return boolean */ - public boolean hasBankAccount(String bank, String name); + boolean hasBankAccount(String bank, String name); /** * Forces an account creation @@ -107,7 +107,7 @@ public interface Method { * * @return boolean */ - public boolean createAccount(String name); + boolean createAccount(String name); /** * Forces an account creation @@ -117,7 +117,7 @@ public interface Method { * * @return boolean */ - public boolean createAccount(String name, Double balance); + boolean createAccount(String name, Double balance); /** * Returns a MethodAccount class for an account name. @@ -126,7 +126,7 @@ public interface Method { * * @return MethodAccount or Null */ - public MethodAccount getAccount(String name); + MethodAccount getAccount(String name); /** * Returns a MethodBankAccount class for an account name. @@ -136,7 +136,7 @@ public interface Method { * * @return MethodBankAccount or Null */ - public MethodBankAccount getBankAccount(String bank, String name); + MethodBankAccount getBankAccount(String bank, String name); /** * Checks to verify the compatibility between this Method and a plugin. Internal usage only, for the most part. @@ -145,78 +145,78 @@ public interface Method { * * @return boolean */ - public boolean isCompatible(Plugin plugin); + boolean isCompatible(Plugin plugin); /** * Set Plugin data. * * @param plugin Plugin */ - public void setPlugin(Plugin plugin); + void setPlugin(Plugin plugin); /** * Contains Calculator and Balance functions for Accounts. */ - public interface MethodAccount { - public double balance(); + interface MethodAccount { + double balance(); - public boolean set(double amount); + boolean set(double amount); - public boolean add(double amount); + boolean add(double amount); - public boolean subtract(double amount); + boolean subtract(double amount); - public boolean multiply(double amount); + boolean multiply(double amount); - public boolean divide(double amount); + boolean divide(double amount); - public boolean hasEnough(double amount); + boolean hasEnough(double amount); - public boolean hasOver(double amount); + boolean hasOver(double amount); - public boolean hasUnder(double amount); + boolean hasUnder(double amount); - public boolean isNegative(); + boolean isNegative(); - public boolean remove(); + boolean remove(); @Override - public String toString(); + String toString(); } /** * Contains Calculator and Balance functions for Bank Accounts. */ - public interface MethodBankAccount { - public double balance(); + interface MethodBankAccount { + double balance(); - public String getBankName(); + String getBankName(); - public int getBankId(); + int getBankId(); - public boolean set(double amount); + boolean set(double amount); - public boolean add(double amount); + boolean add(double amount); - public boolean subtract(double amount); + boolean subtract(double amount); - public boolean multiply(double amount); + boolean multiply(double amount); - public boolean divide(double amount); + boolean divide(double amount); - public boolean hasEnough(double amount); + boolean hasEnough(double amount); - public boolean hasOver(double amount); + boolean hasOver(double amount); - public boolean hasUnder(double amount); + boolean hasUnder(double amount); - public boolean isNegative(); + boolean isNegative(); - public boolean remove(); + boolean remove(); @Override - public String toString(); + String toString(); } } diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java index c19b5ad1a..d9dce27b8 100644 --- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java @@ -481,12 +481,12 @@ public class EssentialsSign { public interface ISign { - public String getLine(final int index); + String getLine(final int index); - public void setLine(final int index, final String text); + void setLine(final int index, final String text); - public Block getBlock(); + Block getBlock(); - public void updateSign(); + void updateSign(); } } diff --git a/Essentials/src/com/earth2me/essentials/signs/Signs.java b/Essentials/src/com/earth2me/essentials/signs/Signs.java index 7113378be..138fb4ede 100644 --- a/Essentials/src/com/earth2me/essentials/signs/Signs.java +++ b/Essentials/src/com/earth2me/essentials/signs/Signs.java @@ -22,7 +22,7 @@ public enum Signs { WEATHER(new SignWeather()); private final EssentialsSign sign; - private Signs(final EssentialsSign sign) { + Signs(final EssentialsSign sign) { this.sign = sign; } diff --git a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java b/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java index a235ebf85..38cd0281b 100644 --- a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java +++ b/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java @@ -223,7 +223,7 @@ public class BukkitConstructor extends CustomClassLoaderConstructor { try { final Field typeDefField = Constructor.class.getDeclaredField("typeDefinitions"); typeDefField.setAccessible(true); - typeDefinitions = (Map, TypeDescription>) typeDefField.get((Constructor) BukkitConstructor.this); + typeDefinitions = (Map, TypeDescription>) typeDefField.get(BukkitConstructor.this); if (typeDefinitions == null) { throw new NullPointerException(); } diff --git a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java index 3b96acbb8..77982d7e4 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java +++ b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java @@ -345,5 +345,5 @@ enum KeywordType { enum KeywordCachable { CACHEABLE, // This keyword can be cached as a string SUBVALUE, // This keyword can be cached as a map - NOTCACHEABLE; // This keyword should never be cached + NOTCACHEABLE // This keyword should never be cached } \ No newline at end of file diff --git a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java b/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java index 889fbd36f..ed7555120 100644 --- a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java +++ b/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java @@ -222,10 +222,7 @@ public class LocationUtil { if (below.getType() == Material.BED_BLOCK) { return true; } - if ((!HOLLOW_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId())) || (!HOLLOW_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId()))) { - return true; - } - return false; + return (!HOLLOW_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId())) || (!HOLLOW_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())); } // Not needed if using getSafeDestination(loc) diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java index 9567d21f3..0bd356a00 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -890,12 +890,12 @@ public class FakeServer implements Server { } @Override - public CachedServerIcon loadServerIcon(File file) throws IllegalArgumentException, Exception { + public CachedServerIcon loadServerIcon(File file) throws Exception { throw new UnsupportedOperationException("Not supported yet."); } @Override - public CachedServerIcon loadServerIcon(BufferedImage bufferedImage) throws IllegalArgumentException, Exception { + public CachedServerIcon loadServerIcon(BufferedImage bufferedImage) throws Exception { throw new UnsupportedOperationException("Not supported yet."); } @@ -1112,5 +1112,4 @@ public class FakeServer implements Server { } } - ; } diff --git a/Essentials/test/com/earth2me/essentials/StorageTest.java b/Essentials/test/com/earth2me/essentials/StorageTest.java index 7982e8397..8dd82ce50 100644 --- a/Essentials/test/com/earth2me/essentials/StorageTest.java +++ b/Essentials/test/com/earth2me/essentials/StorageTest.java @@ -35,7 +35,7 @@ public class StorageTest extends TestCase { OfflinePlayer base1 = server.createPlayer("testPlayer1"); server.addPlayer(base1); ext.mark("fake user created"); - UserData user = (UserData) ess.getUser(base1); + UserData user = ess.getUser(base1); ext.mark("load empty user"); for (int j = 0; j < 1; j++) { user.setHome("home", new Location(world, j, j, j)); diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/AntiBuildConfig.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/AntiBuildConfig.java index 7b7efc172..3cdd68855 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/AntiBuildConfig.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/AntiBuildConfig.java @@ -18,15 +18,15 @@ public enum AntiBuildConfig { private final boolean isList; private final boolean isString; - private AntiBuildConfig(final String configName) { + AntiBuildConfig(final String configName) { this(configName, null, false, true, false); } - private AntiBuildConfig(final String configName, final boolean defValueBoolean) { + AntiBuildConfig(final String configName, final boolean defValueBoolean) { this(configName, null, defValueBoolean, false, false); } - private AntiBuildConfig(final String configName, final String defValueString, final boolean defValueBoolean, final boolean isList, final boolean isString) { + AntiBuildConfig(final String configName, final String defValueString, final boolean defValueBoolean, final boolean isList, final boolean isString) { this.configName = configName; this.defValueString = defValueString; this.defValueBoolean = defValueBoolean;