round 2 of import fixing

19 files changed, 29 insertions, 25 deletions

diff --git a/Essentials/src/net/ess3/commands/Commandafk.java b/Essentials/src/net/ess3/commands/Commandafk.java
index 97f7b247b..80ef664fd 100644
--- a/Essentials/src/net/ess3/commands/Commandafk.java
+++ b/Essentials/src/net/ess3/commands/Commandafk.java
@@ -2,8 +2,9 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.Player;
 import net.ess3.permissions.Permissions;
-import org.bukkit.entity.Player;
+//TODO: remove bukkit
 import org.bukkit.permissions.PermissionDefault;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandantioch.java b/Essentials/src/net/ess3/commands/Commandantioch.java
index 818d1c97f..7dd8e2b41 100644
--- a/Essentials/src/net/ess3/commands/Commandantioch.java
+++ b/Essentials/src/net/ess3/commands/Commandantioch.java
@@ -1,8 +1,9 @@
 package net.ess3.commands;
 
 import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
 import net.ess3.utils.LocationUtil;
-import org.bukkit.Location;
+
 import org.bukkit.entity.TNTPrimed;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java
index 6d9919753..981a81575 100644
--- a/Essentials/src/net/ess3/commands/Commandbigtree.java
+++ b/Essentials/src/net/ess3/commands/Commandbigtree.java
@@ -4,6 +4,7 @@ import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.server.Location;
 import net.ess3.utils.LocationUtil;
+//TODO: remove bukkit
 import org.bukkit.TreeType;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandbreak.java b/Essentials/src/net/ess3/commands/Commandbreak.java
index 996d2a2f8..78e58ce0e 100644
--- a/Essentials/src/net/ess3/commands/Commandbreak.java
+++ b/Essentials/src/net/ess3/commands/Commandbreak.java
@@ -3,7 +3,8 @@ package net.ess3.commands;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import static net.ess3.I18n._;
-import org.bukkit.Material;
+import net.ess3.api.server.Material;
+//TODO: remove bukkit
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
 
diff --git a/Essentials/src/net/ess3/commands/Commandburn.java b/Essentials/src/net/ess3/commands/Commandburn.java
index 098538feb..24f0e5f87 100644
--- a/Essentials/src/net/ess3/commands/Commandburn.java
+++ b/Essentials/src/net/ess3/commands/Commandburn.java
@@ -2,7 +2,7 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.server.CommandSender;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.Player;
 
 
 public class Commandburn extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java
index e5599a91f..ae0977907 100644
--- a/Essentials/src/net/ess3/commands/Commandclearinventory.java
+++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java
@@ -5,7 +5,7 @@ import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
 import net.ess3.permissions.Permissions;
 import java.util.List;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.Player;
 
 
 public class Commandclearinventory extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java
index e1fa56348..4856bd824 100644
--- a/Essentials/src/net/ess3/commands/Commanddelhome.java
+++ b/Essentials/src/net/ess3/commands/Commanddelhome.java
@@ -6,7 +6,7 @@ import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import lombok.Cleanup;
 import net.ess3.api.server.CommandSender;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.Player;
 
 
 public class Commanddelhome extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java
index 9ab4b1db9..4c4a4bffa 100644
--- a/Essentials/src/net/ess3/commands/Commandenchant.java
+++ b/Essentials/src/net/ess3/commands/Commandenchant.java
@@ -11,11 +11,11 @@ import java.util.Set;
 import java.util.TreeSet;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
 import net.ess3.bukkit.Enchantments;
 import net.ess3.permissions.EnchantPermissions;
 import net.ess3.utils.Util;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandenchant extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java
index 5167126b4..ac62cef7a 100644
--- a/Essentials/src/net/ess3/commands/Commandessentials.java
+++ b/Essentials/src/net/ess3/commands/Commandessentials.java
@@ -6,8 +6,9 @@ import net.ess3.api.server.Player;
 import java.util.HashMap;
 import java.util.Map;
 import net.ess3.api.server.CommandSender;
-import org.bukkit.Location;
-import org.bukkit.Material;
+import net.ess3.api.server.Location;
+import net.ess3.api.server.Material;
+//TODO: remove bukkit
 import org.bukkit.block.Block;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandexp.java b/Essentials/src/net/ess3/commands/Commandexp.java
