Fixing imports and removing bukkit in commands

74 files changed, 149 insertions, 72 deletions

diff --git a/Essentials/src/net/ess3/commands/Commandbackup.java b/Essentials/src/net/ess3/commands/Commandbackup.java
index 38f57ee2c..5cd9737ab 100644
--- a/Essentials/src/net/ess3/commands/Commandbackup.java
+++ b/Essentials/src/net/ess3/commands/Commandbackup.java
@@ -2,6 +2,7 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IBackup;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandbackup extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandbalance.java b/Essentials/src/net/ess3/commands/Commandbalance.java
index d910dfda4..a35b86182 100644
--- a/Essentials/src/net/ess3/commands/Commandbalance.java
+++ b/Essentials/src/net/ess3/commands/Commandbalance.java
@@ -3,6 +3,7 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.utils.Util;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import net.ess3.permissions.Permissions;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java
index e72ef955e..de952eb20 100644
--- a/Essentials/src/net/ess3/commands/Commandbalancetop.java
+++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java
@@ -9,6 +9,7 @@ import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandbalancetop extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java
index a250b6aeb..959904b4f 100644
--- a/Essentials/src/net/ess3/commands/Commandban.java
+++ b/Essentials/src/net/ess3/commands/Commandban.java
@@ -6,6 +6,7 @@ import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.Ban;
 import lombok.Cleanup;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandban extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java
index 97f61167d..66ff37eb5 100644
--- a/Essentials/src/net/ess3/commands/Commandbanip.java
+++ b/Essentials/src/net/ess3/commands/Commandbanip.java
@@ -3,6 +3,7 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import lombok.Cleanup;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandbanip extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandbroadcast.java b/Essentials/src/net/ess3/commands/Commandbroadcast.java
index d4fb48c4e..cba57f7c3 100644
--- a/Essentials/src/net/ess3/commands/Commandbroadcast.java
+++ b/Essentials/src/net/ess3/commands/Commandbroadcast.java
@@ -1,8 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.server.CommandSender;
 import net.ess3.utils.Util;
-import org.bukkit.command.CommandSender;
+
 
 
 public class Commandbroadcast extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java
index 7b0e85c50..e1fa56348 100644
--- a/Essentials/src/net/ess3/commands/Commanddelhome.java
+++ b/Essentials/src/net/ess3/commands/Commanddelhome.java
@@ -5,6 +5,7 @@ import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import lombok.Cleanup;
+import net.ess3.api.server.CommandSender;
 import org.bukkit.entity.Player;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commanddeljail.java b/Essentials/src/net/ess3/commands/Commanddeljail.java
index f8fdc8594..bfbf9ebcb 100644
--- a/Essentials/src/net/ess3/commands/Commanddeljail.java
+++ b/Essentials/src/net/ess3/commands/Commanddeljail.java
@@ -1,5 +1,6 @@
 package net.ess3.commands;
 
+import net.ess3.api.server.CommandSender;
 import static net.ess3.I18n._;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commanddelwarp.java b/Essentials/src/net/ess3/commands/Commanddelwarp.java
index 9e3ec97fb..30a8d12a4 100644
--- a/Essentials/src/net/ess3/commands/Commanddelwarp.java
+++ b/Essentials/src/net/ess3/commands/Commanddelwarp.java
@@ -1,5 +1,6 @@
 package net.ess3.commands;
 
+import net.ess3.api.server.CommandSender;
 import static net.ess3.I18n._;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java
index a5a9fbce0..571f695df 100644
--- a/Essentials/src/net/ess3/commands/Commandeco.java
+++ b/Essentials/src/net/ess3/commands/Commandeco.java
@@ -6,6 +6,8 @@ import static net.ess3.I18n._;
 
 import java.util.Locale;
 import lombok.Cleanup;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 
 
 public class Commandeco extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java
index 44cf8536c..5167126b4 100644
--- a/Essentials/src/net/ess3/commands/Commandessentials.java
+++ b/Essentials/src/net/ess3/commands/Commandessentials.java
@@ -5,6 +5,7 @@ import static net.ess3.I18n._;
 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 org.bukkit.block.Block;
