Cleanup :: Standardize import organization :: lots of comments :: remove unused eco systems

Essentials/src/net/ess3/Console.java

@@ -1,7 +1,7 @@
 package net.ess3;
 
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IReplyTo;
+import org.bukkit.command.CommandSender;
 
 
 public final class Console implements IReplyTo

Essentials/src/net/ess3/Essentials.java

@@ -17,19 +17,15 @@
  */
 package net.ess3;
 
-import static net.ess3.I18n._;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.InvalidDescriptionException;
 import lombok.Getter;
 import lombok.Setter;
+import static net.ess3.I18n._;
 import net.ess3.api.*;
 import net.ess3.backup.Backup;
 import net.ess3.commands.EssentialsCommandHandler;
@@ -44,6 +40,10 @@ import net.ess3.settings.SpawnsHolder;
 import net.ess3.storage.StorageQueue;
 import net.ess3.user.UserMap;
 import net.ess3.utils.ExecuteTimer;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.InvalidDescriptionException;
 
 
 public class Essentials implements IEssentials

Essentials/src/net/ess3/EssentialsTimer.java

@@ -2,12 +2,12 @@ package net.ess3;
 
 import java.util.*;
 import java.util.logging.Level;
-import org.bukkit.entity.Player;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
+import org.bukkit.entity.Player;
 
 
 public class EssentialsTimer implements Runnable

Essentials/src/net/ess3/ItemDb.java

@@ -1,21 +1,20 @@
 package net.ess3;
 
-import static net.ess3.I18n._;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
-
+import static net.ess3.I18n._;
-import net.ess3.api.ISettings;
-import net.ess3.utils.Util;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IItemDb;
+import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.storage.ManagedFile;
+import net.ess3.utils.Util;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 
 
 public class ItemDb implements IItemDb
@@ -65,6 +64,7 @@ public class ItemDb implements IItemDb
 		}
 	}
 
+	@Override
 	public ItemStack get(final String id, final IUser user) throws Exception
 	{
 		final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH));

Essentials/src/net/ess3/Jails.java

@@ -1,6 +1,5 @@
 package net.ess3;
 
-import static net.ess3.I18n._;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -8,6 +7,11 @@ import java.util.Collections;
 import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IJails;
+import net.ess3.api.IUser;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -22,10 +26,6 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IJails;
-import net.ess3.api.IUser;
-import net.ess3.storage.AsyncStorageObjectHolder;
 
 
 public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails

Essentials/src/net/ess3/Kits.java

@@ -1,9 +1,8 @@
 package net.ess3;
 
-import static net.ess3.I18n._;
 import java.io.File;
 import java.util.*;
-import org.bukkit.inventory.ItemStack;
+import static net.ess3.I18n._;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IKits;
 import net.ess3.api.IUser;
@@ -12,6 +11,7 @@ import net.ess3.settings.Kit;
 import net.ess3.storage.AsyncStorageObjectHolder;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> implements IKits

Essentials/src/net/ess3/SpawnMob.java

@@ -1,16 +1,8 @@
 package net.ess3;
 
-import static net.ess3.I18n._;
 import java.util.*;
 import java.util.regex.Pattern;
-import org.bukkit.DyeColor;
+import static net.ess3.I18n._;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.*;
-import org.bukkit.material.Colorable;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
@@ -21,6 +13,14 @@ import net.ess3.permissions.Permissions;
 import net.ess3.user.User;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Util;
+import org.bukkit.DyeColor;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.*;
+import org.bukkit.material.Colorable;
 
 
 public class SpawnMob

Essentials/src/net/ess3/Teleport.java

@@ -1,11 +1,8 @@
 package net.ess3;
 
-import static net.ess3.I18n._;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import org.bukkit.Location;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ITeleport;
 import net.ess3.api.IUser;
@@ -16,6 +13,9 @@ import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Target;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Teleport implements Runnable, ITeleport
@@ -253,6 +253,7 @@ public class Teleport implements Runnable, ITeleport
 	}
 
 	//The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere
