Lots of cleanup :: remove some unused variables :: add comments for future reference

Essentials/src/net/ess3/listener/EssentialsEntityListener.java

@@ -1,7 +1,12 @@
 package net.ess3.listener;
 
-import static net.ess3.I18n._;
 import java.util.List;
+import static net.ess3.I18n._;
+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.Material;
 import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
@@ -10,11 +15,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.*;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.inventory.ItemStack;
-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;
 
 
 public class EssentialsEntityListener implements Listener
@@ -34,11 +34,8 @@ public class EssentialsEntityListener implements Listener
 
 		if (eDefend instanceof Player && eAttack instanceof Player)
 		{
-
 			final IUser attacker = ess.getUserMap().getUser((Player)eAttack);
-
 			final IUser defender = ess.getUserMap().getUser((Player)eDefend);
-
 			ISettings settings = ess.getSettings();
 
 			attacker.updateActivity(true);

EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java

@@ -1,6 +1,5 @@
 package net.ess3.antibuild;
 
-import java.util.logging.Logger;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -8,7 +7,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 public class EssentialsAntiBuild extends JavaPlugin implements IAntiBuild
 {
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient EssentialsConnect ess = null;
 	private transient AntiBuildHolder settings = null;
 

EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java

@@ -106,6 +106,7 @@ public class EssentialsAntiBuildListener implements Listener
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onHangingBreak(final HangingBreakByEntityEvent event)
 	{
+		//TODO: This code is not currently working, needs testing when ess3 is more stable.
 		final Entity entity = event.getRemover();
 		if (entity instanceof Player)
 		{

EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java

@@ -1,13 +1,13 @@
 package net.ess3.antibuild;
 
-import static net.ess3.I18n._;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.bukkit.BukkitPlugin;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import net.ess3.api.IEssentials;
-import net.ess3.bukkit.BukkitPlugin;
 
 
 public class EssentialsConnect

EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java

@@ -1,11 +1,11 @@
 package net.ess3.antibuild;
 
 import java.util.Locale;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
 import net.ess3.api.IPermission;
 import net.ess3.bukkit.PermissionFactory;
 import net.ess3.permissions.MaterialDotStarPermission;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 
 
 public enum Permissions implements IPermission

EssentialsSigns/src/net/ess3/signs/EssentialsSign.java

@@ -21,7 +21,7 @@ import net.ess3.utils.FormatUtil;
 
 public class EssentialsSign
 {
-	private static final Set<Material> EMPTY_SET = new HashSet<Material>();
+	private static final Set<Material> EMPTY_SET = new HashSet<Material>(); // Would an Enum be better here?
 	protected transient final String signName;
 
 	public EssentialsSign(final String signName)
@@ -254,7 +254,7 @@ public class EssentialsSign
 	{
 		return EMPTY_SET;
 	}
-
+	
 	protected final void validateTrade(final ISign sign, final int index, final IEssentials ess) throws SignException
 	{
 		final String line = sign.getLine(index).trim();

EssentialsSigns/src/net/ess3/signs/SignConfig.java

@@ -35,6 +35,6 @@ public class SignConfig implements StorageObject
 	public int getSignUsePerSecond()
 	{
 
-		return signUsesPerSecond > 0 ? signUsesPerSecond : 1;
+		return signUsesPerSecond > 0 ? signUsesPerSecond : 1; //This needs to be ported from 2.9
 	}
 }

EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java

@@ -2,9 +2,9 @@ package net.ess3.signs;
 
 import java.io.File;
 import java.util.*;
-import org.bukkit.plugin.Plugin;
 import net.ess3.api.IEssentials;
 import net.ess3.storage.AsyncStorageObjectHolder;
+import org.bukkit.plugin.Plugin;
 
 
 public class SignsConfigHolder extends AsyncStorageObjectHolder<SignConfig>

EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java

@@ -2,6 +2,13 @@ package net.ess3.signs.listeners;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
+import net.ess3.signs.Signs;
+import net.ess3.utils.FormatUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -10,14 +17,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.*;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
-import net.ess3.signs.Signs;
-import net.ess3.utils.FormatUtil;
 
 
 public class SignBlockListener implements Listener
@@ -37,7 +36,6 @@ public class SignBlockListener implements Listener
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onBlockBreak(final BlockBreakEvent event)
 	{
-		ISettings settings = ess.getSettings();
 		if (plugin.getSettings().areSignsDisabled())
 		{
 			return;

EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java

@@ -1,5 +1,8 @@
 package net.ess3.signs.listeners;
 
+import net.ess3.api.IEssentials;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
@@ -7,9 +10,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
-import net.ess3.api.IEssentials;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
 
 
 public class SignEntityListener implements Listener

EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java

@@ -1,5 +1,8 @@
 package net.ess3.signs.listeners;
 
+import net.ess3.api.IEssentials;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -8,9 +11,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
-import net.ess3.api.IEssentials;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
 
 
 public class SignPlayerListener implements Listener

EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java

@@ -1,15 +1,15 @@
 package net.ess3.signs.signs;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.enchantments.Enchantment;
+import static net.ess3.I18n._;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.bukkit.Enchantments;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
 
 
 public class SignEnchant extends EssentialsSign
@@ -66,7 +66,6 @@ public class SignEnchant extends EssentialsSign
 	protected boolean onSignInteract(ISign sign, IUser player, String username, IEssentials ess) throws SignException, ChargeException
 	{
 		final ItemStack search = sign.getLine(1).equals("*") || sign.getLine(1).equalsIgnoreCase("any") ? null : getItemStack(sign.getLine(1), 1, ess);
-		int slot = -1;
 		final Trade charge = getTrade(sign, 3, ess);
 		charge.isAffordableFor(player);
 		final String[] enchantLevel = sign.getLine(2).split(":");

EssentialsSigns/src/net/ess3/signs/signs/SignFree.java

@@ -1,13 +1,13 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.craftbukkit.InventoryWorkaround;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 
 
 public class SignFree extends EssentialsSign
@@ -34,7 +34,7 @@ public class SignFree extends EssentialsSign
 		}
 
 		item.setAmount(item.getType().getMaxStackSize());
-		InventoryWorkaround.addItems(player.getPlayer().getInventory(), item);
+		InventoryWorkaround.addItems(player.getPlayer().getInventory(), item); //Netbeans doesn't seem to like the addItems call, even though it appears valid.
 		player.sendMessage("Item added to your inventory.");
 		player.getPlayer().updateInventory();
 		//TODO: wait for a fix in bukkit

EssentialsSigns/src/net/ess3/signs/signs/SignKit.java

@@ -1,7 +1,7 @@
 package net.ess3.signs.signs;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
+import static net.ess3.I18n._;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
@@ -61,7 +61,6 @@ public class SignKit extends EssentialsSign
 			charge.isAffordableFor(player);
 			try
 			{
-				;
 				final Kit kit = ess.getKits().getKit(kitName);
 				ess.getKits().checkTime(player, kit);
 				ess.getKits().sendKit(player, kit);

EssentialsSigns/src/net/ess3/signs/signs/SignMail.java

@@ -1,7 +1,7 @@
 package net.ess3.signs.signs;
 
-import static net.ess3.I18n._;
 import java.util.List;
+import static net.ess3.I18n._;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.signs.EssentialsSign;

EssentialsSigns/src/net/ess3/signs/signs/SignTime.java

@@ -1,12 +1,12 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.World;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.World;
 
 
 public class SignTime extends EssentialsSign

EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java

@@ -1,7 +1,6 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
@@ -9,6 +8,7 @@ import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
 import net.ess3.signs.SignsPermissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.inventory.ItemStack;
 
 
 //TODO: Sell Enchantment on Trade signs?

EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java

@@ -1,12 +1,12 @@
 package net.ess3.signs.signs;
 
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class SignWarp extends EssentialsSign

EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java

@@ -1,12 +1,12 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.World;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.World;
 
 
 public class SignWeather extends EssentialsSign