diff --git a/Essentials/src/net/ess3/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java
index 21e47682f..0aedd5a7b 100644
--- a/Essentials/src/net/ess3/commands/Commandfeed.java
+++ b/Essentials/src/net/ess3/commands/Commandfeed.java
@@ -25,6 +25,7 @@ public class Commandfeed extends EssentialsCommand
 	}
 
 	private void feedOtherPlayers(final ICommandSender sender, final String name)
+			// shouldn't this be CommandSender? ^
 	{
 		final List<Player> players = server.matchPlayer(name);
 		if (players.isEmpty())
diff --git a/Essentials/src/net/ess3/commands/Commandfly.java b/Essentials/src/net/ess3/commands/Commandfly.java
index d36923764..ccdcec4a8 100644
--- a/Essentials/src/net/ess3/commands/Commandfly.java
+++ b/Essentials/src/net/ess3/commands/Commandfly.java
@@ -2,10 +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.bukkit.Server;
 import net.ess3.permissions.Permissions;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+
 
 
 public class Commandfly extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java
index 30f56e1ba..4a4cac437 100644
--- a/Essentials/src/net/ess3/commands/Commandgamemode.java
+++ b/Essentials/src/net/ess3/commands/Commandgamemode.java
@@ -3,9 +3,10 @@ package net.ess3.commands;
 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.Player;
 import net.ess3.permissions.Permissions;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
+// TODO: net.ess3 gamemode
 
 
 public class Commandgamemode extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java
index 415527af3..682798816 100644
--- a/Essentials/src/net/ess3/commands/Commandgc.java
+++ b/Essentials/src/net/ess3/commands/Commandgc.java
@@ -2,9 +2,11 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 //TODO - Remove bukkit refs
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.World;
 import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
+
+
 
 
 public class Commandgc extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandgetpos.java b/Essentials/src/net/ess3/commands/Commandgetpos.java
index cd02b661b..c5141eca2 100644
--- a/Essentials/src/net/ess3/commands/Commandgetpos.java
+++ b/Essentials/src/net/ess3/commands/Commandgetpos.java
@@ -1,8 +1,10 @@
 package net.ess3.commands;
 
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Location;
 import net.ess3.permissions.Permissions;
-import org.bukkit.Location;
+
 
 
 public class Commandgetpos extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java
index abd8695b2..6983cfb6e 100644
--- a/Essentials/src/net/ess3/commands/Commandgive.java
+++ b/Essentials/src/net/ess3/commands/Commandgive.java
@@ -3,12 +3,14 @@ package net.ess3.commands;
 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.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.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandgod.java b/Essentials/src/net/ess3/commands/Commandgod.java
index c280472ef..97c04ca23 100644
--- a/Essentials/src/net/ess3/commands/Commandgod.java
+++ b/Essentials/src/net/ess3/commands/Commandgod.java
@@ -2,8 +2,10 @@ 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.permissions.Permissions;
-import org.bukkit.entity.Player;
+
 
 
 public class Commandgod extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java
index 18fb73cca..8eed527ff 100644
--- a/Essentials/src/net/ess3/commands/Commandhat.java
+++ b/Essentials/src/net/ess3/commands/Commandhat.java
@@ -3,11 +3,13 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.craftbukkit.InventoryWorkaround;
+//TODO: remove bukkit imports
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
 
+
 public class Commandhat extends EssentialsCommand
 {
 	@Override
diff --git a/Essentials/src/net/ess3/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java
index 087947fd6..d5c18149c 100644
--- a/Essentials/src/net/ess3/commands/Commandheal.java
+++ b/Essentials/src/net/ess3/commands/Commandheal.java
@@ -4,9 +4,10 @@ import java.util.List;
 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.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
-import org.bukkit.entity.Player;
+
 
 
 public class Commandheal extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandhelp.java b/Essentials/src/net/ess3/commands/Commandhelp.java
index 78c1691b0..ecd9e0ca0 100644
--- a/Essentials/src/net/ess3/commands/Commandhelp.java
+++ b/Essentials/src/net/ess3/commands/Commandhelp.java
@@ -3,6 +3,7 @@ package net.ess3.commands;
 import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import net.ess3.utils.Util;
 import net.ess3.utils.textreader.*;
 
diff --git a/Essentials/src/net/ess3/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java
index a4bae3b44..542d89b10 100644
--- a/Essentials/src/net/ess3/commands/Commandhelpop.java
+++ b/Essentials/src/net/ess3/commands/Commandhelpop.java
@@ -1,6 +1,9 @@
 package net.ess3.commands;
 
 import java.util.logging.Level;
+import net.ess3.api.IUser;
+import net.ess3.api.server.Player;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandhelpop extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java
index 9d1459659..70a2e9870 100644
--- a/Essentials/src/net/ess3/commands/Commandhome.java
+++ b/Essentials/src/net/ess3/commands/Commandhome.java
@@ -4,12 +4,13 @@ import java.util.List;
 import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
+import net.ess3.api.server.Material;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.permissions.WorldPermissions;
 import net.ess3.utils.Util;
-import org.bukkit.Location;
-import org.bukkit.Material;
+//TODO: remove this
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandinfo.java b/Essentials/src/net/ess3/commands/Commandinfo.java
index c38039b55..c101ea3d6 100644
--- a/Essentials/src/net/ess3/commands/Commandinfo.java
+++ b/Essentials/src/net/ess3/commands/Commandinfo.java
@@ -1,5 +1,6 @@
 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;
diff --git a/Essentials/src/net/ess3/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java
index 4fa7ceb90..04b3eb215 100644
--- a/Essentials/src/net/ess3/commands/Commandinvsee.java
+++ b/Essentials/src/net/ess3/commands/Commandinvsee.java
@@ -4,7 +4,8 @@ import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.user.Inventory;
 import java.util.Arrays;
-import org.bukkit.inventory.ItemStack;
+import net.ess3.api.server.ItemStack;
+
 
 
 public class Commandinvsee extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java
index e298df0d7..0798f3043 100644
--- a/Essentials/src/net/ess3/commands/Commanditemdb.java
+++ b/Essentials/src/net/ess3/commands/Commanditemdb.java
@@ -2,10 +2,12 @@ package net.ess3.commands;
 
 //TODO - replace alll the bukkit imports
 import static net.ess3.I18n._;
-import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
+
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
+import net.ess3.api.server.Player;
+
 
 
 public class Commanditemdb extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandjails.java b/Essentials/src/net/ess3/commands/Commandjails.java
index ae443e19d..44f2de4e1 100644
--- a/Essentials/src/net/ess3/commands/Commandjails.java
+++ b/Essentials/src/net/ess3/commands/Commandjails.java
@@ -1,5 +1,6 @@
 package net.ess3.commands;
 
+import net.ess3.api.server.CommandSender;
 import net.ess3.utils.Util;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java
index 46c7b488c..8c9b143d4 100644
--- a/Essentials/src/net/ess3/commands/Commandjump.java
+++ b/Essentials/src/net/ess3/commands/Commandjump.java
@@ -3,7 +3,7 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
-import net.ess3.api.server.ILocation;
+import net.ess3.api.server.ILocation; //shouldn't this be 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/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java
index b4164f46e..68ce363bc 100644
--- a/Essentials/src/net/ess3/commands/Commandkick.java
+++ b/Essentials/src/net/ess3/commands/Commandkick.java
@@ -4,6 +4,7 @@ import net.ess3.Console;
 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.permissions.Permissions;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java
index 0ab789af4..7611ef7e3 100644
--- a/Essentials/src/net/ess3/commands/Commandkill.java
+++ b/Essentials/src/net/ess3/commands/Commandkill.java
@@ -2,7 +2,9 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 
-import org.bukkit.entity.Player;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+//TODO: remove this
 import org.bukkit.event.entity.EntityDamageEvent;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java
index 7e6f8a2b1..a04eccd7d 100644
--- a/Essentials/src/net/ess3/commands/Commandkillall.java
+++ b/Essentials/src/net/ess3/commands/Commandkillall.java
@@ -6,9 +6,11 @@ import net.ess3.bukkit.Mob;
 import java.util.Collections;
 import java.util.Locale;
 import static net.ess3.I18n._;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.World;
 import net.ess3.bukkit.Mob;
+//TODO: remove these
 import org.bukkit.Chunk;
-import org.bukkit.World;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDeathEvent;
 
diff --git a/Essentials/src/net/ess3/commands/Commandkittycannon.java b/Essentials/src/net/ess3/commands/Commandkittycannon.java
index 72dede652..80dd7c4dd 100644
--- a/Essentials/src/net/ess3/commands/Commandkittycannon.java
+++ b/Essentials/src/net/ess3/commands/Commandkittycannon.java
@@ -3,8 +3,9 @@ package net.ess3.commands;
 
 import java.util.Random;
 import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
 import net.ess3.bukkit.Mob;
-import org.bukkit.Location;
+//TODO: remove this
 import org.bukkit.entity.Ocelot;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java
index 8fe876cf9..646adadcd 100644
--- a/Essentials/src/net/ess3/commands/Commandlightning.java
+++ b/Essentials/src/net/ess3/commands/Commandlightning.java
@@ -5,8 +5,10 @@ import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import lombok.Cleanup;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+//TODO: remove this
 import org.bukkit.entity.LightningStrike;
-import org.bukkit.entity.Player;
 
 
 public class Commandlightning extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java
index 64e352731..b8fc52738 100644
--- a/Essentials/src/net/ess3/commands/Commandlist.java
+++ b/Essentials/src/net/ess3/commands/Commandlist.java
@@ -5,9 +5,10 @@ import net.ess3.utils.Util;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 import java.util.*;
 
-
 public class Commandlist extends EssentialsCommand
 {
 	@Override
diff --git a/Essentials/src/net/ess3/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java
index 98a9a8ad9..25893cb4c 100644
--- a/Essentials/src/net/ess3/commands/Commandmail.java
+++ b/Essentials/src/net/ess3/commands/Commandmail.java
@@ -6,7 +6,8 @@ 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 Commandmail extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java
index 78269a022..450e644e4 100644
--- a/Essentials/src/net/ess3/commands/Commandmore.java
+++ b/Essentials/src/net/ess3/commands/Commandmore.java
@@ -6,6 +6,7 @@ import net.ess3.api.IUser;
 import net.ess3.permissions.ItemPermissions;
 import net.ess3.permissions.Permissions;
 import java.util.Locale;
+import net.ess3.api.server.ItemStack;
 
 
 public class Commandmore extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java
index a1d0b614d..3a2e8b297 100644
--- a/Essentials/src/net/ess3/commands/Commandmsg.java
+++ b/Essentials/src/net/ess3/commands/Commandmsg.java
@@ -2,14 +2,15 @@ package net.ess3.commands;
 
 import net.ess3.Console;
 import static net.ess3.I18n._;
-
 import net.ess3.utils.Util;
 import net.ess3.api.IReplyTo;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import java.util.List;
 import lombok.Cleanup;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+
 
 
 public class Commandmsg extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java
index abbe78d9c..30043b95d 100644
--- a/Essentials/src/net/ess3/commands/Commandmute.java
+++ b/Essentials/src/net/ess3/commands/Commandmute.java
@@ -6,9 +6,9 @@ import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
+import net.ess3.api.server.CommandSender;
 import lombok.Cleanup;
 
-
 public class Commandmute extends EssentialsCommand
 {
 	@Override
diff --git a/Essentials/src/net/ess3/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java
index 1ea933474..fd3db71f9 100644
--- a/Essentials/src/net/ess3/commands/Commandnear.java
+++ b/Essentials/src/net/ess3/commands/Commandnear.java
@@ -2,10 +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.Location;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.World;
 import net.ess3.permissions.Permissions;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
 
 
 public class Commandnear extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java
index 19c89fef8..bae95420f 100644
--- a/Essentials/src/net/ess3/commands/Commandnick.java
+++ b/Essentials/src/net/ess3/commands/Commandnick.java
@@ -5,11 +5,11 @@ import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
+import net.ess3.bukkit.Server;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
-//TODO - Remove bukkit
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
 
 
 public class Commandnick extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandnuke.java b/Essentials/src/net/ess3/commands/Commandnuke.java
index 0154e3dc2..94b60cd77 100644
--- a/Essentials/src/net/ess3/commands/Commandnuke.java
+++ b/Essentials/src/net/ess3/commands/Commandnuke.java
@@ -4,9 +4,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import static net.ess3.I18n._;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Location;
+import net.ess3.api.server.Player;
+import net.ess3.api.server.World;
 import org.bukkit.entity.TNTPrimed;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java
index d60f6ea18..c1f331fca 100644
--- a/Essentials/src/net/ess3/commands/Commandpay.java
+++ b/Essentials/src/net/ess3/commands/Commandpay.java
@@ -3,7 +3,8 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
-import org.bukkit.entity.Player;
+import net.ess3.api.server.Player;
+
 
 
 public class Commandpay extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java
index 35ccae49a..a95ca6797 100644
--- a/Essentials/src/net/ess3/commands/Commandpowertool.java
+++ b/Essentials/src/net/ess3/commands/Commandpowertool.java
@@ -5,11 +5,10 @@ import java.util.List;
 import java.util.Locale;
 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.permissions.Permissions;
 import net.ess3.utils.Util;
-//TODO remove bukkit
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandpowertool extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java
index 1ba413407..7a0f27b1f 100644
--- a/Essentials/src/net/ess3/commands/Commandptime.java
+++ b/Essentials/src/net/ess3/commands/Commandptime.java
@@ -3,11 +3,12 @@ package net.ess3.commands;
 import java.util.*;
 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.api.server.World;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.DescParseTickFormat;
-//TODO - Remove bukkit
-import org.bukkit.World;
-import org.bukkit.entity.Player;
+
 
 
 public class Commandptime extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java
index 1f428432d..1b2e42dcb 100644
--- a/Essentials/src/net/ess3/commands/Commandr.java
+++ b/Essentials/src/net/ess3/commands/Commandr.java
@@ -5,9 +5,9 @@ import static net.ess3.I18n._;
 import net.ess3.utils.Util;
 import net.ess3.api.IReplyTo;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 import net.ess3.permissions.Permissions;
-//TODO - Remove bukkit
-import org.bukkit.entity.Player;
 
 
 public class Commandr extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java
index bcbdd6ae1..85430b90d 100644
--- a/Essentials/src/net/ess3/commands/Commandrealname.java
+++ b/Essentials/src/net/ess3/commands/Commandrealname.java
@@ -5,8 +5,9 @@ import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 import net.ess3.utils.Util;
-//TODO - Remove bukkitimport org.bukkit.entity.Player;
 
 
 public class Commandrealname extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java
index 897d90e37..8aa2f28de 100644
--- a/Essentials/src/net/ess3/commands/Commandremove.java
+++ b/Essentials/src/net/ess3/commands/Commandremove.java
@@ -3,8 +3,10 @@ package net.ess3.commands;
 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.World;
+//TODO: remove bukkit
 import org.bukkit.Chunk;
-import org.bukkit.World;
 import org.bukkit.entity.*;
 
 //Todo: Fix this up
diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java
index 9762fc767..8b9df4a06 100644
--- a/Essentials/src/net/ess3/commands/Commandrepair.java
+++ b/Essentials/src/net/ess3/commands/Commandrepair.java
@@ -6,11 +6,11 @@ import java.util.Locale;
 import static net.ess3.I18n._;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
+import net.ess3.api.server.Material;
 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
diff --git a/Essentials/src/net/ess3/commands/Commandrules.java b/Essentials/src/net/ess3/commands/Commandrules.java
index 1e15a6097..d9993d641 100644
--- a/Essentials/src/net/ess3/commands/Commandrules.java
+++ b/Essentials/src/net/ess3/commands/Commandrules.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 Commandrules extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java
index 9c5889bdd..a508b16e3 100644
--- a/Essentials/src/net/ess3/commands/Commandseen.java
+++ b/Essentials/src/net/ess3/commands/Commandseen.java
@@ -6,9 +6,9 @@ import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
+import net.ess3.api.server.CommandSender;
 import lombok.Cleanup;
 
-
 public class Commandseen extends EssentialsCommand
 {
 	@Override
diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java
index cc3671629..5ad2934cd 100644
--- a/Essentials/src/net/ess3/commands/Commandsell.java
+++ b/Essentials/src/net/ess3/commands/Commandsell.java
@@ -4,11 +4,12 @@ import java.util.Locale;
 import java.util.logging.Level;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.ItemStack;
 import net.ess3.craftbukkit.InventoryWorkaround;
 import net.ess3.economy.Trade;
 import net.ess3.utils.Util;
 import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
+
 
 
 public class Commandsell extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java
index 97387b80c..d44dbc746 100644
--- a/Essentials/src/net/ess3/commands/Commandsetwarp.java
+++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java
@@ -3,9 +3,10 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.api.IWarps;
+import net.ess3.api.server.Location;
 import net.ess3.permissions.WarpPermissions;
-//TODO - Remove bukkit
-import org.bukkit.Location;
+
+
 
 
 public class Commandsetwarp extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java
index d93c3c0cb..dab455ad2 100644
--- a/Essentials/src/net/ess3/commands/Commandsetworth.java
+++ b/Essentials/src/net/ess3/commands/Commandsetworth.java
@@ -2,7 +2,9 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
-import org.bukkit.inventory.ItemStack;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.ItemStack;
+
 
 
 public class Commandsetworth extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java
index f1bb51b74..213f14211 100644
--- a/Essentials/src/net/ess3/commands/Commandspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandspawn.java
@@ -2,10 +2,12 @@ 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.Location;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.settings.SpawnsHolder;
-import org.bukkit.Location;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java
index 8d0993cb1..57eaec651 100644
--- a/Essentials/src/net/ess3/commands/Commandspawner.java
+++ b/Essentials/src/net/ess3/commands/Commandspawner.java
@@ -8,8 +8,9 @@ import net.ess3.permissions.SpawnerPermissions;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Util;
 import java.util.Locale;
-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.CreatureSpawner;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java
index 8c2a9bee0..d83749272 100644
--- a/Essentials/src/net/ess3/commands/Commandspawnmob.java
+++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java
@@ -7,13 +7,13 @@ import java.util.Set;
 import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
 import net.ess3.bukkit.Mob;
 import net.ess3.bukkit.Mob.MobException;
 import net.ess3.permissions.SpawnmobPermissions;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Util;
 import org.bukkit.DyeColor;
-import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Villager.Profession;
 import org.bukkit.entity.*;
diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java
index 209ab8098..d41dbac37 100644
--- a/Essentials/src/net/ess3/commands/Commandtempban.java
+++ b/Essentials/src/net/ess3/commands/Commandtempban.java
@@ -4,10 +4,11 @@ import net.ess3.Console;
 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.permissions.Permissions;
 import net.ess3.user.Ban;
 import net.ess3.utils.DateUtil;
-import org.bukkit.entity.Player;
 
 
 public class Commandtempban extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java
index eb7d9e1e2..0b96ccc55 100644
--- a/Essentials/src/net/ess3/commands/Commandthunder.java
+++ b/Essentials/src/net/ess3/commands/Commandthunder.java
@@ -2,7 +2,7 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
-import org.bukkit.World;
+import net.ess3.api.server.World;
 
 
 public class Commandthunder extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java
index 5a1a5b410..f48b31cd7 100644
--- a/Essentials/src/net/ess3/commands/Commandtime.java
+++ b/Essentials/src/net/ess3/commands/Commandtime.java
@@ -3,11 +3,12 @@ package net.ess3.commands;
 import java.util.*;
 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.api.server.World;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.DescParseTickFormat;
 import net.ess3.utils.Util;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
 
 
 public class Commandtime extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java
index ca781c23f..bc1c3d127 100644
--- a/Essentials/src/net/ess3/commands/Commandtogglejail.java
+++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java
@@ -7,6 +7,7 @@ import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
 import lombok.Cleanup;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandtogglejail extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java
index 66c142120..17edad493 100644
--- a/Essentials/src/net/ess3/commands/Commandtop.java
+++ b/Essentials/src/net/ess3/commands/Commandtop.java
@@ -3,7 +3,8 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
-import org.bukkit.Location;
+import net.ess3.api.server.Location;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java
index 27744d571..45cdf5870 100644
--- a/Essentials/src/net/ess3/commands/Commandtp.java
+++ b/Essentials/src/net/ess3/commands/Commandtp.java
@@ -8,6 +8,7 @@ import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.permissions.WorldPermissions;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java
index 5517fad6d..717a55cc1 100644
--- a/Essentials/src/net/ess3/commands/Commandtpaall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaall.java
@@ -4,8 +4,9 @@ import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 import net.ess3.permissions.WorldPermissions;
-import org.bukkit.entity.Player;
 
 
 public class Commandtpaall extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java
index 7aaa58f3e..0d758df7f 100644
--- a/Essentials/src/net/ess3/commands/Commandtpaccept.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java
@@ -5,6 +5,7 @@ import net.ess3.economy.Trade;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java
index 2926b4a8c..0a08f88b7 100644
--- a/Essentials/src/net/ess3/commands/Commandtpall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpall.java
@@ -4,9 +4,10 @@ import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.Player;
 import net.ess3.permissions.WorldPermissions;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java
index c628c3519..78d571423 100644
--- a/Essentials/src/net/ess3/commands/Commandtphere.java
+++ b/Essentials/src/net/ess3/commands/Commandtphere.java
@@ -4,6 +4,7 @@ import static net.ess3.I18n._;
 import net.ess3.economy.Trade;
 import net.ess3.api.IUser;
 import lombok.Cleanup;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java
index 529fbd8f8..2a90fa045 100644
--- a/Essentials/src/net/ess3/commands/Commandtpo.java
+++ b/Essentials/src/net/ess3/commands/Commandtpo.java
@@ -3,6 +3,7 @@ package net.ess3.commands;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java
index 48923e223..e9a392591 100644
--- a/Essentials/src/net/ess3/commands/Commandtpohere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpohere.java
@@ -6,6 +6,7 @@ import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.permissions.WorldPermissions;
+//TODO: remove buikkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java
index 907292b8e..29350cc60 100644
--- a/Essentials/src/net/ess3/commands/Commandtppos.java
+++ b/Essentials/src/net/ess3/commands/Commandtppos.java
@@ -2,8 +2,9 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
 import net.ess3.economy.Trade;
-import org.bukkit.Location;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandtree.java b/Essentials/src/net/ess3/commands/Commandtree.java
index 991e86380..b1dc68139 100644
--- a/Essentials/src/net/ess3/commands/Commandtree.java
+++ b/Essentials/src/net/ess3/commands/Commandtree.java
@@ -2,8 +2,9 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.Location;
 import net.ess3.utils.LocationUtil;
-import org.bukkit.Location;
+//TODO: remove bukkit
 import org.bukkit.TreeType;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java
index 4f2fe8fb6..cd82ba509 100644
--- a/Essentials/src/net/ess3/commands/Commandunban.java
+++ b/Essentials/src/net/ess3/commands/Commandunban.java
@@ -3,6 +3,7 @@ package net.ess3.commands;
 import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandunban extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandunbanip.java b/Essentials/src/net/ess3/commands/Commandunbanip.java
index 4c5975eb5..03c8fcb75 100644
--- a/Essentials/src/net/ess3/commands/Commandunbanip.java
+++ b/Essentials/src/net/ess3/commands/Commandunbanip.java
@@ -3,6 +3,7 @@ package net.ess3.commands;
 import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandunbanip extends EssentialsCommand
diff --git a/Essentials/src/net/ess3/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java
index c01bc8354..2d56a0cb9 100644
--- a/Essentials/src/net/ess3/commands/Commandwarp.java
+++ b/Essentials/src/net/ess3/commands/Commandwarp.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
diff --git a/Essentials/src/net/ess3/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java
index 261b2914e..4d8b1420f 100644
--- a/Essentials/src/net/ess3/commands/Commandworld.java
+++ b/Essentials/src/net/ess3/commands/Commandworld.java
@@ -7,6 +7,7 @@ import net.ess3.api.server.World;
 import net.ess3.api.server.Location;
 import net.ess3.permissions.WorldPermissions;
 import java.util.List;
+//TODO: remove bukkit
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;