+	@Override
 	public void teleportToMe(IUser otherUser, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		final Target target = new Target(user.getPlayer());

Essentials/src/net/ess3/Warps.java

@@ -1,9 +1,8 @@
 package net.ess3;
 
-import static net.ess3.I18n._;
 import java.io.File;
 import java.util.*;
-import org.bukkit.Location;
+import static net.ess3.I18n._;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IWarp;
 import net.ess3.api.IWarps;
@@ -11,6 +10,7 @@ import net.ess3.api.InvalidNameException;
 import net.ess3.commands.WarpNotFoundException;
 import net.ess3.settings.WarpHolder;
 import net.ess3.storage.StorageObjectMap;
+import org.bukkit.Location;
 
 
 public class Warps extends StorageObjectMap<IWarp> implements IWarps

Essentials/src/net/ess3/api/IEssentials.java

@@ -2,13 +2,13 @@ package net.ess3.api;
 
 import java.util.List;
 import java.util.logging.Logger;
-import org.bukkit.Server;
-import org.bukkit.World;
 import net.ess3.EssentialsTimer;
 import net.ess3.economy.register.Methods;
 import net.ess3.metrics.Metrics;
 import net.ess3.settings.SpawnsHolder;
 import net.ess3.storage.StorageQueue;
+import org.bukkit.Server;
+import org.bukkit.World;
 
 
 public interface IEssentials extends IComponent

Essentials/src/net/ess3/api/IPlugin.java

@@ -132,7 +132,7 @@ public interface IPlugin extends Plugin
 	public void onPluginDisable(Plugin plugin);
 
 	/**
-	 * Register a module with Essentils
+	 * Register a module with Essentials
 	 *
 	 * @param module - Your plugin instance
 	 */

Essentials/src/net/ess3/api/ITeleport.java

@@ -1,10 +1,10 @@
 package net.ess3.api;
 
+import net.ess3.economy.Trade;
+import net.ess3.utils.Target;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import net.ess3.economy.Trade;
-import net.ess3.utils.Target;
 
 
 public interface ITeleport

Essentials/src/net/ess3/api/IUser.java

@@ -2,20 +2,20 @@ package net.ess3.api;
 
 import java.util.List;
 import java.util.Set;
+import net.ess3.storage.IStorageObjectHolder;
+import net.ess3.user.CooldownException;
+import net.ess3.user.UserData;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import net.ess3.storage.IStorageObjectHolder;
-import net.ess3.user.CooldownException;
-import net.ess3.user.UserData;
 
 
 public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolder<UserData>, IReload, IReplyTo, Comparable<IUser>
 {
 	/**
-	 * Get the ammount of money in a users account
+	 * Get the amount of money in a users account
 	 *
 	 * @return
 	 */

Essentials/src/net/ess3/api/IUserMap.java

@@ -2,9 +2,9 @@ package net.ess3.api;
 
 import java.io.File;
 import java.util.Set;
-import org.bukkit.entity.Player;
 import net.ess3.user.PlayerNotFoundException;
 import net.ess3.user.TooManyMatchesException;
+import org.bukkit.entity.Player;
 
 
 public interface IUserMap extends IReload

Essentials/src/net/ess3/backup/Backup.java

@@ -1,16 +1,16 @@
 package net.ess3.backup;
 
-import static net.ess3.I18n._;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
-import org.bukkit.Server;
+import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IBackup;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ISettings;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Backup implements Runnable, IBackup

Essentials/src/net/ess3/bukkit/BukkitPlugin.java

@@ -1,12 +1,21 @@
 package net.ess3.bukkit;
 
-import static net.ess3.I18n._;
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
+import net.ess3.Essentials;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IPlugin;
+import net.ess3.listener.EssentialsBlockListener;
+import net.ess3.listener.EssentialsEntityListener;
+import net.ess3.listener.EssentialsPlayerListener;
+import net.ess3.listener.EssentialsPluginListener;
+import net.ess3.metrics.MetricsListener;
+import net.ess3.metrics.MetricsStarter;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -22,15 +31,6 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitTask;
-import net.ess3.Essentials;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IPlugin;
-import net.ess3.listener.EssentialsBlockListener;
-import net.ess3.listener.EssentialsEntityListener;
-import net.ess3.listener.EssentialsPlayerListener;
-import net.ess3.listener.EssentialsPluginListener;
-import net.ess3.metrics.MetricsListener;
-import net.ess3.metrics.MetricsStarter;
 
 
 public class BukkitPlugin extends JavaPlugin implements IPlugin

Essentials/src/net/ess3/bukkit/Enchantments.java

@@ -5,7 +5,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import net.ess3.utils.Util;
 import org.bukkit.enchantments.Enchantment;
 

Essentials/src/net/ess3/bukkit/LivingEntities.java

@@ -1,7 +1,7 @@
 package net.ess3.bukkit;
 
-import static net.ess3.I18n._;
 import java.util.*;
+import static net.ess3.I18n._;
 import org.bukkit.entity.EntityType;
 
 

Essentials/src/net/ess3/bukkit/PermissionFactory.java

@@ -1,12 +1,12 @@
 package net.ess3.bukkit;
 
 import java.util.StringTokenizer;
+import net.ess3.api.IPermission;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
-import net.ess3.api.IPermission;
 
 
 public class PermissionFactory

Essentials/src/net/ess3/bukkit/VersionCheck.java

@@ -1,10 +1,10 @@
 package net.ess3.bukkit;
 
-import static net.ess3.I18n._;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import static net.ess3.I18n._;
 import org.bukkit.plugin.PluginManager;
 
 

Essentials/src/net/ess3/commands/Commandbackup.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IBackup;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbackup extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbalance.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbalance extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbalancetop.java

@@ -1,17 +1,17 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData;
 import net.ess3.utils.FormatUtil;
 import net.ess3.utils.textreader.ArrayListInput;
 import net.ess3.utils.textreader.TextPager;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbalancetop extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbanip.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbanip extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbreak.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 
 
 public class Commandbreak extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbroadcast.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbroadcast extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandburn.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import net.ess3.api.IUser;
 
 
 public class Commandburn extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandclearinventory.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.List;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandclearinventory extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanddelhome.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
 
 
 public class Commanddelhome extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandeco.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandeco extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandenchant.java

@@ -1,17 +1,17 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import org.bukkit.enchantments.Enchantment;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.bukkit.Enchantments;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commandenchant extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandenderchest.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.entity.Player;
 
 
 public class Commandenderchest extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandessentials.java

@@ -1,7 +1,7 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Map;
+import static net.ess3.I18n._;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandexp.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.craftbukkit.SetExpFix;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandexp extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandext.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import net.ess3.api.IUser;
 
 
 public class Commandext extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandfeed.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Set;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandfeed extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandfireball.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
+import net.ess3.api.IUser;
 import org.bukkit.entity.*;
 import org.bukkit.util.Vector;
-import net.ess3.api.IUser;
 
 
 public class Commandfireball extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandfly.java

@@ -1,14 +1,15 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandfly extends EssentialsToggleCommand
 {
+	@Override
 	protected void setValue(final IUser player, final boolean value)
 	{
 		final Player realPlayer = player.getPlayer();
@@ -19,11 +20,13 @@ public class Commandfly extends EssentialsToggleCommand
 		}
 	}
 
+	@Override
 	protected boolean getValue(final IUser player)
 	{
 		return player.getPlayer().getAllowFlight();
 	}
 
+	@Override
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
 		if (value)
@@ -36,22 +39,26 @@ public class Commandfly extends EssentialsToggleCommand
 		}
 	}
 
