Merge pull request #73 from ementalo/3.0

2.9 -> 3.0 merge

Metrics has been disable atm.
Everything eeds a thorough going over, settings are prob in wrong place etc.

1 files changed, 13 insertions, 5 deletions

diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/com/earth2me/essentials/api/IEssentials.java
index 42c9a964d..488b1aceb 100644
--- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/api/IEssentials.java
@@ -1,9 +1,11 @@
 package com.earth2me.essentials.api;
 
-import com.earth2me.essentials.listener.TntExplodeListener;
+import com.earth2me.essentials.EssentialsTimer;
 import com.earth2me.essentials.economy.register.Methods;
+import com.earth2me.essentials.listener.TntExplodeListener;
+import com.earth2me.essentials.metrics.Metrics;
+import java.util.List;
 import org.bukkit.World;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 
@@ -11,9 +13,7 @@ public interface IEssentials extends Plugin
 {
 	void addReloadListener(IReload listener);
 
-	IUser getUser(Player player);
-
-	IUser getUser(String playerName);
+	IUser getUser(final Object base);
 
 	int broadcastMessage(IUser sender, String message);
 
@@ -61,4 +61,12 @@ public interface IEssentials extends Plugin
 	void removeReloadListener(IReload groups);
 
 	IEconomy getEconomy();
+	
+	List<String> getVanishedPlayers();
+	
+	EssentialsTimer getTimer();
+	
+	Metrics getMetrics();
+	
+	void setMetrics(Metrics metrics);
 }