diff options
Diffstat (limited to 'Essentials/src')
123 files changed, 591 insertions, 667 deletions
diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java index 3bbe79411..c1c506a9b 100644 --- a/Essentials/src/net/ess3/Essentials.java +++ b/Essentials/src/net/ess3/Essentials.java @@ -49,34 +49,34 @@ import org.bukkit.plugin.InvalidDescriptionException; public class Essentials implements IEssentials { @Getter - private transient ISettings settings; + private ISettings settings; @Getter - private transient IJails jails; + private IJails jails; @Getter - private transient IKits kits; + private IKits kits; @Getter - private transient IWarps warps; + private IWarps warps; @Getter - private transient IWorth worth; + private IWorth worth; @Getter - private transient IBackup backup; + private IBackup backup; @Getter - private transient IItemDb itemDb; + private IItemDb itemDb; @Getter @Setter - private transient IRanks ranks; + private IRanks ranks; @Getter - private transient SpawnsHolder spawns; + private SpawnsHolder spawns; @Getter - private transient final Methods paymentMethod = new Methods(); + private final Methods paymentMethod = new Methods(); @Getter - private transient IUserMap userMap; + private IUserMap userMap; @Getter private final I18n i18n; @Getter - private transient ICommandHandler commandHandler; + private ICommandHandler commandHandler; @Getter - private transient Economy economy; + private Economy economy; @Getter private final Server server; @Getter @@ -85,16 +85,16 @@ public class Essentials implements IEssentials private final IPlugin plugin; @Getter @Setter - private transient Metrics metrics; + private Metrics metrics; @Getter - private transient EssentialsTimer timer; + private EssentialsTimer timer; @Getter - private transient List<String> vanishedPlayers = new ArrayList<String>(); + private List<String> vanishedPlayers = new ArrayList<String>(); @Getter - private final transient StorageQueue storageQueue; - private transient ExecuteTimer execTimer; + private final StorageQueue storageQueue; + private ExecuteTimer execTimer; public static boolean testing; - private transient List<IReload> reloadList; + private List<IReload> reloadList; public Essentials(final Server server, final Logger logger, final IPlugin plugin) { diff --git a/Essentials/src/net/ess3/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java index 0bd902b17..58599f840 100644 --- a/Essentials/src/net/ess3/EssentialsTimer.java +++ b/Essentials/src/net/ess3/EssentialsTimer.java @@ -12,10 +12,10 @@ import org.bukkit.entity.Player; public class EssentialsTimer implements Runnable { - private final transient IEssentials ess; - private final transient Set<IUser> onlineUsers = new HashSet<IUser>(); - private transient long lastPoll = System.currentTimeMillis(); - private final transient LinkedList<Float> history = new LinkedList<Float>(); + private final IEssentials ess; + private final Set<IUser> onlineUsers = new HashSet<IUser>(); + private long lastPoll = System.currentTimeMillis(); + private final LinkedList<Float> history = new LinkedList<Float>(); EssentialsTimer(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/I18n.java b/Essentials/src/net/ess3/I18n.java index 8f31963eb..5f1c522cd 100644 --- a/Essentials/src/net/ess3/I18n.java +++ b/Essentials/src/net/ess3/I18n.java @@ -19,13 +19,13 @@ public class I18n implements II18n { private static I18n instance; private static final String MESSAGES = "messages"; - private final transient Locale defaultLocale = Locale.getDefault(); - private transient Locale currentLocale = defaultLocale; - private transient ResourceBundle customBundle; - private transient ResourceBundle localeBundle; - private final transient ResourceBundle defaultBundle; - private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>(); - private final transient IEssentials ess; + private final Locale defaultLocale = Locale.getDefault(); + private Locale currentLocale = defaultLocale; + private ResourceBundle customBundle; + private ResourceBundle localeBundle; + private final ResourceBundle defaultBundle; + private final Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>(); + private final IEssentials ess; public I18n(final IEssentials ess) { @@ -100,7 +100,6 @@ public class I18n implements II18n } return messageFormat.format(objects); } - private final Pattern partSplit = Pattern.compile("[_\\.]"); public void updateLocale(final String loc) @@ -136,7 +135,7 @@ public class I18n implements II18n private static class FileResClassLoader extends ClassLoader { - private final transient File dataFolder; + private final File dataFolder; public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess) { diff --git a/Essentials/src/net/ess3/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java index 7e7ca0ede..15d32a6e6 100644 --- a/Essentials/src/net/ess3/ItemDb.java +++ b/Essentials/src/net/ess3/ItemDb.java @@ -19,16 +19,15 @@ import org.bukkit.inventory.ItemStack; public class ItemDb implements IItemDb { - private final transient IEssentials ess; + private final IEssentials ess; public ItemDb(final IEssentials ess) { this.ess = ess; file = new ManagedFile("items.csv", ess); } - - private final transient Map<String, Long> items = new HashMap<String, Long>(); - private final transient ManagedFile file; + private final Map<String, Long> items = new HashMap<String, Long>(); + private final ManagedFile file; private static final Pattern SPLIT = Pattern.compile("[^a-zA-Z0-9]"); @Override @@ -95,7 +94,6 @@ public class ItemDb implements IItemDb retval.setAmount(quantity); return retval; } - private final Pattern idMatch = Pattern.compile("^\\d+[:+',;.]\\d+$"); private final Pattern metaSplit = Pattern.compile("[:+',;.]"); private final Pattern conjoined = Pattern.compile("^[^:+',;.]+[:+',;.]\\d+$"); diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java index 0affe3fca..f191edd81 100644 --- a/Essentials/src/net/ess3/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -30,7 +30,7 @@ import org.bukkit.plugin.PluginManager; public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails { - private static final transient Logger LOGGER = Bukkit.getLogger(); + private static final Logger LOGGER = Bukkit.getLogger(); public Jails(final IEssentials ess) { @@ -110,9 +110,9 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp throw new UnsupportedOperationException("Not supported yet."); } + private class JailBlockListener implements Listener { - @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onBlockBreak(final BlockBreakEvent event) { diff --git a/Essentials/src/net/ess3/SpawnMob.java b/Essentials/src/net/ess3/SpawnMob.java index 47cd07049..0b22569ca 100644 --- a/Essentials/src/net/ess3/SpawnMob.java +++ b/Essentials/src/net/ess3/SpawnMob.java @@ -25,8 +25,8 @@ import org.bukkit.material.Colorable; public class SpawnMob { - private static transient Pattern colon = Pattern.compile(":"); - private static transient Pattern comma = Pattern.compile(","); + private static Pattern colon = Pattern.compile(":"); + private static Pattern comma = Pattern.compile(","); public static String mobList(final IUser user) throws NotEnoughArgumentsException { diff --git a/Essentials/src/net/ess3/Teleport.java b/Essentials/src/net/ess3/Teleport.java index b97b1f58d..81afaf97f 100644 --- a/Essentials/src/net/ess3/Teleport.java +++ b/Essentials/src/net/ess3/Teleport.java @@ -21,7 +21,6 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Teleport implements Runnable, ITeleport { private static final double MOVE_CONSTANT = 0.3; - private IUser user; private IUser teleportUser; private int teleTimer = -1; @@ -75,9 +74,9 @@ public class Teleport implements Runnable, ITeleport } if (!Permissions.TELEPORT_TIMER_MOVE.isAuthorized(user) && (Math.round( - teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX || Math.round( - teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY || Math.round( - teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ || teleportUser.getPlayer().getHealth() < health)) + teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX || Math.round( + teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY || Math.round( + teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ || teleportUser.getPlayer().getHealth() < health)) { // user moved, cancel teleport cancel(true); return; @@ -123,7 +122,6 @@ public class Teleport implements Runnable, ITeleport this.ess = ess; } - public void cooldown(boolean check) throws Exception { try @@ -233,7 +231,6 @@ public class Teleport implements Runnable, ITeleport now(new Target(loc), cause); } - @Override //The now function is used when you want to skip tp delay when teleporting someone to a location or player. public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception diff --git a/Essentials/src/net/ess3/api/Economy.java b/Essentials/src/net/ess3/api/Economy.java index 046c6e1f6..19c2d8451 100644 --- a/Essentials/src/net/ess3/api/Economy.java +++ b/Essentials/src/net/ess3/api/Economy.java @@ -4,15 +4,13 @@ import net.ess3.utils.FormatUtil; /** - * Instead of using this api directly, we recommend to use the register plugin: - * http://bit.ly/RegisterMethod + * Instead of using this api directly, we recommend to use the register plugin: http://bit.ly/RegisterMethod */ public final class Economy { private Economy() { } - private static IEssentials ess; private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded."; @@ -35,10 +33,10 @@ public final class Economy /** * Sets the balance of a user * - * @param name Name of the user + * @param name Name of the user * @param balance The balance you want to set * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance + * @throws NoLoanPermittedException If the user is not allowed to have a negative balance */ public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException { @@ -52,10 +50,10 @@ public final class Economy /** * Adds money to the balance of a user * - * @param name Name of the user + * @param name Name of the user * @param amount The money you want to add * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance + * @throws NoLoanPermittedException If the user is not allowed to have a negative balance */ public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException { @@ -66,10 +64,10 @@ public final class Economy /** * Substracts money from the balance of a user * - * @param name Name of the user + * @param name Name of the user * @param amount The money you want to substract * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance + * @throws NoLoanPermittedException If the user is not allowed to have a negative balance */ public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException { @@ -80,10 +78,10 @@ public final class Economy /** * Divides the balance of a user by a value * - * @param name Name of the user + * @param name Name of the user * @param value The balance is divided by this value * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance + * @throws NoLoanPermittedException If the user is not allowed to have a negative balance */ public static void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException { @@ -94,10 +92,10 @@ public final class Economy /** * Multiplies the balance of a user by a value * - * @param name Name of the user + * @param name Name of the user * @param value The balance is multiplied by this value * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance + * @throws NoLoanPermittedException If the user is not allowed to have a negative balance */ public static void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException { @@ -110,7 +108,7 @@ public final class Economy * * @param name Name of the user * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance + * @throws NoLoanPermittedException If the user is not allowed to have a negative balance */ public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException { @@ -122,7 +120,7 @@ public final class Economy } /** - * @param name Name of the user + * @param name Name of the user * @param amount The amount of money the user should have * @return true, if the user has more or an equal amount of money * @throws UserDoesNotExistException If a user by that name does not exists @@ -133,7 +131,7 @@ public final class Economy } /** - * @param name Name of the user + * @param name Name of the user * @param amount The amount of money the user should have * @return true, if the user has more money * @throws UserDoesNotExistException If a user by that name does not exists @@ -144,7 +142,7 @@ public final class Economy } /** - * @param name Name of the user + * @param name Name of the user * @param amount The amount of money the user should not have * @return true, if the user has less money * @throws UserDoesNotExistException If a user by that name does not exists @@ -167,8 +165,7 @@ public final class Economy } /** - * Formats the amount of money like all other Essentials functions. - * Example: $100000 or $12345.67 + * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67 * * @param amount The amount of money * @return Formatted money diff --git a/Essentials/src/net/ess3/api/IComponent.java b/Essentials/src/net/ess3/api/IComponent.java index 5cdee2b16..bc30f8c37 100644 --- a/Essentials/src/net/ess3/api/IComponent.java +++ b/Essentials/src/net/ess3/api/IComponent.java @@ -1,5 +1,6 @@ package net.ess3.api; + public interface IComponent extends IReload { /** diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index 68d975b57..226448f24 100644 --- a/Essentials/src/net/ess3/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -66,5 +66,4 @@ public interface IEssentials extends IComponent SpawnsHolder getSpawns(); StorageQueue getStorageQueue(); - } diff --git a/Essentials/src/net/ess3/api/IPlugin.java b/Essentials/src/net/ess3/api/IPlugin.java index 8348c9490..18da574b4 100644 --- a/Essentials/src/net/ess3/api/IPlugin.java +++ b/Essentials/src/net/ess3/api/IPlugin.java @@ -9,7 +9,6 @@ import org.bukkit.scheduler.BukkitTask; public interface IPlugin extends Plugin { - /** * Get an instance of essentials * @@ -36,7 +35,7 @@ public interface IPlugin extends Plugin /** * Call an a-sync task to be run with a given delay * - * @param run - Code to be run + * @param run - Code to be run * @param delay - Long that represents how long to wait * @return - BukkitTask for the task created */ @@ -45,7 +44,7 @@ public interface IPlugin extends Plugin /** * Schedule a sync (ran in main thread) delayed task * - * @param run - Code to run + * @param run - Code to run * @param delay - Long that represents how long to wait * @return - Integer of the task ID */ @@ -54,8 +53,8 @@ public interface IPlugin extends Plugin /** * Schedule a sync (in the main thread) repeating task * - * @param run - Code to run - * @param delay - Delay for the first run + * @param run - Code to run + * @param delay - Delay for the first run * @param period - Time to wait between every run after the first * @return - int of the task ID */ @@ -64,8 +63,8 @@ public interface IPlugin extends Plugin /** * Schedule an a-sync repeating task * - * @param run - Code to run - * @param delay - Delay for the first run + * @param run - Code to run + * @param delay - Delay for the first run * @param period - Time to wait between every run after the first * @return - int of the task ID */ @@ -105,8 +104,8 @@ public interface IPlugin extends Plugin /** * Call a re-spawn event on a player * - * @param player - Player to re-spawn - * @param loc - Location to send + * @param player - Player to re-spawn + * @param loc - Location to send * @param bedSpawn - do you use bed? * @return - Location after event called */ @@ -137,5 +136,4 @@ public interface IPlugin extends Plugin * @param module - Your plugin instance */ void registerModule(Plugin module); - } diff --git a/Essentials/src/net/ess3/api/ITeleport.java b/Essentials/src/net/ess3/api/ITeleport.java index a88b72071..3971cb1d7 100644 --- a/Essentials/src/net/ess3/api/ITeleport.java +++ b/Essentials/src/net/ess3/api/ITeleport.java @@ -12,9 +12,9 @@ public interface ITeleport /** * Teleport to a location now * - * @param loc - location to send to + * @param loc - location to send to * @param cooldown - To check cooldown - * @param cause - Why was the send caused? Use a {@link TeleportCause} + * @param cause - Why was the send caused? Use a {@link TeleportCause} * @throws Exception */ void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception; diff --git a/Essentials/src/net/ess3/api/IWarps.java b/Essentials/src/net/ess3/api/IWarps.java index 48bc6cd61..fa5d64ece 100644 --- a/Essentials/src/net/ess3/api/IWarps.java +++ b/Essentials/src/net/ess3/api/IWarps.java @@ -35,7 +35,7 @@ public interface IWarps extends IReload * Set a warp * * @param name - Name of warp - * @param loc - Location of warp + * @param loc - Location of warp * @throws Exception */ void setWarp(String name, Location loc) throws Exception; diff --git a/Essentials/src/net/ess3/api/IWorth.java b/Essentials/src/net/ess3/api/IWorth.java index 1cec6b6f1..23065ab60 100644 --- a/Essentials/src/net/ess3/api/IWorth.java +++ b/Essentials/src/net/ess3/api/IWorth.java @@ -17,7 +17,7 @@ public interface IWorth extends IReload * Set the price of an ItemStack * * @param itemStack - ItemStack to set price for - * @param price - Price to set on item + * @param price - Price to set on item */ void setPrice(ItemStack itemStack, double price); } diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index bbff922cc..8575525f4 100644 --- a/Essentials/src/net/ess3/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -15,11 +15,11 @@ import org.bukkit.command.CommandSender; public class Backup implements Runnable, IBackup { - private transient final Server server; - private transient final IEssentials ess; - private transient final AtomicBoolean running = new AtomicBoolean(false); - private transient int taskId = -1; - private transient final AtomicBoolean active = new AtomicBoolean(false); + private final Server server; + private final IEssentials ess; + private final AtomicBoolean running = new AtomicBoolean(false); + private int taskId = -1; + private final AtomicBoolean active = new AtomicBoolean(false); public Backup(final IEssentials ess) { @@ -60,10 +60,10 @@ public class Backup implements Runnable, IBackup final net.ess3.settings.Backup backupSettings = settings.getData().getGeneral().getBackup(); String backupCommand = backupSettings.getCommand() == null || backupSettings.getCommand().isEmpty() ? ("NORUN") : backupSettings.getCommand(); - + /*if (backupCommand.equals("NORUN")) { TODO: Un-comment if you do not want commands to be run if there is no backup command - return; - }*/ + return; + }*/ ess.getLogger().log(Level.INFO, _("backupStarted")); @@ -82,7 +82,7 @@ public class Backup implements Runnable, IBackup private class BackupRunner implements Runnable { - private final transient String command; + private final String command; public BackupRunner(final String command) { diff --git a/Essentials/src/net/ess3/bukkit/Enchantments.java b/Essentials/src/net/ess3/bukkit/Enchantments.java index e76adc8b5..2e54e7caf 100644 --- a/Essentials/src/net/ess3/bukkit/Enchantments.java +++ b/Essentials/src/net/ess3/bukkit/Enchantments.java @@ -11,11 +11,9 @@ import org.bukkit.enchantments.Enchantment; public final class Enchantments { - private Enchantments() { } - private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>(); static diff --git a/Essentials/src/net/ess3/bukkit/LivingEntities.java b/Essentials/src/net/ess3/bukkit/LivingEntities.java index c51285973..7057eb399 100644 --- a/Essentials/src/net/ess3/bukkit/LivingEntities.java +++ b/Essentials/src/net/ess3/bukkit/LivingEntities.java @@ -8,7 +8,6 @@ import org.bukkit.entity.EntityType; public class LivingEntities { final private static Map<String, EntityType> entities = new HashMap<String, EntityType>(); - final private static EnumMap<EntityType, String> entityI18n = new EnumMap<EntityType, String>(EntityType.class); final private static EnumMap<EntityType, String> entityI18nPlural = new EnumMap<EntityType, String>(EntityType.class); @@ -41,9 +40,9 @@ public class LivingEntities return count == 1 ? _(entityI18n.get(type)) : _(entityI18nPlural.get(type)); } + public static class MobException extends Exception { private static final long serialVersionUID = 1L; } - } diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index 1d4201224..874945cfb 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -109,7 +109,7 @@ public class Commandbalancetop extends EssentialsCommand private class Calculator implements Runnable { - private final transient Viewer viewer; + private final Viewer viewer; private final boolean force; public Calculator(final Viewer viewer, final boolean force) @@ -176,9 +176,9 @@ public class Commandbalancetop extends EssentialsCommand private class Viewer implements Runnable { - private final transient CommandSender sender; - private final transient int page; - private final transient boolean force; + private final CommandSender sender; + private final int page; + private final boolean force; public Viewer(final CommandSender sender, final int page, final boolean force) { diff --git a/Essentials/src/net/ess3/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java index 7d2b4e069..edf6eebff 100644 --- a/Essentials/src/net/ess3/commands/Commandbigtree.java +++ b/Essentials/src/net/ess3/commands/Commandbigtree.java @@ -10,13 +10,13 @@ import org.bukkit.TreeType; public class Commandbigtree extends EssentialsCommand { - private static enum BigTree { + private static enum BigTree + { REDWOOD(TreeType.TALL_REDWOOD), TREE(TreeType.BIG_TREE), JUNGLE(TreeType.JUNGLE); - private final TreeType bukkitType; - + private BigTree(final TreeType bukkitType) { this.bukkitType = bukkitType; @@ -27,9 +27,8 @@ public class Commandbigtree extends EssentialsCommand return bukkitType; } } - private final static EnumConverter<BigTree> BIGTREE_PARSER = EnumConverter.getInstance(BigTree.class); - + @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception { diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java index 133db6769..c32c390d4 100644 --- a/Essentials/src/net/ess3/commands/Commanddelhome.java +++ b/Essentials/src/net/ess3/commands/Commanddelhome.java @@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender; public class Commanddelhome extends EssentialsCommand { - private final transient Pattern colon = Pattern.compile(":"); + private final Pattern colon = Pattern.compile(":"); @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandenderchest.java b/Essentials/src/net/ess3/commands/Commandenderchest.java index 31d011597..85efb75f2 100644 --- a/Essentials/src/net/ess3/commands/Commandenderchest.java +++ b/Essentials/src/net/ess3/commands/Commandenderchest.java @@ -7,7 +7,6 @@ import org.bukkit.entity.Player; public class Commandenderchest extends EssentialsCommand { - @Override protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception { diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java index 405a3c3d1..0ed491850 100644 --- a/Essentials/src/net/ess3/commands/Commandessentials.java +++ b/Essentials/src/net/ess3/commands/Commandessentials.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; public class Commandessentials extends EssentialsCommand { - private transient int taskid; // TODO: Needed? + private int taskid; // TODO: Needed? @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java index e82379086..2cc263c0f 100644 --- a/Essentials/src/net/ess3/commands/Commandfireball.java +++ b/Essentials/src/net/ess3/commands/Commandfireball.java @@ -13,31 +13,31 @@ public class Commandfireball extends EssentialsCommand Class<? extends Entity> clazz = Fireball.class; if (args.length > 0) { - if(args[0].equalsIgnoreCase("small")) + if (args[0].equalsIgnoreCase("small")) { clazz = SmallFireball.class; } - else if(args[0].equalsIgnoreCase("arrow")) + else if (args[0].equalsIgnoreCase("arrow")) { clazz = Arrow.class; } - else if(args[0].equalsIgnoreCase("skull")) + else if (args[0].equalsIgnoreCase("skull")) { clazz = WitherSkull.class; } - else if(args[0].equalsIgnoreCase("egg")) + else if (args[0].equalsIgnoreCase("egg")) { clazz = Egg.class; } - else if(args[0].equalsIgnoreCase("snowball")) + else if (args[0].equalsIgnoreCase("snowball")) { clazz = Snowball.class; } - else if(args[0].equalsIgnoreCase("expbottle")) + else if (args[0].equalsIgnoreCase("expbottle")) { clazz = ThrownExpBottle.class; } - else if(args[0].equalsIgnoreCase("large")) + else if (args[0].equalsIgnoreCase("large")) { clazz = LargeFireball.class; } diff --git a/Essentials/src/net/ess3/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java index 96eb7ae1f..e5fed21c0 100644 --- a/Essentials/src/net/ess3/commands/Commandgamemode.java +++ b/Essentials/src/net/ess3/commands/Commandgamemode.java @@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender; public class Commandgamemode extends EssentialsSettingsCommand { - protected void setValue(final IUser player, GameMode value) { if (value == null) @@ -124,5 +123,4 @@ public class Commandgamemode extends EssentialsSettingsCommand } return mode; } - } diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java index d102becfa..ce03e0930 100644 --- a/Essentials/src/net/ess3/commands/Commandgive.java +++ b/Essentials/src/net/ess3/commands/Commandgive.java @@ -13,7 +13,7 @@ import org.bukkit.inventory.ItemStack; public class Commandgive extends EssentialsCommand { - private final transient Pattern data = Pattern.compile("[:+',;.]"); + private final Pattern data = Pattern.compile("[:+',;.]"); @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java index 5781b5124..7f74e1287 100644 --- a/Essentials/src/net/ess3/commands/Commandhome.java +++ b/Essentials/src/net/ess3/commands/Commandhome.java @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandhome extends EssentialsCommand { - private final transient Pattern colon = Pattern.compile(":"); + private final Pattern colon = Pattern.compile(":"); @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java index 416bed766..df34d7eca 100644 --- a/Essentials/src/net/ess3/commands/Commanditem.java +++ b/Essentials/src/net/ess3/commands/Commanditem.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; public class Commanditem extends EssentialsCommand { - private final transient Pattern data = Pattern.compile("[:+',;.]"); + private final Pattern data = Pattern.compile("[:+',;.]"); @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java index 3c4edf7ea..971b48dc8 100644 --- a/Essentials/src/net/ess3/commands/Commandmore.java +++ b/Essentials/src/net/ess3/commands/Commandmore.java @@ -24,8 +24,9 @@ public class Commandmore extends EssentialsCommand } else { - stacks = new ItemStack[]{ - player.getItemInHand() + stacks = new ItemStack[] + { + player.getItemInHand() }; } for (ItemStack stack : stacks) diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index 7b7d232ed..6c46d98c7 100644 --- a/Essentials/src/net/ess3/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -39,8 +39,8 @@ public class Commandmute extends EssentialsCommand final boolean muted = player.getData().isMuted(); sender.sendMessage( muted ? (muteTimestamp > 0 ? _("mutedPlayerFor", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)) : _( - "mutedPlayer", player.getPlayer().getDisplayName())) : _( - "unmutedPlayer", player.getPlayer().getDisplayName())); + "mutedPlayer", player.getPlayer().getDisplayName())) : _( + "unmutedPlayer", player.getPlayer().getDisplayName())); player.sendMessage( muted ? (muteTimestamp > 0 ? _("playerMutedFor", DateUtil.formatDateDiff(muteTimestamp)) : _("playerMuted")) : _("playerUnmuted")); } diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java index 69f586114..836680707 100644 --- a/Essentials/src/net/ess3/commands/Commandrecipe.java +++ b/Essentials/src/net/ess3/commands/Commandrecipe.java @@ -14,7 +14,6 @@ import org.bukkit.inventory.*; public class Commandrecipe extends EssentialsCommand { - @Override public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { @@ -89,7 +88,7 @@ public class Commandrecipe extends EssentialsCommand for (int k = 0; k < recipe.getShape()[j].length(); k++) { final ItemStack item = recipe.getIngredientMap().get(recipe.getShape()[j].toCharArray()[k]); - if(item == null) + if (item == null) { continue; } diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index 2851b42be..464c323ec 100644 --- a/Essentials/src/net/ess3/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -34,21 +34,21 @@ public class Commandseen extends EssentialsCommand final IUser u = ess.getUserMap().matchUserExcludingHidden(args[0], getPlayerOrNull(sender)); u.setDisplayNick(); sender.sendMessage(_("seenOnline", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN)))); - if(u.getData().isAfk()) + if (u.getData().isAfk()) { sender.sendMessage(_("whoisAFK", _("true"))); } - if(u.getData().isJailed()) + if (u.getData().isJailed()) { sender.sendMessage(_("whoisJail", u.getTimestamp(TimestampType.JAIL) > 0 - ? DateUtil.formatDateDiff(u.getTimestamp(TimestampType.JAIL)) - : _("true"))); + ? DateUtil.formatDateDiff(u.getTimestamp(TimestampType.JAIL)) + : _("true"))); } - if(u.getData().isMuted()) + if (u.getData().isMuted()) { sender.sendMessage(_("whoisMuted", u.getTimestamp(TimestampType.MUTE) > 0 - ? DateUtil.formatDateDiff(u.getTimestamp(TimestampType.MUTE)) - : _("true"))); + ? DateUtil.formatDateDiff(u.getTimestamp(TimestampType.MUTE)) + : _("true"))); } } catch (PlayerNotFoundException e) diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java index dde03f8d7..1a239ed0c 100644 --- a/Essentials/src/net/ess3/commands/Commandsell.java +++ b/Essentials/src/net/ess3/commands/Commandsell.java @@ -148,8 +148,8 @@ public class Commandsell extends EssentialsCommand user.giveMoney(worth * amount); user.sendMessage( _( - "itemSold", FormatUtil.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), - FormatUtil.displayCurrency(worth, ess))); + "itemSold", FormatUtil.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), + FormatUtil.displayCurrency(worth, ess))); logger.log( Level.INFO, _( "itemSoldConsole", player.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index d4eb74df3..700d84dc9 100644 --- a/Essentials/src/net/ess3/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -9,7 +9,7 @@ import net.ess3.permissions.Permissions; public class Commandsethome extends EssentialsCommand { - private final transient Pattern colon = Pattern.compile(":"); + private final Pattern colon = Pattern.compile(":"); @Override public void run(final IUser user, final String commandLabel, String[] args) throws Exception @@ -78,8 +78,8 @@ public class Commandsethome extends EssentialsCommand } user.sendMessage( _( - "homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(), - user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ())); + "homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(), + user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ())); } } diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java index 401aa8ca9..0c890aeb6 100644 --- a/Essentials/src/net/ess3/commands/Commandsetwarp.java +++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java @@ -36,7 +36,6 @@ public class Commandsetwarp extends EssentialsCommand } if (warpLoc == null || Permissions.WARP_OVERWRITE.isAuthorized(user, args[0])) - { warps.setWarp(args[0], loc); } diff --git a/Essentials/src/net/ess3/commands/Commandsocialspy.java b/Essentials/src/net/ess3/commands/Commandsocialspy.java index 765d7668f..9dbe96f8a 100644 --- a/Essentials/src/net/ess3/commands/Commandsocialspy.java +++ b/Essentials/src/net/ess3/commands/Commandsocialspy.java @@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender; public class Commandsocialspy extends EssentialsToggleCommand { - @Override protected void setValue(final IUser player, final boolean value) { diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java index 74be65774..f4f1d7181 100644 --- a/Essentials/src/net/ess3/commands/Commandspawner.java +++ b/Essentials/src/net/ess3/commands/Commandspawner.java @@ -46,7 +46,7 @@ public class Commandspawner extends EssentialsCommand throw new Exception(_("unableToSpawnMob")); } int delay = 0; - if(args.length > 1 && Util.isInt(args[1])) + if (args.length > 1 && Util.isInt(args[1])) { delay = Integer.parseInt(args[1]); } diff --git a/Essentials/src/net/ess3/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java index a9a410d62..6e1ae9cd2 100644 --- a/Essentials/src/net/ess3/commands/Commandspawnmob.java +++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java @@ -7,7 +7,6 @@ import net.ess3.api.IUser; public class Commandspawnmob extends EssentialsCommand { - @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception { diff --git a/Essentials/src/net/ess3/commands/Commandspeed.java b/Essentials/src/net/ess3/commands/Commandspeed.java index c5f3b01fa..7437710bc 100644 --- a/Essentials/src/net/ess3/commands/Commandspeed.java +++ b/Essentials/src/net/ess3/commands/Commandspeed.java @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; public class Commandspeed extends EssentialsCommand { - @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java index 2acc1b221..0fff1b983 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaccept.java +++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java @@ -21,7 +21,7 @@ public class Commandtpaccept extends EssentialsCommand final IUser target = user.getTeleportRequester(); if (target == null || !target.isOnline() || (user.isTpRequestHere() && !Permissions.TPAHERE.isAuthorized( - target)) || (!user.isTpRequestHere() && !Permissions.TPA.isAuthorized(target) && !Permissions.TPAALL.isAuthorized(target))) + target)) || (!user.isTpRequestHere() && !Permissions.TPA.isAuthorized(target) && !Permissions.TPAALL.isAuthorized(target))) { throw new Exception(_("noPendingRequest")); } diff --git a/Essentials/src/net/ess3/commands/Commandtptoggle.java b/Essentials/src/net/ess3/commands/Commandtptoggle.java index 7be6506f8..194a40285 100644 --- a/Essentials/src/net/ess3/commands/Commandtptoggle.java +++ b/Essentials/src/net/ess3/commands/Commandtptoggle.java @@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender; public class Commandtptoggle extends EssentialsToggleCommand { - @Override protected void setValue(final IUser player, final boolean value) { diff --git a/Essentials/src/net/ess3/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java index cb6fa55c4..2fdcfd40f 100644 --- a/Essentials/src/net/ess3/commands/Commandwhois.java +++ b/Essentials/src/net/ess3/commands/Commandwhois.java @@ -61,8 +61,8 @@ public class Commandwhois extends EssentialsCommand sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(player), player.getLevel())); sender.sendMessage( _( - "whoisLocation", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), - player.getLocation().getBlockZ())); + "whoisLocation", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), + player.getLocation().getBlockZ())); sender.sendMessage(_("whoisMoney", FormatUtil.displayCurrency(user.getMoney(), ess))); sender.sendMessage(_("whoisIPAddress", player.getAddress().getAddress().toString())); final String location = userData.getGeolocation(); @@ -77,12 +77,12 @@ public class Commandwhois extends EssentialsCommand sender.sendMessage(_("whoisAFK", (userData.isAfk() ? _("true") : _("false")))); sender.sendMessage( _( - "whoisJail", (userData.isJailed() ? user.getTimestamp(UserData.TimestampType.JAIL) > 0 ? DateUtil.formatDateDiff( - user.getTimestamp(UserData.TimestampType.JAIL)) : _("true") : _("false")))); + "whoisJail", (userData.isJailed() ? user.getTimestamp(UserData.TimestampType.JAIL) > 0 ? DateUtil.formatDateDiff( + user.getTimestamp(UserData.TimestampType.JAIL)) : _("true") : _("false")))); sender.sendMessage( _( - "whoisMute", (userData.isMuted() ? user.getTimestamp(UserData.TimestampType.MUTE) > 0 ? DateUtil.formatDateDiff( - user.getTimestamp(UserData.TimestampType.MUTE)) : _("true") : _("false")))); + "whoisMute", (userData.isMuted() ? user.getTimestamp(UserData.TimestampType.MUTE) > 0 ? DateUtil.formatDateDiff( + user.getTimestamp(UserData.TimestampType.MUTE)) : _("true") : _("false")))); if (!foundPlayer) { diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java index dad600602..c79d757a1 100644 --- a/Essentials/src/net/ess3/commands/Commandworth.java +++ b/Essentials/src/net/ess3/commands/Commandworth.java @@ -43,10 +43,10 @@ public class Commandworth extends EssentialsCommand user.sendMessage( iStack.getDurability() != 0 ? _( - "worthMeta", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), iStack.getDurability(), - FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)) : _( - "worth", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), FormatUtil.displayCurrency(worth * amount, ess), - amount, FormatUtil.displayCurrency(worth, ess))); + "worthMeta", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), iStack.getDurability(), + FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)) : _( + "worth", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), FormatUtil.displayCurrency(worth * amount, ess), + amount, FormatUtil.displayCurrency(worth, ess))); } @Override @@ -81,10 +81,10 @@ public class Commandworth extends EssentialsCommand sender.sendMessage( iStack.getDurability() != 0 ? _( - "worthMeta", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), iStack.getDurability(), - FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)) : _( - "worth", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), FormatUtil.displayCurrency(worth * amount, ess), - amount, FormatUtil.displayCurrency(worth, ess))); + "worthMeta", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), iStack.getDurability(), + FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)) : _( + "worth", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), FormatUtil.displayCurrency(worth * amount, ess), + amount, FormatUtil.displayCurrency(worth, ess))); } } diff --git a/Essentials/src/net/ess3/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java index 42fbd0f3d..02e6aff41 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java @@ -16,12 +16,12 @@ import org.bukkit.entity.Player; public abstract class EssentialsCommand extends AbstractSuperpermsPermission implements IEssentialsCommand { - protected transient String commandName; - protected transient IEssentials ess; - protected transient IEssentialsModule module; - protected transient Server server; - protected transient Logger logger; - private transient String permission; + protected String commandName; + protected IEssentials ess; + protected IEssentialsModule module; + protected Server server; + protected Logger logger; + private String permission; @Override public void init(final IEssentials ess, final String commandName) diff --git a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java index aa9327fda..1a6cc705f 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java @@ -14,15 +14,15 @@ import org.bukkit.plugin.Plugin; public class EssentialsCommandHandler implements ICommandHandler, TabExecutor { - private final transient ClassLoader classLoader; - private final transient String commandPath; - private final transient String permissionPrefix;// TODO: Needed? - private final transient IEssentialsModule module; - private static final transient Logger LOGGER = Bukkit.getLogger(); - private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>(); - private final transient Map<String, String> disabledList = new HashMap<String, String>(); - private final transient Map<String, IEssentialsCommand> commands = new HashMap<String, IEssentialsCommand>(); - private final transient IEssentials ess; + private final ClassLoader classLoader; + private final String commandPath; + private final String permissionPrefix; // TODO: Needed? + private final IEssentialsModule module; + private static final Logger LOGGER = Bukkit.getLogger(); + private final Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>(); + private final Map<String, String> disabledList = new HashMap<String, String>(); + private final Map<String, IEssentialsCommand> commands = new HashMap<String, IEssentialsCommand>(); + private final IEssentials ess; public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentials ess) { diff --git a/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java b/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java index 1ab327667..440bda706 100644 --- a/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java @@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender; public abstract class EssentialsSettingsCommand extends EssentialsCommand { - abstract protected void informSender(final CommandSender sender, final boolean value, final IUser player); abstract protected void informPlayer(final IUser player); @@ -82,5 +81,4 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand informSender(sender, true, matchPlayer); } } - } diff --git a/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java b/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java index c62fda512..2d5b723cb 100644 --- a/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsToggleCommand.java @@ -5,7 +5,6 @@ import net.ess3.api.IUser; public abstract class EssentialsToggleCommand extends EssentialsSettingsCommand { - abstract protected void setValue(final IUser player, final boolean value); abstract protected boolean getValue(final IUser player); diff --git a/Essentials/src/net/ess3/commands/WarpNotFoundException.java b/Essentials/src/net/ess3/commands/WarpNotFoundException.java index 73e9504c9..3d725072a 100644 --- a/Essentials/src/net/ess3/commands/WarpNotFoundException.java +++ b/Essentials/src/net/ess3/commands/WarpNotFoundException.java @@ -17,5 +17,3 @@ public class WarpNotFoundException extends Exception super(message); } } - - diff --git a/Essentials/src/net/ess3/converter/EnumConverter.java b/Essentials/src/net/ess3/converter/EnumConverter.java index ab45bdfb6..a31b08124 100644 --- a/Essentials/src/net/ess3/converter/EnumConverter.java +++ b/Essentials/src/net/ess3/converter/EnumConverter.java @@ -14,7 +14,7 @@ public class EnumConverter<E extends Enum<E>> implements ArgumentsParser<E>, Ser private static final Pattern REPLACE = Pattern.compile("[_-]"); private final Map<String, E> enumMap = new HashMap<String, E>(); private final Map<E, String> serializedMap; - + private EnumConverter(final Class<E> enumClass) { serializedMap = new EnumMap<E, String>(enumClass); @@ -24,7 +24,7 @@ public class EnumConverter<E extends Enum<E>> implements ArgumentsParser<E>, Ser serializedMap.put(t, prettifyString(t.name())); } } - + public static <T extends Enum<T>> EnumConverter<T> getInstance(final Class<T> enumClass) { synchronized (converterMap) @@ -38,7 +38,7 @@ public class EnumConverter<E extends Enum<E>> implements ArgumentsParser<E>, Ser return converter; } } - + @Override public ParserResult<E> parse(final String... args) { @@ -51,18 +51,18 @@ public class EnumConverter<E extends Enum<E>> implements ArgumentsParser<E>, Ser } return new FirstEntryParserResult<E>(e, args); } - + @Override public String serialize(final E input) { return serializedMap.get(input); } - + private String cleanString(final String input) { return REPLACE.matcher(input).replaceAll("").toLowerCase(Locale.ENGLISH); } - + private String prettifyString(final String input) { return input.replace('_', '-').toLowerCase(Locale.ENGLISH); diff --git a/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java index d7230fcde..e8397c47b 100644 --- a/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java +++ b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java @@ -11,7 +11,6 @@ import org.bukkit.inventory.ItemStack; * TODO: make sure this is up-to date */ - public final class InventoryWorkaround { private InventoryWorkaround() @@ -28,7 +27,7 @@ public final class InventoryWorkaround for (int i = 0; i < stacks.length; i++) { final ItemStack cItem = stacks[i]; - if(cItem != null && cItem.getAmount() < maxAmount && cItem.isSimilar(item)) + if (cItem != null && cItem.getAmount() < maxAmount && cItem.isSimilar(item)) { return i; } diff --git a/Essentials/src/net/ess3/economy/Money.java b/Essentials/src/net/ess3/economy/Money.java index 2373cc7f7..180ec305a 100644 --- a/Essentials/src/net/ess3/economy/Money.java +++ b/Essentials/src/net/ess3/economy/Money.java @@ -35,6 +35,4 @@ public class Money implements StorageObject balanceMap.remove(name); balances = balanceMap; } - - } diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java index 15c2a2adc..c15145baf 100644 --- a/Essentials/src/net/ess3/economy/Trade.java +++ b/Essentials/src/net/ess3/economy/Trade.java @@ -22,12 +22,12 @@ import org.bukkit.inventory.ItemStack; public class Trade { - private final transient String command; - private final transient String fallbackCommand; - private final transient Double money; - private final transient ItemStack itemStack; - private final transient Integer exp; - private final transient IEssentials ess; + private final String command; + private final String fallbackCommand; + private final Double money; + private final ItemStack itemStack; + private final Integer exp; + private final IEssentials ess; public Trade(final String command, final IEssentials ess) { @@ -211,7 +211,6 @@ public class Trade } return cost; } - private static FileWriter fw = null; public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess) diff --git a/Essentials/src/net/ess3/economy/Worth.java b/Essentials/src/net/ess3/economy/Worth.java index f2f3d2d64..6f94204a9 100644 --- a/Essentials/src/net/ess3/economy/Worth.java +++ b/Essentials/src/net/ess3/economy/Worth.java @@ -26,7 +26,6 @@ public class Worth implements StorageObject { return sell == null ? Collections.<MaterialData, Double>emptyMap() : Collections.unmodifiableMap(sell); } - @MapKeyType(MaterialData.class) @MapValueType(Double.class) @Getter(AccessLevel.NONE) @@ -37,7 +36,6 @@ public class Worth implements StorageObject { return buy == null ? Collections.<MaterialData, Double>emptyMap() : Collections.unmodifiableMap(buy); } - @MapKeyType(EnchantmentLevel.class) @MapValueType(Double.class) @Getter(AccessLevel.NONE) diff --git a/Essentials/src/net/ess3/economy/register/Method.java b/Essentials/src/net/ess3/economy/register/Method.java index 2ded29805..f3f7fab4c 100644 --- a/Essentials/src/net/ess3/economy/register/Method.java +++ b/Essentials/src/net/ess3/economy/register/Method.java @@ -6,7 +6,8 @@ import org.bukkit.plugin.Plugin; /** * Interface to be implemented by a payment method. * - * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) + * @author Nijikokun <nijikokun@shortmail.com> ( + * @nijikokun) * @copyright Copyright (C) 2011 * @license AOL license <http://aol.nexua.org> */ @@ -16,7 +17,8 @@ public interface Method * Encodes the Plugin into an Object disguised as the Plugin. If you want the original Plugin Class you must cast it * to the correct Plugin, to do so you have to verify the name and or version then cast. * <p/> - * <pre> + * < + * pre> * if(method.getName().equalsIgnoreCase("iConomy")) * iConomy plugin = ((iConomy)method.getPlugin());</pre> * @@ -48,8 +50,7 @@ public interface Method public String getVersion(); /** - * Returns the amount of decimal places that get stored - * NOTE: it will return -1 if there is no rounding + * Returns the amount of decimal places that get stored NOTE: it will return -1 if there is no rounding * * @return <code>int</code> for each decimal place */ @@ -88,7 +89,9 @@ public interface Method public boolean hasAccount(String name); /** - * Check to see if an account <code>name</code> is tied to a <code>bank</code>. + * Check to see if an account + * <code>name</code> is tied to a + * <code>bank</code>. * * @param bank Bank name * @param name Account name @@ -107,14 +110,16 @@ public interface Method /** * Forces an account creation * - * @param name Account name + * @param name Account name * @param balance Initial account balance * @return <code>boolean</code> */ public boolean createAccount(String name, Double balance); /** - * Returns a <code>MethodAccount</code> class for an account <code>name</code>. + * Returns a + * <code>MethodAccount</code> class for an account + * <code>name</code>. * * @param name Account name * @return <code>MethodAccount</code> <em>or</em> <code>Null</code> @@ -122,7 +127,9 @@ public interface Method public MethodAccount getAccount(String name); /** - * Returns a <code>MethodBankAccount</code> class for an account <code>name</code>. + * Returns a + * <code>MethodBankAccount</code> class for an account + * <code>name</code>. * * @param bank Bank name * @param name Account name @@ -131,8 +138,7 @@ public interface Method public MethodBankAccount getBankAccount(String bank, String name); /** - * Checks to verify the compatibility between this Method and a plugin. - * Internal usage only, for the most part. + * Checks to verify the compatibility between this Method and a plugin. Internal usage only, for the most part. * * @param plugin Plugin * @return <code>boolean</code> diff --git a/Essentials/src/net/ess3/economy/register/Methods.java b/Essentials/src/net/ess3/economy/register/Methods.java index 3c0772129..1ac716aa7 100644 --- a/Essentials/src/net/ess3/economy/register/Methods.java +++ b/Essentials/src/net/ess3/economy/register/Methods.java @@ -22,8 +22,10 @@ import org.bukkit.plugin.PluginManager; * preferred: "iConomy" * </pre></blockquote> * - * @author: Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright: Copyright (C) 2011 @license: AOL license - * <http://aol.nexua.org> + * @author: Nijikokun <nijikokun@shortmail.com> ( + * @nijikokun) + * @copyright: Copyright (C) 2011 + * @license: AOL license <http://aol.nexua.org> */ public class Methods { @@ -255,8 +257,7 @@ public class Methods /** * Grab the existing and initialized (hopefully) Method Class. * - * @return <code>Method</code> <em>or</em> - * <code>Null</code> + * @return <code>Method</code> <em>or</em> <code>Null</code> */ public static Method getMethod() { diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java index cbb9b9314..f186dfadd 100644 --- a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java @@ -9,8 +9,10 @@ import org.bukkit.plugin.Plugin; * BOSEconomy 7 Implementation of Method * * @author Acrobot - * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> + * @author Nijikokun <nijikokun@shortmail.com> ( + * @nijikokun) + * @copyright (c) 2011 + * @license AOL license <http://aol.nexua.org> */ public class BOSE7 implements Method { diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo5.java b/Essentials/src/net/ess3/economy/register/methods/iCo5.java index a615ada5d..9e4dab821 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo5.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo5.java @@ -12,8 +12,10 @@ import org.bukkit.plugin.Plugin; /** * iConomy 5 Implementation of Method * - * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> + * @author Nijikokun <nijikokun@shortmail.com> ( + * @nijikokun) + * @copyright (c) 2011 + * @license AOL license <http://aol.nexua.org> */ public class iCo5 implements Method { diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo6.java b/Essentials/src/net/ess3/economy/register/methods/iCo6.java index 9dfdabe2e..d98819828 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo6.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo6.java @@ -11,8 +11,10 @@ import org.bukkit.plugin.Plugin; /** * iConomy 6 Implementation of Method * - * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> + * @author Nijikokun <nijikokun@shortmail.com> ( + * @nijikokun) + * @copyright (c) 2011 + * @license AOL license <http://aol.nexua.org> */ public class iCo6 implements Method { diff --git a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java index 8d3f380a7..f72b95e64 100644 --- a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java @@ -15,7 +15,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsBlockListener implements Listener { - private final transient IEssentials ess; + private final IEssentials ess; public EssentialsBlockListener(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java index 41ed4503a..c0b5a54d0 100644 --- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java @@ -19,7 +19,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsEntityListener implements Listener { - private final transient IEssentials ess; + private final IEssentials ess; public EssentialsEntityListener(final IEssentials ess) { @@ -41,7 +41,7 @@ public class EssentialsEntityListener implements Listener attacker.updateActivity(true); if (settings.getData().getGeneral().getLoginAttackDelay() > 0 && !Permissions.PVPDELAY_EXEMPT.isAuthorized( attacker) && (System.currentTimeMillis() < (attacker.getTimestamp( - TimestampType.LOGIN) + settings.getData().getGeneral().getLoginAttackDelay()))) + TimestampType.LOGIN) + settings.getData().getGeneral().getLoginAttackDelay()))) { event.setCancelled(true); } diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 81ec8a397..b5de18fd1 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -40,9 +40,9 @@ import org.bukkit.inventory.ItemStack; public class EssentialsPlayerListener implements Listener { private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private final transient Server server; - private final transient IEssentials ess; - private final transient IUserMap userMap; + private final Server server; + private final IEssentials ess; + private final IUserMap userMap; public EssentialsPlayerListener(final IEssentials parent) { @@ -56,7 +56,8 @@ public class EssentialsPlayerListener implements Listener public void onPlayerRespawn(final PlayerRespawnEvent event) { final Player player = event.getPlayer(); - if (!player.isOnline()) { + if (!player.isOnline()) + { return; } final IUser user = userMap.getUser(player); @@ -173,83 +174,83 @@ public class EssentialsPlayerListener implements Listener delayedJoin(event.getPlayer()); } }); -/* TODO: Make sure my update is good - if (!event.getPlayer().isOnline()) - { - return; - } - - ess.getBackup().startTask(); - - final String joinMessage = ess.getSettings().getData().getGeneral().getJoinMessage(); - if (joinMessage != null) - { - final IText itOutput = new KeywordReplacer(new SimpleTextInput(joinMessage), ess.getUserMap().getUser(event.getPlayer()), ess); - final SimpleTextPager stPager = new SimpleTextPager(itOutput); - event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0))); - } - else - { - event.setJoinMessage(joinMessage); - } - - final IUser user = ess.getUserMap().getUser(event.getPlayer()); - - user.updateDisplayName(); - user.getData().setIpAddress(user.getPlayer().getAddress().getAddress().getHostAddress()); - user.updateActivity(false); - - for (String p : ess.getVanishedPlayers()) - { - if (!Permissions.VANISH_SEE_OTHERS.isAuthorized(user)) - { - user.getPlayer().hidePlayer(ess.getUserMap().getUser(p).getPlayer()); - } - } - - if (Permissions.SLEEPINGIGNORED.isAuthorized(user)) - { - user.getPlayer().setSleepingIgnored(true); - } - user.queueSave(); - - - final ISettings settings = ess.getSettings(); - - if (!settings.getData().getCommands().isDisabled("motd") && Permissions.MOTD.isAuthorized(user)) - { - try - { - final IText input = new TextInput(user, "motd", true, ess); - final IText output = new KeywordReplacer(input, user, ess); - final TextPager pager = new TextPager(output, true); - pager.showPage("1", null, "motd", user); - } - catch (IOException ex) - { - if (settings.getData().getGeneral().isDebug()) - { - LOGGER.log(Level.WARNING, ex.getMessage(), ex); - } - else - { - LOGGER.log(Level.WARNING, ex.getMessage()); - } - } - } - - if (!settings.getData().getCommands().isDisabled("mail") && Permissions.MAIL.isAuthorized(user)) - { - final List<String> mail = user.getData().getMails(); - if (mail == null || mail.isEmpty()) - { - user.sendMessage(_("noNewMail")); - } - else - { - user.sendMessage(_("youHaveNewMail", mail.size())); - } - }*/ + /* TODO: Make sure my update is good + if (!event.getPlayer().isOnline()) + { + return; + } + + ess.getBackup().startTask(); + + final String joinMessage = ess.getSettings().getData().getGeneral().getJoinMessage(); + if (joinMessage != null) + { + final IText itOutput = new KeywordReplacer(new SimpleTextInput(joinMessage), ess.getUserMap().getUser(event.getPlayer()), ess); + final SimpleTextPager stPager = new SimpleTextPager(itOutput); + event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0))); + } + else + { + event.setJoinMessage(joinMessage); + } + + final IUser user = ess.getUserMap().getUser(event.getPlayer()); + + user.updateDisplayName(); + user.getData().setIpAddress(user.getPlayer().getAddress().getAddress().getHostAddress()); + user.updateActivity(false); + + for (String p : ess.getVanishedPlayers()) + { + if (!Permissions.VANISH_SEE_OTHERS.isAuthorized(user)) + { + user.getPlayer().hidePlayer(ess.getUserMap().getUser(p).getPlayer()); + } + } + + if (Permissions.SLEEPINGIGNORED.isAuthorized(user)) + { + user.getPlayer().setSleepingIgnored(true); + } + user.queueSave(); + + + final ISettings settings = ess.getSettings(); + + if (!settings.getData().getCommands().isDisabled("motd") && Permissions.MOTD.isAuthorized(user)) + { + try + { + final IText input = new TextInput(user, "motd", true, ess); + final IText output = new KeywordReplacer(input, user, ess); + final TextPager pager = new TextPager(output, true); + pager.showPage("1", null, "motd", user); + } + catch (IOException ex) + { + if (settings.getData().getGeneral().isDebug()) + { + LOGGER.log(Level.WARNING, ex.getMessage(), ex); + } + else + { + LOGGER.log(Level.WARNING, ex.getMessage()); + } + } + } + + if (!settings.getData().getCommands().isDisabled("mail") && Permissions.MAIL.isAuthorized(user)) + { + final List<String> mail = user.getData().getMails(); + if (mail == null || mail.isEmpty()) + { + user.sendMessage(_("noNewMail")); + } + else + { + user.sendMessage(_("youHaveNewMail", mail.size())); + } + }*/ } public void delayedJoin(final Player player) @@ -330,19 +331,19 @@ public class EssentialsPlayerListener implements Listener user.sendMessage(_("youHaveNewMail", mail.size())); } } - if(Permissions.FLY_SAFELOGIN.isAuthorized(user)) + if (Permissions.FLY_SAFELOGIN.isAuthorized(user)) { final Location loc = user.getPlayer().getLocation(); final World world = loc.getWorld(); final int x = loc.getBlockX(); int y = loc.getBlockY(); final int z = loc.getBlockZ(); - while(LocationUtil.isBlockUnsafe(world, x, y, z) && y > -1) + while (LocationUtil.isBlockUnsafe(world, x, y, z) && y > -1) { y--; } - if(loc.getBlockY() - y > 1 || y < 0) + if (loc.getBlockY() - y > 1 || y < 0) { user.getPlayer().setAllowFlight(true); user.getPlayer().setFlying(true); @@ -351,7 +352,6 @@ public class EssentialsPlayerListener implements Listener } } - @EventHandler(priority = EventPriority.HIGH) public void onPlayerLogin(final PlayerLoginEvent event) { @@ -449,7 +449,6 @@ public class EssentialsPlayerListener implements Listener }); } } - private final Pattern spaceSplit = Pattern.compile(" "); @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @@ -613,7 +612,7 @@ public class EssentialsPlayerListener implements Listener { final IUser invOwner = userMap.getUser((Player)invHolder); if (user.isInvSee() && (!Permissions.INVSEE_MODIFY.isAuthorized(user) || Permissions.INVSEE_PREVENT_MODIFY.isAuthorized( - invOwner) || !invOwner.isOnline())) + invOwner) || !invOwner.isOnline())) { event.setCancelled(true); } @@ -621,7 +620,7 @@ public class EssentialsPlayerListener implements Listener } if (event.getView().getTopInventory().getType() == InventoryType.WORKBENCH) { - final IUser user = userMap.getUser((Player) event.getWhoClicked()); + final IUser user = userMap.getUser((Player)event.getWhoClicked()); if (user.isRecipeSee()) { event.setCancelled(true); diff --git a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java index 56e3add3d..8f5de1ec2 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java @@ -19,7 +19,7 @@ import org.bukkit.plugin.Plugin; public class EssentialsPluginListener implements Listener, IReload { - private final transient IEssentials ess; + private final IEssentials ess; public EssentialsPluginListener(final IEssentials ess) { @@ -36,9 +36,10 @@ public class EssentialsPluginListener implements Listener, IReload if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager())) { ess.getLogger().log( - Level.INFO, "Payment method found ({0} version: {1})", new Object[]{ - Methods.getMethod().getName(), Methods.getMethod().getVersion() - }); + Level.INFO, "Payment method found ({0} version: {1})", new Object[] + { + Methods.getMethod().getName(), Methods.getMethod().getVersion() + }); } } diff --git a/Essentials/src/net/ess3/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java index 17664ab61..b83406e35 100644 --- a/Essentials/src/net/ess3/metrics/MetricsListener.java +++ b/Essentials/src/net/ess3/metrics/MetricsListener.java @@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerJoinEvent; public class MetricsListener implements Listener { - private final transient IEssentials ess; - private final transient MetricsStarter starter; + private final IEssentials ess; + private final MetricsStarter starter; public MetricsListener(final IEssentials parent, final MetricsStarter starter) { @@ -30,7 +30,7 @@ public class MetricsListener implements Listener ISettings settings = ess.getSettings(); if (settings.getData().getGeneral().getMetricsEnabled() == null && (Permissions.ESSENTIALS.isAuthorized( - event.getPlayer()) || event.getPlayer().hasPermission("bukkit.broadcast.admin"))) + event.getPlayer()) || event.getPlayer().hasPermission("bukkit.broadcast.admin"))) { player.sendMessage(_("metrics1")); player.sendMessage(_("metrics2")); diff --git a/Essentials/src/net/ess3/metrics/MetricsStarter.java b/Essentials/src/net/ess3/metrics/MetricsStarter.java index 2c5314142..0c1ac9df9 100644 --- a/Essentials/src/net/ess3/metrics/MetricsStarter.java +++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java @@ -14,7 +14,7 @@ import net.ess3.metrics.Metrics.Plotter; public class MetricsStarter implements Runnable { private final IEssentials ess; - private transient Boolean start; + private Boolean start; private enum Modules @@ -30,10 +30,7 @@ public class MetricsStarter implements Runnable EssentialsProtect, EssentialsGeoIP, EssentialsXMPP - } - - - ; + }; public MetricsStarter(final IEssentials plugin) { diff --git a/Essentials/src/net/ess3/permissions/BasePermission.java b/Essentials/src/net/ess3/permissions/BasePermission.java index b1cb0be68..5312ebb93 100644 --- a/Essentials/src/net/ess3/permissions/BasePermission.java +++ b/Essentials/src/net/ess3/permissions/BasePermission.java @@ -1,5 +1,6 @@ package net.ess3.permissions; + public class BasePermission extends AbstractSuperpermsPermission { protected String permission; diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index c4c1e19c7..4655ca309 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -121,7 +121,7 @@ public enum Permissions implements IPermission private static final String base = "essentials."; private final String permission; private final PermissionDefault defaultPerm; - private transient String parent = null; + private String parent = null; private Permissions() { @@ -164,7 +164,6 @@ public enum Permissions implements IPermission { return PermissionFactory.checkPermission(sender, this); } - public static DotStarPermission ENCHANT = new DotStarPermission("essentials.enchant"); public static MaterialDotStarPermission GIVE = new MaterialDotStarPermission("essentials.give", PermissionDefault.TRUE); public static DotStarPermission RANKS = new DotStarPermission("essentials.ranks"); diff --git a/Essentials/src/net/ess3/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java index 55a6295d3..9e2bd745f 100644 --- a/Essentials/src/net/ess3/ranks/GMGroups.java +++ b/Essentials/src/net/ess3/ranks/GMGroups.java @@ -12,8 +12,8 @@ import org.bukkit.plugin.Plugin; public class GMGroups extends AbstractRanks implements IRanks { - private final transient IEssentials ess; - private final transient GroupManager groupManager; + private final IEssentials ess; + private final GroupManager groupManager; public GMGroups(final IEssentials ess, final Plugin groupManager) { diff --git a/Essentials/src/net/ess3/ranks/Ranks.java b/Essentials/src/net/ess3/ranks/Ranks.java index 4e876b128..31a9bc34b 100644 --- a/Essentials/src/net/ess3/ranks/Ranks.java +++ b/Essentials/src/net/ess3/ranks/Ranks.java @@ -17,12 +17,11 @@ public class Ranks implements StorageObject final RankOptions defaultOptions = new RankOptions(); ranks.put("default", defaultOptions); } - @Comment( - { - "The order of the ranks matters, the ranks are checked from top to bottom.", "All rank names have to be lower case.", - "The ranks can be connected to users using the permission essentials.ranks.rankname" - }) + { + "The order of the ranks matters, the ranks are checked from top to bottom.", "All rank names have to be lower case.", + "The ranks can be connected to users using the permission essentials.ranks.rankname" + }) @MapValueType(RankOptions.class) private LinkedHashMap<String, RankOptions> ranks = new LinkedHashMap<String, RankOptions>(); } diff --git a/Essentials/src/net/ess3/settings/Backup.java b/Essentials/src/net/ess3/settings/Backup.java index bbdef7bdf..01ba37322 100644 --- a/Essentials/src/net/ess3/settings/Backup.java +++ b/Essentials/src/net/ess3/settings/Backup.java @@ -18,17 +18,16 @@ public class Backup implements StorageObject @Comment("Add a command that backups your data, e.g. 'rdiff-backup World1 backups/World1'") private String command; @Comment( - { - "Runs these commands before a backup.", "This will run every time time (in minutes) you specify in the interval setting.", - "ex: say \"Hello World\" will make the server say Hello World" - }) + { + "Runs these commands before a backup.", "This will run every time time (in minutes) you specify in the interval setting.", + "ex: say \"Hello World\" will make the server say Hello World" + }) private List<String> commandsBeforeBackup; - @Comment( - { - "Runs these commands after a backup.", "This will run every time time (in minutes) you specify in the interval setting.", - "ex: say \"Hello World\" will make the server say Hello World" - }) + { + "Runs these commands after a backup.", "This will run every time time (in minutes) you specify in the interval setting.", + "ex: say \"Hello World\" will make the server say Hello World" + }) private List<String> commandsAfterBackup; public Backup() @@ -49,5 +48,4 @@ public class Backup implements StorageObject { return commandsAfterBackup == null ? Collections.<String>emptyList() : Collections.unmodifiableList(commandsAfterBackup); } - } diff --git a/Essentials/src/net/ess3/settings/Chat.java b/Essentials/src/net/ess3/settings/Chat.java index 14c7cc702..a7a99fe6e 100644 --- a/Essentials/src/net/ess3/settings/Chat.java +++ b/Essentials/src/net/ess3/settings/Chat.java @@ -13,20 +13,20 @@ public class Chat implements StorageObject @Comment("The character(s) to prefix all nicknames, so that you know they are not true usernames.") private String nicknamePrefix = "~"; @Comment( - { - "Disable this if you have any other plugin, that modifies the displayname of a user.", - "If it is not set, it will be enabled if EssentialsChat is installed, otherwise not." - }) + { + "Disable this if you have any other plugin, that modifies the displayname of a user.", + "If it is not set, it will be enabled if EssentialsChat is installed, otherwise not." + }) private Boolean changeDisplayname; private String displaynameFormat = "{PREFIX}{NICKNAMEPREFIX}{NAME}{SUFFIX}"; @Comment( - { - "If EssentialsChat is installed, this will define how far a player's voice travels, in blocks. Set to 0 to make all chat global.", - "Note that users with the \"essentials.chat.spy\" permission will hear everything, regardless of this setting.", - "Users with essentials.chat.shout can override this by prefixing text with an exclamation mark (!)", - "Or with essentials.chat.question can override this by prefixing text with a question mark (?)", - "You can add command costs for shout/question by adding chat-shout and chat-question to the command costs section." - }) + { + "If EssentialsChat is installed, this will define how far a player's voice travels, in blocks. Set to 0 to make all chat global.", + "Note that users with the \"essentials.chat.spy\" permission will hear everything, regardless of this setting.", + "Users with essentials.chat.shout can override this by prefixing text with an exclamation mark (!)", + "Or with essentials.chat.question can override this by prefixing text with a question mark (?)", + "You can add command costs for shout/question by adding chat-shout and chat-question to the command costs section." + }) private int localRadius = 0; @Comment("Set the default chat format here, it will be overwritten by group specific chat formats.") private String defaultFormat = "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"; diff --git a/Essentials/src/net/ess3/settings/Commands.java b/Essentials/src/net/ess3/settings/Commands.java index e78e09f34..6bd29b4c7 100644 --- a/Essentials/src/net/ess3/settings/Commands.java +++ b/Essentials/src/net/ess3/settings/Commands.java @@ -26,16 +26,16 @@ public class Commands implements StorageObject private Speed speed = new Speed(); @ListType @Comment( - { - "When a command conflicts with another plugin, by default, Essentials will try to force the OTHER plugin to take", - "priority. If a command is in this list, Essentials will try to give ITSELF priority. This does not always work:", - "usually whichever plugin was updated most recently wins out. However, the full name of the command will always work.", - "For example, if WorldGuard and Essentials are both enabled, and WorldGuard takes control over /god, /essentials:god", - "will still map to Essentials, whereas it might normally get forced upon WorldGuard. Commands prefixed with an \"e\",", - "such as /egod, will always grant Essentials priority.", - "We should try to take priority over /god. If this doesn't work, use /essentials:god or /egod.", - "If god is set using WorldGuard, use /ungod to remove then use whichever you see fit." - }) + { + "When a command conflicts with another plugin, by default, Essentials will try to force the OTHER plugin to take", + "priority. If a command is in this list, Essentials will try to give ITSELF priority. This does not always work:", + "usually whichever plugin was updated most recently wins out. However, the full name of the command will always work.", + "For example, if WorldGuard and Essentials are both enabled, and WorldGuard takes control over /god, /essentials:god", + "will still map to Essentials, whereas it might normally get forced upon WorldGuard. Commands prefixed with an \"e\",", + "such as /egod, will always grant Essentials priority.", + "We should try to take priority over /god. If this doesn't work, use /essentials:god or /egod.", + "If god is set using WorldGuard, use /ungod to remove then use whichever you see fit." + }) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private List<String> overridden = null; diff --git a/Essentials/src/net/ess3/settings/Economy.java b/Essentials/src/net/ess3/settings/Economy.java index bd37372bd..e43992b61 100644 --- a/Essentials/src/net/ess3/settings/Economy.java +++ b/Essentials/src/net/ess3/settings/Economy.java @@ -26,32 +26,29 @@ public class Economy implements StorageObject { return currencySymbol == null || currencySymbol.isEmpty() ? "$" : currencySymbol.substring(0, 1); } - - private final transient static double MAXMONEY = 10000000000000.0; + private final static double MAXMONEY = 10000000000000.0; @Comment( - { - "Set the maximum amount of money a player can have", - "The amount is always limited to 10 trillions because of the limitations of a java double" - }) + { + "Set the maximum amount of money a player can have", + "The amount is always limited to 10 trillions because of the limitations of a java double" + }) private double maxMoney = MAXMONEY; public double getMaxMoney() { return Math.abs(maxMoney) > MAXMONEY ? MAXMONEY : Math.abs(maxMoney); } - @Comment( - { - "Set the minimum amount of money a player can have (must be above the negative of max-money).", - "Setting this to 0, will disable overdrafts/loans completely. Users need 'essentials.eco.loan' perm to go below 0." - }) + { + "Set the minimum amount of money a player can have (must be above the negative of max-money).", + "Setting this to 0, will disable overdrafts/loans completely. Users need 'essentials.eco.loan' perm to go below 0." + }) private double minMoney = -MAXMONEY; public double getMinMoney() { return Math.abs(minMoney) > MAXMONEY ? -MAXMONEY : minMoney; } - @Comment("Enable this to log all interactions with trade/buy/sell signs and sell command") private boolean logEnabled = false; private Worth worth = new Worth(); diff --git a/Essentials/src/net/ess3/settings/General.java b/Essentials/src/net/ess3/settings/General.java index 6fbdb5b8c..01ee58704 100644 --- a/Essentials/src/net/ess3/settings/General.java +++ b/Essentials/src/net/ess3/settings/General.java @@ -17,24 +17,24 @@ public class General implements StorageObject @Comment("Turn this on, if you want to see more error messages, if something goes wrong.") private boolean debug = false; @Comment( - { - "Set the locale here, if you want to change the language of Essentials.", - "If this is not set, Essentials will use the language of your computer.", "Available locales: da, de, en, fr, nl" - }) + { + "Set the locale here, if you want to change the language of Essentials.", + "If this is not set, Essentials will use the language of your computer.", "Available locales: da, de, en, fr, nl" + }) private String locale; @Comment( - { - "The number of items given, if the quantity parameter is left out in /item or /give.", - "If this number is below 1, the maximum stack size size is given. If oversized stacks", - "is not enabled, any number higher then the maximum stack size results in more than one stack." - }) + { + "The number of items given, if the quantity parameter is left out in /item or /give.", + "If this number is below 1, the maximum stack size size is given. If oversized stacks", + "is not enabled, any number higher then the maximum stack size results in more than one stack." + }) private int defaultStacksize = -1; @Comment( - { - "Oversized stacks are stacks that ignore the normal max stacksize.", - "They can be obtained using /give and /item, if the player has essentials.oversizedstacks permission.", - "How many items should be in a oversized stack?" - }) + { + "Oversized stacks are stacks that ignore the normal max stacksize.", + "They can be obtained using /give and /item, if the player has essentials.oversizedstacks permission.", + "How many items should be in a oversized stack?" + }) private int oversizedStacksize = 64; @@ -42,21 +42,19 @@ public class General implements StorageObject { FILE, GROUPMANAGER, VAULT } - - @Comment( - { - "Sets the place where group options should be stored:", " FILE: Options are stored inside groups.yml in the Essentials folder", - " GROUPMANAGER: Options are stored using the GroupManager groups", - " VAULT: Options are stored using a permissions plugin supported by Vault" - }) + { + "Sets the place where group options should be stored:", " FILE: Options are stored inside groups.yml in the Essentials folder", + " GROUPMANAGER: Options are stored using the GroupManager groups", + " VAULT: Options are stored using a permissions plugin supported by Vault" + }) private GroupStorage groupStorage = GroupStorage.FILE; @Comment( - { - "Set to true to enable per-world permissions for teleporting between worlds with essentials commands", - "This applies to /world, /back, /tp[a|o][here|all], but not warps.", - "Give someone permission to teleport to a world with essentials.world.<worldname>" - }) + { + "Set to true to enable per-world permissions for teleporting between worlds with essentials commands", + "This applies to /world, /back, /tp[a|o][here|all], but not warps.", + "Give someone permission to teleport to a world with essentials.world.<worldname>" + }) private boolean worldTeleportPermissions = false; private boolean worldHomePermissions = false; @Comment("Delay to wait before people can cause attack damage after logging in ") @@ -71,7 +69,6 @@ public class General implements StorageObject { this.loginAttackDelay = loginAttackDelay / 1000; } - private Boolean metricsEnabled = null; @Comment("The join message when players join the server") private String joinMessage = "&e{PLAYER} has joined the game"; diff --git a/Essentials/src/net/ess3/settings/Kits.java b/Essentials/src/net/ess3/settings/Kits.java index f68ac5d83..2892729c4 100644 --- a/Essentials/src/net/ess3/settings/Kits.java +++ b/Essentials/src/net/ess3/settings/Kits.java @@ -21,11 +21,10 @@ public class Kits implements StorageObject kit.setDelay(10.0); kit.setItems( Arrays.<ItemStack>asList( - new ItemStack(Material.DIAMOND_SPADE, 1), new ItemStack(Material.DIAMOND_PICKAXE, 1), new ItemStack(Material.DIAMOND_AXE, 1))); + new ItemStack(Material.DIAMOND_SPADE, 1), new ItemStack(Material.DIAMOND_PICKAXE, 1), new ItemStack(Material.DIAMOND_AXE, 1))); kits = new HashMap<String, Kit>(); kits.put("tools", kit); } - @MapValueType(Kit.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) diff --git a/Essentials/src/net/ess3/settings/Settings.java b/Essentials/src/net/ess3/settings/Settings.java index a73e5f42d..9552c4cc7 100644 --- a/Essentials/src/net/ess3/settings/Settings.java +++ b/Essentials/src/net/ess3/settings/Settings.java @@ -12,39 +12,39 @@ import net.ess3.storage.StorageObject; public class Settings implements StorageObject { @Comment( - { - "##########################################################", "+------------------------------------------------------+ #", - "| General Settings | #", "+------------------------------------------------------+ #", - "##########################################################" - }) + { + "##########################################################", "+------------------------------------------------------+ #", + "| General Settings | #", "+------------------------------------------------------+ #", + "##########################################################" + }) private General general = new General(); @Comment( - { - "##########################################################", "+------------------------------------------------------+ #", - "| Chat Settings | #", "+------------------------------------------------------+ #", - "##########################################################" - }) + { + "##########################################################", "+------------------------------------------------------+ #", + "| Chat Settings | #", "+------------------------------------------------------+ #", + "##########################################################" + }) private Chat chat = new Chat(); @Comment( - { - "##########################################################", "+------------------------------------------------------+ #", - "| Economy Settings | #", "+------------------------------------------------------+ #", - "##########################################################" - }) + { + "##########################################################", "+------------------------------------------------------+ #", + "| Economy Settings | #", "+------------------------------------------------------+ #", + "##########################################################" + }) private Economy economy = new Economy(); @Comment( - { - "##########################################################", "+------------------------------------------------------+ #", - "| Commands Settings | #", "+------------------------------------------------------+ #", - "##########################################################" - }) + { + "##########################################################", "+------------------------------------------------------+ #", + "| Commands Settings | #", "+------------------------------------------------------+ #", + "##########################################################" + }) private Commands commands = new Commands(); @Comment( - { - "##########################################################", "+------------------------------------------------------+ #", - "| Worlds Settings | #", "+------------------------------------------------------+ #", - "##########################################################" - }) + { + "##########################################################", "+------------------------------------------------------+ #", + "| Worlds Settings | #", "+------------------------------------------------------+ #", + "##########################################################" + }) @MapValueType(WorldOptions.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) diff --git a/Essentials/src/net/ess3/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java index e9b7f8af3..5d5ab3934 100644 --- a/Essentials/src/net/ess3/settings/SettingsHolder.java +++ b/Essentials/src/net/ess3/settings/SettingsHolder.java @@ -8,7 +8,7 @@ import net.ess3.storage.AsyncStorageObjectHolder; public class SettingsHolder extends AsyncStorageObjectHolder<Settings> implements ISettings { - private transient volatile boolean debug = false; + private volatile boolean debug = false; public SettingsHolder(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/settings/Spawns.java b/Essentials/src/net/ess3/settings/Spawns.java index 7d05d55d2..57a63409c 100644 --- a/Essentials/src/net/ess3/settings/Spawns.java +++ b/Essentials/src/net/ess3/settings/Spawns.java @@ -16,22 +16,22 @@ import org.bukkit.Location; public class Spawns implements StorageObject { @Comment( - { - "Should we announce to the server when someone logs in for the first time?", - "If so, use this format, replacing {DISPLAYNAME} with the player name.", "If not, set to ''" - }) + { + "Should we announce to the server when someone logs in for the first time?", + "If so, use this format, replacing {DISPLAYNAME} with the player name.", "If not, set to ''" + }) private String newPlayerAnnouncement = "&dWelcome {DISPLAYNAME} to the server!"; @Comment( - { - "Priority of the respawn event listener", "Set this to lowest, if you want e.g. Multiverse to handle the respawning", - "Set this to normal, if you want EssentialsSpawn to handle the respawning", - "Set this to highest, if you want to force EssentialsSpawn to handle the respawning" - }) + { + "Priority of the respawn event listener", "Set this to lowest, if you want e.g. Multiverse to handle the respawning", + "Set this to normal, if you want EssentialsSpawn to handle the respawning", + "Set this to highest, if you want to force EssentialsSpawn to handle the respawning" + }) private String respawnPriority = "normal"; @Comment( - { - "When we spawn for the first time, which spawnpoint do we use?", "Set to none if you want to use the spawn point of the world." - }) + { + "When we spawn for the first time, which spawnpoint do we use?", "Set to none if you want to use the spawn point of the world." + }) private String newbieSpawn = "none"; @Comment("List of all spawnpoints") @MapValueType(StoredLocation.class) diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index 1c310c7c3..9aaaaa350 100644 --- a/Essentials/src/net/ess3/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -38,7 +38,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE /** * Sets a spawn location * - * @param loc - Location you want to set as spawn + * @param loc - Location you want to set as spawn * @param group - Group to save it undr in the config */ public void setSpawn(final Location loc, final String group) @@ -174,8 +174,8 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE private class SpawnPlayerListener implements Listener // TODO: What is this for? { - private final transient IEssentials ess; - private final transient SpawnsHolder spawns; + private final IEssentials ess; + private final SpawnsHolder spawns; public SpawnPlayerListener(final IEssentials ess, final SpawnsHolder spawns) { @@ -187,8 +187,6 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE public void onPlayerRespawn(final PlayerRespawnEvent event) { final IUser user = ess.getUserMap().getUser(event.getPlayer()); - - final ISettings settings = ess.getSettings(); boolean respawnAtHome = ess.getSettings().getData().getCommands().getHome().isRespawnAtHome(); if (respawnAtHome) { @@ -240,7 +238,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE private class NewPlayerTeleport implements Runnable { - private final transient IUser user; + private final IUser user; public NewPlayerTeleport(final IUser user) { diff --git a/Essentials/src/net/ess3/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java index e49ebb181..40e57dee7 100644 --- a/Essentials/src/net/ess3/settings/WorldOptions.java +++ b/Essentials/src/net/ess3/settings/WorldOptions.java @@ -26,7 +26,6 @@ public class WorldOptions implements StorageObject } } } - @Comment("Disables godmode for all players if they teleport to this world.") private boolean godmode = true; @Comment("Prevent creatures spawning") diff --git a/Essentials/src/net/ess3/settings/Worlds.java b/Essentials/src/net/ess3/settings/Worlds.java index c3f1f09d0..10dc63823 100644 --- a/Essentials/src/net/ess3/settings/Worlds.java +++ b/Essentials/src/net/ess3/settings/Worlds.java @@ -9,5 +9,4 @@ import net.ess3.storage.StorageObject; @EqualsAndHashCode(callSuper = false) public class Worlds implements StorageObject { - }
\ No newline at end of file diff --git a/Essentials/src/net/ess3/settings/antibuild/Alert.java b/Essentials/src/net/ess3/settings/antibuild/Alert.java index 481cc39ec..dc11841b1 100644 --- a/Essentials/src/net/ess3/settings/antibuild/Alert.java +++ b/Essentials/src/net/ess3/settings/antibuild/Alert.java @@ -32,8 +32,9 @@ public class Alert implements StorageObject public void setupDefaults() { - Material[] mat = { - Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET + Material[] mat = + { + Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET }; alertOnPlacement.addAll(Arrays.asList(mat)); alertOnUse.add(Material.LAVA_BUCKET); diff --git a/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java b/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java index 3bbf32f42..b45c65e3e 100644 --- a/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java +++ b/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java @@ -11,24 +11,22 @@ import net.ess3.storage.StorageObject; public class AntiBuild implements StorageObject { @Comment( - { - "Should people with build: false in permissions be allowed to build", "Set true to disable building for those people", - "Setting to false means EssentialsAntiBuild will never prevent you from building" - }) + { + "Should people with build: false in permissions be allowed to build", "Set true to disable building for those people", + "Setting to false means EssentialsAntiBuild will never prevent you from building" + }) private boolean disableBuild = true; @Comment( - { - "Should people with build: false in permissions be allowed to use items", "Set true to disable using for those people", - "Setting to false means EssentialsAntiBuild will never prevent you from using" - }) + { + "Should people with build: false in permissions be allowed to use items", "Set true to disable using for those people", + "Setting to false means EssentialsAntiBuild will never prevent you from using" + }) private boolean disableUse = true; @Comment( - { - "Should we tell people they are not allowed to build" - }) + { + "Should we tell people they are not allowed to build" + }) private boolean warnOnBuildDisallow = true; - private Alert alert = new Alert(); private BlackList blacklist = new BlackList(); - } diff --git a/Essentials/src/net/ess3/settings/antibuild/BlackList.java b/Essentials/src/net/ess3/settings/antibuild/BlackList.java index af9205f7e..ca67ab479 100644 --- a/Essentials/src/net/ess3/settings/antibuild/BlackList.java +++ b/Essentials/src/net/ess3/settings/antibuild/BlackList.java @@ -15,33 +15,33 @@ import org.bukkit.Material; public class BlackList implements StorageObject { @Comment( - { - "Which blocks should people be prevented from placing" - }) + { + "Which blocks should people be prevented from placing" + }) @ListType(Material.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private Set<Material> placement = new HashSet<Material>(); @Comment( - { - "Which items should people be prevented from using" - }) + { + "Which items should people be prevented from using" + }) @ListType(Material.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private Set<Material> usage = new HashSet<Material>(); @Comment( - { - "Which blocks should people be prevented from breaking" - }) + { + "Which blocks should people be prevented from breaking" + }) @ListType(Material.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private Set<Material> breaking = new HashSet<Material>(); @Comment( - { - "Which blocks should not be pushed by pistons" - }) + { + "Which blocks should not be pushed by pistons" + }) @ListType(Material.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) @@ -49,8 +49,9 @@ public class BlackList implements StorageObject public void setupDefaults() { - Material[] mat = { - Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET + Material[] mat = + { + Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET }; placement.addAll(Arrays.asList(mat)); } diff --git a/Essentials/src/net/ess3/settings/commands/Afk.java b/Essentials/src/net/ess3/settings/commands/Afk.java index 5136dd8d0..2f3ab65dd 100644 --- a/Essentials/src/net/ess3/settings/commands/Afk.java +++ b/Essentials/src/net/ess3/settings/commands/Afk.java @@ -11,22 +11,21 @@ import net.ess3.storage.StorageObject; public class Afk implements StorageObject { @Comment( - { - "After this timeout in seconds, the user will be set as afk.", "Set to -1 for no timeout." - }) + { + "After this timeout in seconds, the user will be set as afk.", "Set to -1 for no timeout." + }) private long autoAFK = 300; @Comment( - { - "Auto-AFK Kick", "After this timeout in seconds, the user will be kicked from the server.", "Set to -1 for no timeout." - }) + { + "Auto-AFK Kick", "After this timeout in seconds, the user will be kicked from the server.", "Set to -1 for no timeout." + }) private long autoAFKKick = -1; @Comment( - { - "Set this to true, if you want to freeze the player, if he is afk.", "Other players or monsters can't push him out of afk mode then.", - "This will also enable temporary god mode for the afk player.", "The player has to use the command /afk to leave the afk mode.", - "You have to add a message to your welcome message or help page,", "since the player will not get a message, if he tries to move." - }) + { + "Set this to true, if you want to freeze the player, if he is afk.", "Other players or monsters can't push him out of afk mode then.", + "This will also enable temporary god mode for the afk player.", "The player has to use the command /afk to leave the afk mode.", + "You have to add a message to your welcome message or help page,", "since the player will not get a message, if he tries to move." + }) private boolean freezeAFKPlayers = false; - private boolean disableItemPickupWhileAfk = true; } diff --git a/Essentials/src/net/ess3/settings/commands/Back.java b/Essentials/src/net/ess3/settings/commands/Back.java index c0e7ed7b6..e83c53860 100644 --- a/Essentials/src/net/ess3/settings/commands/Back.java +++ b/Essentials/src/net/ess3/settings/commands/Back.java @@ -11,9 +11,9 @@ import net.ess3.storage.StorageObject; public class Back implements StorageObject { @Comment( - { - "Do you want essentials to keep track of previous location for /back in the teleport listener?", - "If you set this to true any plugin that uses teleport will have the previous location registered." - }) + { + "Do you want essentials to keep track of previous location for /back in the teleport listener?", + "If you set this to true any plugin that uses teleport will have the previous location registered." + }) private boolean registerBackInListener = false; } diff --git a/Essentials/src/net/ess3/settings/commands/Help.java b/Essentials/src/net/ess3/settings/commands/Help.java index 77eeacb55..585426dce 100644 --- a/Essentials/src/net/ess3/settings/commands/Help.java +++ b/Essentials/src/net/ess3/settings/commands/Help.java @@ -13,11 +13,11 @@ public class Help implements StorageObject @Comment("Show other plugins commands in help") private boolean showNonEssCommandsInHelp = true; @Comment( - { - "Hide plugins which don't give a permission in their plugin.yml for each command.", - "You can override a true value here for a single plugin by adding a permission to a user/group.", - "The individual permission is: essentials.help.<plugin>, anyone with essentials.* or '*' will see all help this setting reguardless.", - "You can use negative permissions to remove access to just a single plugins help if the following is enabled." - }) + { + "Hide plugins which don't give a permission in their plugin.yml for each command.", + "You can override a true value here for a single plugin by adding a permission to a user/group.", + "The individual permission is: essentials.help.<plugin>, anyone with essentials.* or '*' will see all help this setting reguardless.", + "You can use negative permissions to remove access to just a single plugins help if the following is enabled." + }) private boolean hidePermissionlessCommands = true; } diff --git a/Essentials/src/net/ess3/settings/commands/Home.java b/Essentials/src/net/ess3/settings/commands/Home.java index 2ef08fe1f..8b4c7356b 100644 --- a/Essentials/src/net/ess3/settings/commands/Home.java +++ b/Essentials/src/net/ess3/settings/commands/Home.java @@ -13,11 +13,11 @@ public class Home implements StorageObject @Comment("When players die, should they respawn at their homes, instead of the spawnpoint?") private boolean respawnAtHome = false; @Comment( - { - "When a player interacts with a bed, should their home be set to that location?", - "If you enable this and remove default player access to the /sethome command, ", - "you can make beds the only way for players to set their home location." - }) + { + "When a player interacts with a bed, should their home be set to that location?", + "If you enable this and remove default player access to the /sethome command, ", + "you can make beds the only way for players to set their home location." + }) private boolean bedSetsHome = false; @Comment("If no home is set, should the player be send to spawn, when /home is used.") private boolean spawnIfNoHome = false; diff --git a/Essentials/src/net/ess3/settings/commands/List.java b/Essentials/src/net/ess3/settings/commands/List.java index e2b869aaf..ea47d9115 100644 --- a/Essentials/src/net/ess3/settings/commands/List.java +++ b/Essentials/src/net/ess3/settings/commands/List.java @@ -1,6 +1,5 @@ package net.ess3.settings.commands; - import lombok.Data; import lombok.EqualsAndHashCode; import net.ess3.storage.Comment; diff --git a/Essentials/src/net/ess3/settings/commands/SocialSpy.java b/Essentials/src/net/ess3/settings/commands/SocialSpy.java index 4460c0cfd..9cb572689 100644 --- a/Essentials/src/net/ess3/settings/commands/SocialSpy.java +++ b/Essentials/src/net/ess3/settings/commands/SocialSpy.java @@ -21,7 +21,6 @@ public class SocialSpy implements StorageObject socialspyCommands.addAll(Arrays.asList("msg", "r", "mail", "m", "t", "emsg", "tell", "er", "reply", "ereply", "email")); } } - @ListType @Comment("Commands to listen for in socialspy") private List<String> socialspyCommands = new ArrayList<String>(); diff --git a/Essentials/src/net/ess3/settings/commands/Speed.java b/Essentials/src/net/ess3/settings/commands/Speed.java index 295a6a1b3..b9e7a8988 100644 --- a/Essentials/src/net/ess3/settings/commands/Speed.java +++ b/Essentials/src/net/ess3/settings/commands/Speed.java @@ -10,9 +10,14 @@ import net.ess3.storage.StorageObject; @EqualsAndHashCode(callSuper = false) public class Speed implements StorageObject { - @Comment({"Set the max fly speed, values range from 0.2 to 1.0"}) + @Comment( + { + "Set the max fly speed, values range from 0.2 to 1.0" + }) private double maxFlySpeed = 1.0f; - - @Comment({"Set the max walk speed, values range from 0.1 to 1.0"}) + @Comment( + { + "Set the max walk speed, values range from 0.1 to 1.0" + }) private double maxWalkSpeed = 0.8f; } diff --git a/Essentials/src/net/ess3/settings/commands/Teleport.java b/Essentials/src/net/ess3/settings/commands/Teleport.java index ffa576410..71b41028d 100644 --- a/Essentials/src/net/ess3/settings/commands/Teleport.java +++ b/Essentials/src/net/ess3/settings/commands/Teleport.java @@ -11,17 +11,20 @@ import net.ess3.storage.StorageObject; public class Teleport implements StorageObject { @Comment( - { - "Set timeout in seconds for players to accept tpa before request is cancelled.", "Set to 0 for no timeout." - }) + { + "Set timeout in seconds for players to accept tpa before request is cancelled.", "Set to 0 for no timeout." + }) private int requestTimeout = 120; - @Comment({"Cancels a request made by tpa / tphere on world change to prevent cross world tp"}) + @Comment( + { + "Cancels a request made by tpa / tphere on world change to prevent cross world tp" + }) private boolean cancelRequestsOnWorldChange = false; @Comment( - { - "The delay, in seconds, a player can't be attacked by other players after he has been teleported by a command", - "This will also prevent that the player can attack other players" - }) + { + "The delay, in seconds, a player can't be attacked by other players after he has been teleported by a command", + "This will also prevent that the player can attack other players" + }) private long invulnerability = 0; public long getInvulnerability() diff --git a/Essentials/src/net/ess3/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java index 553776c9d..524afe6f2 100644 --- a/Essentials/src/net/ess3/settings/protect/Prevent.java +++ b/Essentials/src/net/ess3/settings/protect/Prevent.java @@ -10,7 +10,6 @@ import net.ess3.storage.StorageObject; @EqualsAndHashCode(callSuper = false) public class Prevent implements StorageObject { - private boolean lavaFlow = false; private boolean waterFlow = false; // private boolean waterbucketFlow = false; TODO: Test if this still works @@ -30,8 +29,8 @@ public class Prevent implements StorageObject private boolean endermanPickup = false; private boolean villagerDeath = false; @Comment( - { - "Monsters won't follow players", "permission essentials.protect.entitytarget.bypass disables this" - }) + { + "Monsters won't follow players", "permission essentials.protect.entitytarget.bypass disables this" + }) private boolean entitytarget = false; }
\ No newline at end of file diff --git a/Essentials/src/net/ess3/settings/protect/Protect.java b/Essentials/src/net/ess3/settings/protect/Protect.java index ff4af10ff..420c5028e 100644 --- a/Essentials/src/net/ess3/settings/protect/Protect.java +++ b/Essentials/src/net/ess3/settings/protect/Protect.java @@ -13,15 +13,13 @@ public class Protect implements StorageObject @Comment("General physics/behavior modifications") private Prevent prevent = new Prevent(); @Comment( - { - "Maximum height the creeper should explode. -1 allows them to explode everywhere.", - "Set prevent.creeper-explosion to true, if you want to disable creeper explosions." - }) + { + "Maximum height the creeper should explode. -1 allows them to explode everywhere.", + "Set prevent.creeper-explosion to true, if you want to disable creeper explosions." + }) private int creeperMaxHeight = -1; - @Comment("Disable weather options") private boolean disableStorm = false; private boolean disableThunder = false; private boolean disableLighting = false; - } diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index b38f5750b..714138349 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -11,8 +11,8 @@ import org.bukkit.Bukkit; public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> implements Runnable { - private final transient Class<T> clazz; - private final transient IEssentials ess; + private final Class<T> clazz; + private final IEssentials ess; public AbstractDelayedYamlFileReader(final IEssentials ess, final Class<T> clazz) { diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index 2a74c4cd5..ade8eeb93 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -11,8 +11,8 @@ import org.bukkit.Bukkit; public abstract class AbstractDelayedYamlFileWriter implements Runnable { - private final transient IEssentials ess; - private final transient ReentrantLock lock = new ReentrantLock(); // TODO: Needed? + private final IEssentials ess; + private final ReentrantLock lock = new ReentrantLock(); // TODO: Needed? public AbstractDelayedYamlFileWriter(final IEssentials ess) { diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java index d4239db8e..b4a82b2bc 100644 --- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java @@ -10,14 +10,14 @@ import org.bukkit.Bukkit; public abstract class AsyncStorageObjectHolder<T extends StorageObject> implements IStorageObjectHolder<T> { - private transient T data; - private final transient Class<T> clazz; - protected final transient IEssentials ess; - private final transient StorageObjectDataWriter writer; - private final transient StorageObjectDataReader reader; - private final transient AtomicBoolean loaded = new AtomicBoolean(false); + private T data; + private final Class<T> clazz; + protected final IEssentials ess; + private final StorageObjectDataWriter writer; + private final StorageObjectDataReader reader; + private final AtomicBoolean loaded = new AtomicBoolean(false); private volatile long savetime = 0; - private final transient File file; + private final File file; public AsyncStorageObjectHolder(final IEssentials ess, final Class<T> clazz, final File file) { diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index 89f20cdf8..666c07931 100644 --- a/Essentials/src/net/ess3/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -21,9 +21,9 @@ import org.yaml.snakeyaml.nodes.*; public class BukkitConstructor extends Constructor { - private final transient Pattern DATAPATTERN = Pattern.compile("[:+',;.]"); - private final transient Pattern WORD = Pattern.compile("\\W"); - private final transient IPlugin plugin; + private final Pattern DATAPATTERN = Pattern.compile("[:+',;.]"); + private final Pattern WORD = Pattern.compile("\\W"); + private final IPlugin plugin; public BukkitConstructor(final Class<?> clazz, final IPlugin plugin) { diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index 0c3def687..90429968a 100644 --- a/Essentials/src/net/ess3/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -18,7 +18,7 @@ import org.bukkit.Bukkit; public class ManagedFile { private final static int BUFFERSIZE = 1024 * 8; - private final transient File file; + private final File file; public ManagedFile(final String filename, final IEssentials ess) { diff --git a/Essentials/src/net/ess3/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java index bb7894b51..aeaf14892 100644 --- a/Essentials/src/net/ess3/storage/StorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java @@ -26,11 +26,11 @@ import org.apache.commons.io.IOUtils; public abstract class StorageObjectMap<I> extends CacheLoader<String, I> implements IStorageObjectMap<I> { - protected final transient IEssentials ess; - private final transient File folder; - protected final transient Cache<String, I> cache = CacheBuilder.newBuilder().softValues().build(this); - protected final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>(); - protected final transient ConcurrentSkipListMap<String, File> zippedfiles = new ConcurrentSkipListMap<String, File>(); + protected final IEssentials ess; + private final File folder; + protected final Cache<String, I> cache = CacheBuilder.newBuilder().softValues().build(this); + protected final ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>(); + protected final ConcurrentSkipListMap<String, File> zippedfiles = new ConcurrentSkipListMap<String, File>(); private final Pattern zipCheck = Pattern.compile("^[a-zA-Z0-9]*-?[a-zA-Z0-9]+\\.yml$"); public StorageObjectMap(final IEssentials ess, final String folderName) diff --git a/Essentials/src/net/ess3/storage/StorageQueue.java b/Essentials/src/net/ess3/storage/StorageQueue.java index 5084ba82f..d602ad84e 100644 --- a/Essentials/src/net/ess3/storage/StorageQueue.java +++ b/Essentials/src/net/ess3/storage/StorageQueue.java @@ -15,7 +15,7 @@ public class StorageQueue implements Runnable private DelayQueue<WriteRequest> queue = new DelayQueue<WriteRequest>(); public final static long DELAY = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS); private final AtomicBoolean enabled = new AtomicBoolean(false); - private final transient Object lock = new Object(); + private final Object lock = new Object(); private final IPlugin plugin; public StorageQueue(IPlugin plugin) diff --git a/Essentials/src/net/ess3/storage/YamlStorageReader.java b/Essentials/src/net/ess3/storage/YamlStorageReader.java index f49a0b5a2..0cb0197b0 100644 --- a/Essentials/src/net/ess3/storage/YamlStorageReader.java +++ b/Essentials/src/net/ess3/storage/YamlStorageReader.java @@ -13,10 +13,10 @@ import org.yaml.snakeyaml.introspector.BeanAccess; public class YamlStorageReader implements IStorageReader { - private transient static final Map<Class<?>, Yaml> PREPARED_YAMLS = Collections.synchronizedMap(new HashMap<Class<?>, Yaml>()); - private transient static final Map<Class<?>, ReentrantLock> LOCKS = new HashMap<Class<?>, ReentrantLock>(); - private transient final Reader reader; - private transient final IPlugin plugin; + private static final Map<Class<?>, Yaml> PREPARED_YAMLS = Collections.synchronizedMap(new HashMap<Class<?>, Yaml>()); + private static final Map<Class<?>, ReentrantLock> LOCKS = new HashMap<Class<?>, ReentrantLock>(); + private final Reader reader; + private final IPlugin plugin; public YamlStorageReader(final Reader reader, final IPlugin plugin) { diff --git a/Essentials/src/net/ess3/storage/YamlStorageWriter.java b/Essentials/src/net/ess3/storage/YamlStorageWriter.java index e5de1460b..2591af79c 100644 --- a/Essentials/src/net/ess3/storage/YamlStorageWriter.java +++ b/Essentials/src/net/ess3/storage/YamlStorageWriter.java @@ -20,9 +20,9 @@ import org.yaml.snakeyaml.Yaml; public class YamlStorageWriter implements IStorageWriter { - private transient static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W"); - private transient final PrintWriter writer; - private transient static final Yaml YAML = new Yaml(); + private static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W"); + private final PrintWriter writer; + private static final Yaml YAML = new Yaml(); public YamlStorageWriter(final PrintWriter writer) { @@ -51,7 +51,7 @@ public class YamlStorageWriter implements IStorageWriter for (Field field : clazz.getDeclaredFields()) { final int modifier = field.getModifiers(); - if (Modifier.isPrivate(modifier) && !Modifier.isTransient(modifier) && !Modifier.isStatic(modifier)) + if (Modifier.isPrivate(modifier) && !Modifier.isStatic(modifier)) { field.setAccessible(true); diff --git a/Essentials/src/net/ess3/user/CooldownException.java b/Essentials/src/net/ess3/user/CooldownException.java index 08e163522..2cd9ac543 100644 --- a/Essentials/src/net/ess3/user/CooldownException.java +++ b/Essentials/src/net/ess3/user/CooldownException.java @@ -3,12 +3,10 @@ package net.ess3.user; public class CooldownException extends Exception { - private static final long serialVersionUID = 913632836257457319L; public CooldownException(String timeLeft) { super(timeLeft); } - } diff --git a/Essentials/src/net/ess3/user/IOfflinePlayer.java b/Essentials/src/net/ess3/user/IOfflinePlayer.java index d520ce833..97a9ade5a 100644 --- a/Essentials/src/net/ess3/user/IOfflinePlayer.java +++ b/Essentials/src/net/ess3/user/IOfflinePlayer.java @@ -10,7 +10,6 @@ public interface IOfflinePlayer String getDisplayName(); //Location getBedSpawnLocation(); - void setBanned(boolean bln); boolean hasPermission(Permission perm); diff --git a/Essentials/src/net/ess3/user/IOfflineUser.java b/Essentials/src/net/ess3/user/IOfflineUser.java index b5361da4f..237569825 100644 --- a/Essentials/src/net/ess3/user/IOfflineUser.java +++ b/Essentials/src/net/ess3/user/IOfflineUser.java @@ -5,5 +5,4 @@ import net.ess3.storage.IStorageObjectHolder; public interface IOfflineUser extends IStorageObjectHolder<UserData>//, IOfflinePlayer { - } diff --git a/Essentials/src/net/ess3/user/PlayerNotFoundException.java b/Essentials/src/net/ess3/user/PlayerNotFoundException.java index 2c3c741c1..6817a7847 100644 --- a/Essentials/src/net/ess3/user/PlayerNotFoundException.java +++ b/Essentials/src/net/ess3/user/PlayerNotFoundException.java @@ -5,7 +5,6 @@ import static net.ess3.I18n._; public class PlayerNotFoundException extends Exception { - private static final long serialVersionUID = -510752839980332640L; public PlayerNotFoundException() diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index 4fce959bf..7a3aba0af 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -31,22 +31,22 @@ public class User extends UserBase implements IUser { private CommandSender replyTo = null; @Getter - private transient IUser teleportRequester; + private IUser teleportRequester; @Getter - private transient boolean tpRequestHere; + private boolean tpRequestHere; @Getter - private transient final ITeleport teleport; + private final ITeleport teleport; @Getter - private transient long teleportRequestTime; + private long teleportRequestTime; @Getter @Setter - private transient long lastOnlineActivity; - private transient long lastActivity = System.currentTimeMillis(); + private long lastOnlineActivity; + private long lastActivity = System.currentTimeMillis(); /*@Getter @Setter private boolean hidden = false;*/ @Getter - private transient boolean vanished; + private boolean vanished; @Getter @Setter private boolean invSee = false; @@ -54,7 +54,7 @@ public class User extends UserBase implements IUser @Setter private boolean enderSee = false; private long lastThrottledAction; - private transient Location afkPosition; + private Location afkPosition; private AtomicBoolean gotMailInfo = new AtomicBoolean(false); private WeakReference<Player> playerCache; @Getter @@ -592,8 +592,7 @@ public class User extends UserBase implements IUser { return true; } - - private transient long teleportInvulnerabilityTimestamp = 0; + private long teleportInvulnerabilityTimestamp = 0; public void enableInvulnerabilityAfterTeleport() { @@ -635,7 +634,7 @@ public class User extends UserBase implements IUser } } ess.getVanishedPlayers().add(getName()); - if(Permissions.VANISH_EFFECT.isAuthorized(this)) + if (Permissions.VANISH_EFFECT.isAuthorized(this)) { getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false)); } @@ -647,7 +646,7 @@ public class User extends UserBase implements IUser p.showPlayer(getPlayer()); } ess.getVanishedPlayers().remove(getName()); - if(Permissions.VANISH_EFFECT.isAuthorized(this)) + if (Permissions.VANISH_EFFECT.isAuthorized(this)) { getPlayer().removePotionEffect(PotionEffectType.INVISIBILITY); } diff --git a/Essentials/src/net/ess3/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java index b9d684930..9b63fab2f 100644 --- a/Essentials/src/net/ess3/user/UserData.java +++ b/Essentials/src/net/ess3/user/UserData.java @@ -6,6 +6,7 @@ import net.ess3.storage.*; import org.bukkit.Location; import org.bukkit.Material; + @Data @EqualsAndHashCode(callSuper = false) public class UserData implements StorageObject @@ -14,8 +15,6 @@ public class UserData implements StorageObject { JAIL, MUTE, LASTHEAL, LASTTELEPORT, LOGIN, LOGOUT, KIT, COMMAND } - - private String nickname; private Double money; @MapValueType(StoredLocation.class) @@ -27,7 +26,6 @@ public class UserData implements StorageObject { return homes == null ? Collections.<String, StoredLocation>emptyMap() : Collections.unmodifiableMap(homes); } - @ListType(Material.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) @@ -37,7 +35,6 @@ public class UserData implements StorageObject { return unlimited == null ? Collections.<Material>emptySet() : Collections.unmodifiableSet(unlimited); } - @MapValueType(List.class) @MapKeyType(Material.class) @Getter(AccessLevel.NONE) @@ -48,7 +45,6 @@ public class UserData implements StorageObject { return powerTools == null ? Collections.<Material, List<String>>emptyMap() : Collections.unmodifiableMap(powerTools); } - private StoredLocation lastLocation; @MapKeyType(String.class) @MapValueType(Long.class) @@ -60,7 +56,6 @@ public class UserData implements StorageObject { return timestamps == null ? Collections.<String, Long>emptyMap() : Collections.unmodifiableMap(timestamps); } - private String jail; @ListType @Getter(AccessLevel.NONE) @@ -71,7 +66,6 @@ public class UserData implements StorageObject { return mails == null ? Collections.<String>emptyList() : Collections.unmodifiableList(mails); } - private Inventory inventory; private boolean teleportEnabled; @ListType @@ -83,7 +77,6 @@ public class UserData implements StorageObject { return ignore == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(ignore); } - private boolean godmode; private boolean muted; private boolean jailed; diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java index c83047f0c..9df31e543 100644 --- a/Essentials/src/net/ess3/user/UserMap.java +++ b/Essentials/src/net/ess3/user/UserMap.java @@ -141,7 +141,6 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap { return matchUsers(name, false, false, requester); } - private final Pattern comma = Pattern.compile(","); public Set<IUser> matchUsers(final String name, final boolean includeHidden, final boolean includeOffline, final Player requester) diff --git a/Essentials/src/net/ess3/utils/DateUtil.java b/Essentials/src/net/ess3/utils/DateUtil.java index 2a38fd7a4..baf850034 100644 --- a/Essentials/src/net/ess3/utils/DateUtil.java +++ b/Essentials/src/net/ess3/utils/DateUtil.java @@ -30,11 +30,13 @@ public class DateUtil } StringBuilder sb = new StringBuilder(); - int[] types = new int[]{ - Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH, Calendar.HOUR_OF_DAY, Calendar.MINUTE, Calendar.SECOND + int[] types = new int[] + { + Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH, Calendar.HOUR_OF_DAY, Calendar.MINUTE, Calendar.SECOND }; - String[] names = new String[]{ - _("year"), _("years"), _("month"), _("months"), _("day"), _("days"), _("hour"), _("hours"), _("minute"), _("minutes"), _("second"), _("seconds") + String[] names = new String[] + { + _("year"), _("years"), _("month"), _("months"), _("day"), _("days"), _("hour"), _("hours"), _("minute"), _("minutes"), _("second"), _("seconds") }; for (int i = 0; i < types.length; i++) { diff --git a/Essentials/src/net/ess3/utils/ExecuteTimer.java b/Essentials/src/net/ess3/utils/ExecuteTimer.java index 012ab9296..97b4174d9 100644 --- a/Essentials/src/net/ess3/utils/ExecuteTimer.java +++ b/Essentials/src/net/ess3/utils/ExecuteTimer.java @@ -9,9 +9,8 @@ import java.util.Locale; public class ExecuteTimer { - private final transient List<ExecuteRecord> times; - private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US)); - + private final List<ExecuteRecord> times; + private final DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US)); public ExecuteTimer() { diff --git a/Essentials/src/net/ess3/utils/FormatUtil.java b/Essentials/src/net/ess3/utils/FormatUtil.java index 4cba2a71b..bbc690e79 100644 --- a/Essentials/src/net/ess3/utils/FormatUtil.java +++ b/Essentials/src/net/ess3/utils/FormatUtil.java @@ -13,15 +13,15 @@ import net.ess3.permissions.DotStarPermission; public class FormatUtil { - static final transient Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])"); - static final transient Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)"); - static final transient Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])"); - static final transient Pattern VANILLA_PATTERN = Pattern.compile("\u00a7+[0-9A-FK-ORa-fk-or]"); - static final transient Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]"); - static final transient Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])"); - static final transient Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]"); - static final transient Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]"); - static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)"); + static final Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])"); + static final Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)"); + static final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])"); + static final Pattern VANILLA_PATTERN = Pattern.compile("\u00a7+[0-9A-FK-ORa-fk-or]"); + static final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]"); + static final Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])"); + static final Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]"); + static final Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]"); + static final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)"); static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US)); static String stripColor(final String input, final Pattern pattern) diff --git a/Essentials/src/net/ess3/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java index 5d2af4000..64fa71f78 100644 --- a/Essentials/src/net/ess3/utils/LocationUtil.java +++ b/Essentials/src/net/ess3/utils/LocationUtil.java @@ -69,7 +69,6 @@ public class LocationUtil } return block.getLocation(); } - public final static int RADIUS = 3; public final static Vector3D[] VOLUME; @@ -82,13 +81,11 @@ public class LocationUtil this.y = y; this.z = z; } - public int x; public int y; public int z; } - static { List<Vector3D> pos = new ArrayList<Vector3D>(); @@ -213,7 +210,7 @@ public class LocationUtil } if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId())) || (!AIR_MATERIALS.contains( - world.getBlockAt(x, y + 1, z).getType().getId()))) + world.getBlockAt(x, y + 1, z).getType().getId()))) { return true; } diff --git a/Essentials/src/net/ess3/utils/Target.java b/Essentials/src/net/ess3/utils/Target.java index 6e871a051..04fa17e1f 100644 --- a/Essentials/src/net/ess3/utils/Target.java +++ b/Essentials/src/net/ess3/utils/Target.java @@ -30,4 +30,3 @@ public class Target return location; } } - diff --git a/Essentials/src/net/ess3/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java index 0817448bd..6f93b0909 100644 --- a/Essentials/src/net/ess3/utils/Util.java +++ b/Essentials/src/net/ess3/utils/Util.java @@ -16,7 +16,6 @@ public final class Util private Util() { } - private final static Pattern INVALIDFILECHARS = Pattern.compile("[^\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]"); private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]"); @@ -82,7 +81,7 @@ public final class Util public static ItemStack convertBlockToItem(final Block block) { final ItemStack is = new ItemStack(block.getType(), 1, block.getData()); - + final short durability = 0; switch (is.getType()) @@ -215,5 +214,4 @@ public final class Util } return buf.toString(); } - } diff --git a/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java index ee72d36df..c1946c84f 100644 --- a/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java +++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java @@ -2,38 +2,26 @@ package net.ess3.utils.gnu.inet.encoding; /** - * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software - * Foundation, Inc. + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. * * Author: Oliver Hitz * * This file is part of GNU Libidn. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA + * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - /** - * This class offers static methods for encoding/decoding strings - * using the Punycode algorithm. - * <ul> - * <li>RFC3492 Punycode - * </ul> - * Note that this implementation only supports 16-bit Unicode code - * points. + * This class offers static methods for encoding/decoding strings using the Punycode algorithm. <ul> <li>RFC3492 + * Punycode </ul> Note that this implementation only supports 16-bit Unicode code points. */ /* * Changes by snowleo: @@ -124,7 +112,7 @@ public class Punycode { int q = delta; - for (int k = BASE; ; k += BASE) + for (int k = BASE;; k += BASE) { int t; if (k <= bias) @@ -203,7 +191,7 @@ public class Punycode int oldi = i; int w = 1; - for (int k = BASE; ; k += BASE) + for (int k = BASE;; k += BASE) { if (d == input.length()) { diff --git a/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java index 7e4da7d79..fb1f3d0ce 100644 --- a/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java +++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java @@ -2,30 +2,23 @@ package net.ess3.utils.gnu.inet.encoding; /** - * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software - * Foundation, Inc. + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. * * Author: Oliver Hitz * * This file is part of GNU Libidn. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA + * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - /** * Exception handling for Punycode class. */ diff --git a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java index 9fdc87c9b..31b1ac991 100644 --- a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java +++ b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java @@ -8,7 +8,7 @@ import java.util.Map; public class ArrayListInput implements IText { - private final transient List<String> lines = new ArrayList<String>(); + private final List<String> lines = new ArrayList<String>(); @Override public List<String> getLines() @@ -27,5 +27,4 @@ public class ArrayListInput implements IText { return Collections.emptyMap(); } - } diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java index e6510a2e3..44215c17f 100644 --- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -18,9 +18,9 @@ public class HelpInput implements IText private static final String DESCRIPTION = "description"; private static final String PERMISSION = "permission"; private static final String PERMISSIONS = "permissions"; - private final transient List<String> lines = new ArrayList<String>(); - private final transient List<String> chapters = new ArrayList<String>(); - private final transient Map<String, Integer> bookmarks = new HashMap<String, Integer>(); + private final List<String> lines = new ArrayList<String>(); + private final List<String> chapters = new ArrayList<String>(); + private final Map<String, Integer> bookmarks = new HashMap<String, Integer>(); private final static Logger logger = Logger.getLogger("Minecraft"); public HelpInput(final IUser user, final String match, final IEssentials ess) throws IOException @@ -56,8 +56,8 @@ public class HelpInput implements IText try { if (!match.equalsIgnoreCase("") && (!pluginNameLow.contains(match)) && (!k.getKey().toLowerCase(Locale.ENGLISH).contains( - match)) && (!(k.getValue().get(DESCRIPTION) instanceof String && ((String)k.getValue().get(DESCRIPTION)).toLowerCase( - Locale.ENGLISH).contains(match)))) + match)) && (!(k.getValue().get(DESCRIPTION) instanceof String && ((String)k.getValue().get(DESCRIPTION)).toLowerCase( + Locale.ENGLISH).contains(match)))) { continue; } diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java index 22466e0ac..1194aa266 100644 --- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java @@ -17,9 +17,9 @@ import org.bukkit.plugin.Plugin; public class KeywordReplacer implements IText { - private final transient IText input; - private final transient List<String> replaced; - private final transient IEssentials ess; + private final IText input; + private final List<String> replaced; + private final IEssentials ess; public KeywordReplacer(final IText input, final CommandSender sender, final IEssentials ess) { @@ -34,15 +34,15 @@ public class KeywordReplacer implements IText String displayName, ipAddress, balance, mails, world; String worlds, online, unique, playerlist, date, time; String worldTime12, worldTime24, worldDate, plugins; - String userName, address, version; //TODO: unused? + String version; if (sender instanceof IUser) { final IUser user = (IUser)sender; final Player player = user.getPlayer(); displayName = player.getDisplayName(); - userName = player.getName(); + String userName = player.getName(); //TODO: unused ipAddress = player.getAddress() == null || player.getAddress().getAddress() == null ? "" : player.getAddress().getAddress().toString(); - address = player.getAddress() == null ? "" : player.getAddress().toString(); + String address = player.getAddress() == null ? "" : player.getAddress().toString(); // TODO: unused balance = FormatUtil.displayCurrency(user.getMoney(), ess); mails = Integer.toString(user.getData().getMails() == null ? 0 : user.getData().getMails().size()); world = player.getLocation() == null || player.getLocation().getWorld() == null ? "" : player.getLocation().getWorld().getName(); diff --git a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java index 03405df29..6ef3731c1 100644 --- a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java @@ -8,7 +8,7 @@ import java.util.Map; public class SimpleTextInput implements IText { - private final transient List<String> lines = new ArrayList<String>(); + private final List<String> lines = new ArrayList<String>(); public SimpleTextInput(final String input) { @@ -32,5 +32,4 @@ public class SimpleTextInput implements IText { return Collections.emptyMap(); } - } diff --git a/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java index ea70010b6..0b850b509 100644 --- a/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java @@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender; public class SimpleTextPager { - private final transient IText text; + private final IText text; public SimpleTextPager(final IText text) { diff --git a/Essentials/src/net/ess3/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java index ca38cd528..090afd948 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java @@ -13,10 +13,10 @@ import org.bukkit.command.CommandSender; public class TextInput implements IText { - private final transient List<String> lines; - private final transient List<String> chapters; - private final transient Map<String, Integer> bookmarks; - private final transient long lastChange; + private final List<String> lines; + private final List<String> chapters; + private final Map<String, Integer> bookmarks; + private final long lastChange; private final static HashMap<String, SoftReference<TextInput>> cache = new HashMap<String, SoftReference<TextInput>>(); public TextInput(final CommandSender sender, final String filename, final boolean createFile, final IEssentials ess) throws IOException diff --git a/Essentials/src/net/ess3/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java index 88f00125c..965bb0d2f 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java @@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender; public class TextPager { - private final transient IText text; - private final transient boolean onePage; + private final IText text; + private final boolean onePage; public TextPager(final IText text) { |