+	@Override
 	protected void informPlayer(final IUser player)
 	{
 		final String message = _("flyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
 		player.sendMessage(message);
 	}
 
+	@Override
 	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.FLY_OTHERS.isAuthorized(user);
 	}
 
+	@Override
 	protected boolean isExempt(final CommandSender sender, final IUser player)
 	{
 		return Permissions.FLY_EXEMPT.isAuthorized(player);
 	}
 
+	@Override
 	protected boolean toggleOfflinePlayers()
 	{
 		return false;

Essentials/src/net/ess3/commands/Commandgamemode.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.GameMode;
+import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.GameMode;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandgamemode extends EssentialsSettingsCommand
@@ -25,6 +25,7 @@ public class Commandgamemode extends EssentialsSettingsCommand
 		return player.getPlayer().getGameMode();
 	}
 
+	@Override
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
 		if (value)
@@ -37,27 +38,32 @@ public class Commandgamemode extends EssentialsSettingsCommand
 		}
 	}
 
+	@Override
 	protected void informPlayer(final IUser player)
 	{
 		final String message = _("gameMode", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName());
 		player.sendMessage(message);
 	}
 
+	@Override
 	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.GAMEMODE_OTHERS.isAuthorized(user);
 	}
 
+	@Override
 	protected boolean isExempt(final CommandSender sender, final IUser player)
 	{
 		return Permissions.GAMEMODE_EXEMPT.isAuthorized(player);
 	}
 