index 104a294e5..4c0b0054c 100644
--- a/Essentials/src/net/ess3/commands/Commandexp.java
+++ b/Essentials/src/net/ess3/commands/Commandexp.java
@@ -2,11 +2,11 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 import net.ess3.craftbukkit.SetExpFix;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandexp extends EssentialsCommand
@@ -59,7 +59,7 @@ public class Commandexp extends EssentialsCommand
 		}
 	}
 
-	
+	@Override
 	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
diff --git a/Essentials/src/net/ess3/commands/Commandext.java b/Essentials/src/net/ess3/commands/Commandext.java
index 1f7c1a51b..da2bd29f5 100644
--- a/Essentials/src/net/ess3/commands/Commandext.java
+++ b/Essentials/src/net/ess3/commands/Commandext.java
@@ -3,7 +3,7 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.Player;
 
 
 public class Commandext extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java
index 0aedd5a7b..b2340ef60 100644
--- a/Essentials/src/net/ess3/commands/Commandfeed.java
+++ b/Essentials/src/net/ess3/commands/Commandfeed.java
@@ -4,7 +4,7 @@ import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import java.util.List;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.Player;
 
 
 public class Commandfeed extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java
index 8882f0106..8f4c0a536 100644
--- a/Essentials/src/net/ess3/commands/Commandfireball.java
+++ b/Essentials/src/net/ess3/commands/Commandfireball.java
@@ -1,6 +1,7 @@
 package net.ess3.commands;
 
 import net.ess3.api.IUser;
+//TODO: remove bukkit
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java
index 6983cfb6e..eb326748e 100644
--- a/Essentials/src/net/ess3/commands/Commandgive.java
+++ b/Essentials/src/net/ess3/commands/Commandgive.java
@@ -4,14 +4,14 @@ import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
 import net.ess3.api.server.Player;
 import net.ess3.permissions.GivePermissions;
 import net.ess3.utils.Util;
 //TODO: remove bukkit imports
 import org.bukkit.ChatColor;
-import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandgive extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java
index 8eed527ff..68aeb92f4 100644
--- a/Essentials/src/net/ess3/commands/Commandhat.java
+++ b/Essentials/src/net/ess3/commands/Commandhat.java
@@ -2,11 +2,11 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
 import net.ess3.craftbukkit.InventoryWorkaround;
-//TODO: remove bukkit imports
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
+//TODO: not sure if this is correct
+import net.ess3.api.server.IInventory;
 
 
 
diff --git a/Essentials/src/net/ess3/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java
index 0798f3043..552ce7b27 100644
--- a/Essentials/src/net/ess3/commands/Commanditemdb.java
+++ b/Essentials/src/net/ess3/commands/Commanditemdb.java
@@ -1,8 +1,6 @@
 package net.ess3.commands;
 
-//TODO - replace alll the bukkit imports
 import static net.ess3.I18n._;
-
 import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.ItemStack;
 import net.ess3.api.server.Material;
diff --git a/Essentials/src/net/ess3/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java
index 8c9b143d4..542d5cdbe 100644
--- a/Essentials/src/net/ess3/commands/Commandjump.java
+++ b/Essentials/src/net/ess3/commands/Commandjump.java
@@ -4,8 +4,8 @@ import static net.ess3.I18n._;
 import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
 import net.ess3.api.server.ILocation; //shouldn't this be location?
+import net.ess3.api.server.Location;
 import net.ess3.utils.LocationUtil;
-import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandmotd.java b/Essentials/src/net/ess3/commands/Commandmotd.java
index 907a41b34..d59edd7f1 100644
--- a/Essentials/src/net/ess3/commands/Commandmotd.java
+++ b/Essentials/src/net/ess3/commands/Commandmotd.java
@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
+import net.ess3.api.server.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
diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java
index 5ad2934cd..5826d10b4 100644
--- a/Essentials/src/net/ess3/commands/Commandsell.java
+++ b/Essentials/src/net/ess3/commands/Commandsell.java
@@ -5,10 +5,10 @@ import java.util.logging.Level;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
 import net.ess3.craftbukkit.InventoryWorkaround;
 import net.ess3.economy.Trade;
 import net.ess3.utils.Util;
-import org.bukkit.Material;