+	@Override
 	protected boolean toggleOfflinePlayers()
 	{
 		return false;
 	}
 
+	@Override
 	protected boolean canMatch(final String arg)
 	{
 		try
@@ -71,6 +77,7 @@ public class Commandgamemode extends EssentialsSettingsCommand
 		}
 	}
 
+	@Override
 	protected void playerMatch(final IUser player, final String arg) throws NotEnoughArgumentsException
 	{
 		if (arg == null)

Essentials/src/net/ess3/commands/Commandgc.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.lang.management.ManagementFactory;
+import static net.ess3.I18n._;
+import net.ess3.utils.DateUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import net.ess3.utils.DateUtil;
 
 
 public class Commandgc extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandgetpos.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 
 
 public class Commandgetpos extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandgive.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
+import org.bukkit.command.CommandSender;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commandgive extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandgod.java

@@ -1,24 +1,27 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandgod extends EssentialsToggleCommand
 {
+	@Override
 	protected void setValue(final IUser player, final boolean value)
 	{
 		player.setGodModeEnabled(value);
 		player.queueSave();
 	}
 
+	@Override
 	protected boolean getValue(final IUser player)
 	{
 		return player.isGodModeEnabled();
 	}
 
+	@Override
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
 		if (value)
@@ -31,17 +34,20 @@ public class Commandgod extends EssentialsToggleCommand
 		}
 	}
 
+	@Override
 	protected void informPlayer(final IUser player)
 	{
 		final String message = _("godMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
 		player.sendMessage(message);
 	}
 
+	@Override
 	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.GOD_OTHERS.isAuthorized(user);
 	}
 
+	@Override
 	protected boolean isExempt(final CommandSender sender, final IUser player)
 	{
 		return (player.isOnline() ? Permissions.GOD_EXEMPT.isAuthorized(player) : !Permissions.GOD_OFFLINE.isAuthorized(sender));

Essentials/src/net/ess3/commands/Commandhat.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.craftbukkit.InventoryWorkaround;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
-import net.ess3.api.IUser;
-import net.ess3.craftbukkit.InventoryWorkaround;
 
 
 public class Commandhat extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandheal.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Set;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandheal extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandhelp.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.utils.Util;
 import net.ess3.utils.textreader.*;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandhelp extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandhelpop.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.logging.Level;
-import org.bukkit.entity.Player;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.entity.Player;
 
 
 public class Commandhelpop extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandhome.java

@@ -1,16 +1,16 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.Set;
 import java.util.regex.Pattern;
-import org.bukkit.Location;
+import static net.ess3.I18n._;
-import org.bukkit.Material;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandhome extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandinfo.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
-import org.bukkit.command.CommandSender;
 import net.ess3.utils.textreader.IText;
 import net.ess3.utils.textreader.KeywordReplacer;
 import net.ess3.utils.textreader.TextInput;
 import net.ess3.utils.textreader.TextPager;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandinfo extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandinvsee.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Arrays;
-import org.bukkit.inventory.ItemStack;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.user.Inventory;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commandinvsee extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanditem.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import org.bukkit.enchantments.Enchantment;
+import static net.ess3.I18n._;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commanditem extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanditemdb.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.ItemStack;
-import net.ess3.api.IUser;
 
 
 public class Commanditemdb extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandjails.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
+import net.ess3.utils.Util;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import net.ess3.utils.Util;
 
 
 public class Commandjails extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandjump.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.Location;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.utils.LocationUtil;
+import org.bukkit.Location;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandjump extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkill.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 
 
 public class Commandkill extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkillall.java

@@ -1,8 +1,9 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Collections;
 import java.util.Locale;
+import static net.ess3.I18n._;
+import net.ess3.bukkit.LivingEntities;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -10,7 +11,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemStack;
-import net.ess3.bukkit.LivingEntities;
 
 
 public class Commandkillall extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkit.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Collection;
 import java.util.Locale;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;

Essentials/src/net/ess3/commands/Commandlightning.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.LightningStrike;
-import org.bukkit.entity.Player;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.LightningStrike;
+import org.bukkit.entity.Player;
 
 
 public class Commandlightning extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandlist.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.*;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandlist extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmail.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.List;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
 import net.ess3.utils.Util;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandmail extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmore.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.entity.Player;
+import static net.ess3.I18n._;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.ChargeException;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commandmore extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmotd.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
-import org.bukkit.command.CommandSender;
 import net.ess3.utils.textreader.IText;
 import net.ess3.utils.textreader.KeywordReplacer;
 import net.ess3.utils.textreader.TextInput;
 import net.ess3.utils.textreader.TextPager;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandmotd extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmsg.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Set;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import net.ess3.Console;
+import static net.ess3.I18n._;
 import net.ess3.api.IReplyTo;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandmsg extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmute.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandmute extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandnear.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 
 
 public class Commandnear extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandnick.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.Server;
+import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandnick extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandpowertool.java

@@ -1,15 +1,15 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import org.bukkit.Material;
+import static net.ess3.I18n._;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData;
 import net.ess3.utils.Util;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commandpowertool extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandptime.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.*;
-import org.bukkit.World;
+import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.DescParseTickFormat;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandptime extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandr.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.Console;
+import static net.ess3.I18n._;
 import net.ess3.api.IReplyTo;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandr extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandrealname.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.command.CommandSender;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.api.IUserMap;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandrealname extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandrecipe.java

@@ -1,15 +1,15 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.utils.Util;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.*;
-import net.ess3.api.IUser;
-import net.ess3.utils.Util;
 
 
 public class Commandrecipe extends EssentialsCommand
@@ -100,7 +100,7 @@ public class Commandrecipe extends EssentialsCommand
 		}
 		else
 		{
-			final HashMap<Material, String> colorMap = new HashMap<Material, String>();
+			final HashMap<Material, String> colorMap = new HashMap<Material, String>(); //Might be better as an Enum
 			int i = 1;
 			for (Character c : "abcdefghi".toCharArray()) // TODO: Faster to use new char[] { 'a','b','c','d','e','f','g','h','i' } ?
 			{

Essentials/src/net/ess3/commands/Commandremove.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
-import net.ess3.api.IUser;
 
 
 //Todo: Fix this up

Essentials/src/net/ess3/commands/Commandrepair.java

@@ -1,16 +1,16 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import org.bukkit.Material;
+import static net.ess3.I18n._;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commandrepair extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandrules.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
-import org.bukkit.command.CommandSender;
 import net.ess3.utils.textreader.IText;
 import net.ess3.utils.textreader.KeywordReplacer;
 import net.ess3.utils.textreader.TextInput;
 import net.ess3.utils.textreader.TextPager;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandrules extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandseen.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.PlayerNotFoundException;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandseen extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsell.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.logging.Level;
-import org.bukkit.Material;
+import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Commandsell extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsethome.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
+import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 

Essentials/src/net/ess3/commands/Commandsetwarp.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.Location;
 import net.ess3.api.IUser;
 import net.ess3.api.IWarps;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
+import org.bukkit.Location;
 
 
 public class Commandsetwarp extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsetworth.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.ItemStack;
-import net.ess3.api.IUser;
 
 
 public class Commandsetworth extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsocialspy.java

@@ -1,25 +1,28 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandsocialspy extends EssentialsToggleCommand
 {
 
+	@Override
 	protected void setValue(final IUser player, final boolean value)
 	{
 		player.getData().setSocialspy(value);
 		player.queueSave();
 	}
 
+	@Override
 	protected boolean getValue(final IUser player)
 	{
 		return player.getData().isSocialspy();
 	}
 
+	@Override
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
 		if (value)
@@ -32,17 +35,20 @@ public class Commandsocialspy extends EssentialsToggleCommand
 		}
 	}
 
+	@Override
 	protected void informPlayer(final IUser player)
 	{
 		final String message = _("socialSpyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
 		player.sendMessage(message);
 	}
 
+	@Override
 	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.SOCIALSPY_OTHERS.isAuthorized(user);
 	}
 
+	@Override
 	protected boolean isExempt(final CommandSender sender, final IUser player)
 	{
 		return (player.isOnline() ? Permissions.SOCIALSPY_EXEMPT.isAuthorized(player) : !Permissions.SOCIALSPY_OFFLINE.isAuthorized(sender));

Essentials/src/net/ess3/commands/Commandspawn.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandspawn extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandspawner.java

@@ -1,17 +1,17 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.Location;
+import static net.ess3.I18n._;
-import org.bukkit.Material;
-import org.bukkit.block.CreatureSpawner;
-import org.bukkit.entity.EntityType;
 import net.ess3.api.IUser;
 import net.ess3.bukkit.LivingEntities;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Util;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.CreatureSpawner;
+import org.bukkit.entity.EntityType;
 
 
 public class Commandspawner extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandspeed.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 
 
 public class Commandspeed extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsudo.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 
 
 public class Commandsudo extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsuicide.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
+import org.bukkit.entity.Player;
 
 
 public class Commandsuicide extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandthunder.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.World;
 import net.ess3.api.IUser;
+import org.bukkit.World;
 
 
 public class Commandthunder extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtime.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
 import java.util.*;
-import org.bukkit.World;
+import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.DescParseTickFormat;
 import net.ess3.utils.Util;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandtime extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtogglejail.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandtogglejail extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtop.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import net.ess3.api.IUser;
-import net.ess3.economy.Trade;
 
 
 public class Commandtop extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtp.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
-import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.Console;
+import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandtp extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtpaall.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandtpaall extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtpaccept.java

@@ -1,14 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-
 import net.ess3.api.ChargeException;
-import net.ess3.utils.Util;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandtpaccept extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtpall.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandtpall extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtphere.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandtphere extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtpo.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandtpo extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtpohere.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandtpohere extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtppos.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import net.ess3.api.IUser;
-import net.ess3.economy.Trade;
 
 
 public class Commandtppos extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandtptoggle.java

@@ -1,25 +1,28 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandtptoggle extends EssentialsToggleCommand
 {
 
+	@Override
 	protected void setValue(final IUser player, final boolean value)
 	{
 		player.getData().setTeleportEnabled(value);
 		player.queueSave();
 	}
 
+	@Override
 	protected boolean getValue(final IUser player)
 	{
 		return player.getData().isTeleportEnabled();
 	}
 
+	@Override
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
 		if (value)
@@ -32,17 +35,20 @@ public class Commandtptoggle extends EssentialsToggleCommand
 		}
 	}
 
+	@Override
 	protected void informPlayer(final IUser player)
 	{
 		final String message = _("teleportMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName());
 		player.sendMessage(message);
 	}
 
+	@Override
 	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.TPTOGGLE_OTHERS.isAuthorized(user);
 	}
 
+	@Override
 	protected boolean isExempt(final CommandSender sender, final IUser player)
 	{
 		return Permissions.TPTOGGLE_EXEMPT.isAuthorized(player);

Essentials/src/net/ess3/commands/Commandtree.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.Location;
-import org.bukkit.TreeType;
 import net.ess3.api.IUser;
 import net.ess3.utils.LocationUtil;
+import org.bukkit.Location;
+import org.bukkit.TreeType;
 
 
 public class Commandtree extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandunban.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandunban extends EssentialsCommand