Merge branch 'master' of github.com:essentials/Essentials

Conflicts: Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
2024-09-27 07:12:35 +02:00 · 2011-12-01 13:47:06 +00:00 · 2011-12-01 13:47:06 +00:00 · f006932639
commit f006932639
parent 2dc6f8c202 39851694ad
83 changed files with 603 additions and 2353 deletions
--- a/BuildAll/nbproject/project.properties
+++ b/BuildAll/nbproject/project.properties
@ -81,9 +81,7 @@ javac.source=1.6
 javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${build.classes.dir}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/Essentials/nbproject/project.properties
+++ b/Essentials/nbproject/project.properties
@ -70,7 +70,6 @@ file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=../lib/craftbukkit-1.0.0-SNAPSHOT.
 file.reference.iCo4.jar=../lib/iCo4.jar
 file.reference.iCo5.jar=../lib/iCo5.jar
 file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.junit-4.5.jar=../lib/junit_4/junit-4.5.jar
 file.reference.lombok-0.10.1.jar=../lib/lombok-0.10.1.jar
 file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
 file.reference.Permissions3.jar=../lib/Permissions3.jar
@ -103,7 +102,7 @@ javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
    ${build.classes.dir}:\
-    ${file.reference.junit-4.5.jar}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@ -47,17 +47,21 @@ import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Priority;
 import org.bukkit.event.Event.Type;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerListener;
 import org.bukkit.plugin.InvalidDescriptionException;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.error.YAMLException;


 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 1522;
+	public static final int BUKKIT_VERSION = 1534;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
 	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
@ -112,32 +116,6 @@ public class Essentials extends JavaPlugin implements IEssentials
 		i18n = new I18n(this);
 		i18n.onEnable();
 		execTimer.mark("I18n1");
-		final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
-		upgrade.beforeSettings();
-		execTimer.mark("Upgrade");
-		confList = new ArrayList<IConf>();
-		settings = new Settings(this);
-		confList.add(settings);
-		execTimer.mark("Settings");
-		upgrade.afterSettings();
-		execTimer.mark("Upgrade2");
-		i18n.updateLocale(settings.getLocale());
-		userMap = new UserMap(this);
-		confList.add(userMap);
-		execTimer.mark("Init(Usermap)");
-		spawn = new Spawn(getServer(), this.getDataFolder());
-		confList.add(spawn);
-		warps = new Warps(getServer(), this.getDataFolder());
-		confList.add(warps);
-		execTimer.mark("Init(Spawn/Warp)");
-		worth = new Worth(this.getDataFolder());
-		confList.add(worth);
-		itemDb = new ItemDb(this);
-		confList.add(itemDb);
-		execTimer.mark("Init(Worth/ItemDB)");
-		reload();
-		backup = new Backup(this);
-
 		final PluginManager pm = getServer().getPluginManager();
 		for (Plugin plugin : pm.getPlugins())
 		{
@ -153,7 +131,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 			final int versionNumber = Integer.parseInt(versionMatch.group(4));
 			if (versionNumber < BUKKIT_VERSION)
 			{
-				LOGGER.log(Level.WARNING, _("notRecommendedBukkit"));
+				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
+				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
+				this.setEnabled(false);
+				return;
 			}
 		}
 		else
@ -162,7 +143,61 @@ public class Essentials extends JavaPlugin implements IEssentials
 			LOGGER.log(Level.INFO, getServer().getVersion());
 			LOGGER.log(Level.INFO, getServer().getBukkitVersion());
 		}
-
+		execTimer.mark("BukkitCheck");
+		try
+		{
+			final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
+			upgrade.beforeSettings();
+			execTimer.mark("Upgrade");
+			confList = new ArrayList<IConf>();
+			settings = new Settings(this);
+			confList.add(settings);
+			execTimer.mark("Settings");
+			upgrade.afterSettings();
+			execTimer.mark("Upgrade2");
+			i18n.updateLocale(settings.getLocale());
+			userMap = new UserMap(this);
+			confList.add(userMap);
+			execTimer.mark("Init(Usermap)");
+			spawn = new Spawn(getServer(), this.getDataFolder());
+			confList.add(spawn);
+			warps = new Warps(getServer(), this.getDataFolder());
+			confList.add(warps);
+			execTimer.mark("Init(Spawn/Warp)");
+			worth = new Worth(this.getDataFolder());
+			confList.add(worth);
+			itemDb = new ItemDb(this);
+			confList.add(itemDb);
+			execTimer.mark("Init(Worth/ItemDB)");
+			reload();
+		}
+		catch (YAMLException exception)
+		{
+			if (pm.getPlugin("EssentialsUpdate") != null)
+			{
+				LOGGER.log(Level.SEVERE, _("essentialsHelp2"));
+			}
+			else
+			{
+				LOGGER.log(Level.SEVERE, _("essentialsHelp1"));
+			}
+			LOGGER.log(Level.SEVERE, exception.toString());
+			pm.registerEvent(Type.PLAYER_JOIN, new PlayerListener()
+			{
+				@Override
+				public void onPlayerJoin(PlayerJoinEvent event)
+				{
+					event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
+				}
+			}, Priority.Low, this);
+			for (Player player : getServer().getOnlinePlayers())
+			{
+				player.sendMessage("Essentials failed to load, read the log file.");
+			}
+			this.setEnabled(false);
+			return;
+		}
+		backup = new Backup(this);
 		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
 		alternativeCommandsHandler = new AlternativeCommandsHandler(this);
 		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
@ -275,7 +310,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 			if (pc != null)
 			{
 				alternativeCommandsHandler.executed(commandLabel, pc.getLabel());
-				LOGGER.log(Level.FINE,"Essentials: Alternative command " + commandLabel + " found, using " + pc.getLabel());
+				LOGGER.log(Level.FINE, "Essentials: Alternative command " + commandLabel + " found, using " + pc.getLabel());
 				return pc.execute(sender, commandLabel, args);
 			}
 		}
@ -444,7 +479,9 @@ public class Essentials extends JavaPlugin implements IEssentials
 		if (user == null)
 		{
 			user = new User(base, this);
-		} else {
+		}
+		else
+		{
 			user.update(base);
 		}
 		return user;
--- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
@ -111,7 +111,7 @@ public class EssentialsConf extends Configuration
 		}
 		catch (RuntimeException e)
 		{
-			LOGGER.log(Level.INFO, "File: " + configFile.toString());
+			LOGGER.log(Level.SEVERE, "File broken: " + configFile.toString());
 			throw e;
 		}

--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@ -1,7 +1,6 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.craftbukkit.EnchantmentFix;
 import com.earth2me.essentials.craftbukkit.SetBed;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
@ -117,7 +116,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		}
 		if (user.getSavedInventory() != null)
 		{
-			EnchantmentFix.setContents(user.getInventory(), user.getSavedInventory());
+			user.getInventory().setContents(user.getSavedInventory());
 			user.setSavedInventory(null);
 		}
 		user.updateActivity(false);
--- a/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java
+++ b/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java
@ -1,6 +1,5 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.craftbukkit.EnchantmentFix;
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Location;
@ -152,27 +151,13 @@ public final class InventoryWorkaround
 						{
 							final ItemStack stack = item.clone();
 							stack.setAmount(maxAmount);
-							if (cinventory instanceof FakeInventory)
-							{
-								cinventory.setItem(firstFree, stack);
-							}
-							else
-							{
-								EnchantmentFix.setItem(cinventory, firstFree, stack);
-							}
+							cinventory.setItem(firstFree, stack);
 							item.setAmount(item.getAmount() - maxAmount);
 						}
 						else
 						{
 							// Just store it
-							if (cinventory instanceof FakeInventory)
-							{
-								cinventory.setItem(firstFree, item);
-							}
-							else
-							{
-								EnchantmentFix.setItem(cinventory, firstFree, item);
-							}
+							cinventory.setItem(firstFree, item);
 							break;
 						}
 					}
@ -251,7 +236,7 @@ public final class InventoryWorkaround
 					{
 						// split the stack and store
 						itemStack.setAmount(amount - toDelete);
-						EnchantmentFix.setItem(cinventory, first, itemStack);
+						cinventory.setItem(first, itemStack);
 						toDelete = 0;
 					}
 				}
--- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
@ -3,7 +3,6 @@ package com.earth2me.essentials.commands;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.craftbukkit.EnchantmentFix;
 import java.util.*;
 import java.util.regex.Pattern;
 import org.bukkit.Server;
@ -109,7 +108,7 @@ public class Commandenchant extends EssentialsCommand
 		} else {
 			stack.addEnchantment(enchantment, level);
 		}
-		EnchantmentFix.setItemInHand(user.getInventory(), stack);
+		user.getInventory().setItemInHand(stack);
 		user.updateInventory();
 		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
 		if (level == 0) {
--- a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
@ -2,7 +2,6 @@ package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.craftbukkit.EnchantmentFix;
 import java.util.Arrays;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
@ -30,7 +29,7 @@ public class Commandinvsee extends EssentialsCommand
 		}
 		if (invUser == user && user.getSavedInventory() != null)
 		{
-			EnchantmentFix.setContents(invUser.getInventory(), user.getSavedInventory());
+			invUser.getInventory().setContents(user.getSavedInventory());
 			user.setSavedInventory(null);
 			user.sendMessage(_("invRestored"));
 			throw new NoChargeException();
@ -50,7 +49,7 @@ public class Commandinvsee extends EssentialsCommand
 		{
 			throw new Exception(_("invBigger"));
 		}
-		EnchantmentFix.setContents(user.getInventory(), invUserStack);
+		user.getInventory().setContents(invUserStack);
 		user.sendMessage(_("invSee", invUser.getDisplayName()));
 		user.sendMessage(_("invSeeHelp"));
 		throw new NoChargeException();
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/EnchantmentFix.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/EnchantmentFix.java
@ -1,66 +0,0 @@
-package com.earth2me.essentials.craftbukkit;
-
-import org.bukkit.craftbukkit.inventory.CraftInventory;
-import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
-
-public class EnchantmentFix
-{
-	public static void setContents(Inventory inventory, ItemStack[] items)
-	{
-		CraftInventory cInventory = (CraftInventory)inventory;
-		if (cInventory.getContents().length != items.length)
-		{
-			throw new IllegalArgumentException("Invalid inventory size; expected " + cInventory.getContents().length);
-		}
-
-		net.minecraft.server.ItemStack[] mcItems = cInventory.getInventory().getContents();
-
-		for (int i = 0; i < items.length; i++)
-		{
-			ItemStack item = items[i];
-			if (item == null || item.getTypeId() <= 0)
-			{
-				mcItems[i] = null;
-			}
-			else
-			{
-				mcItems[i] = new net.minecraft.server.ItemStack(item.getTypeId(), item.getAmount(), item.getDurability());
-				new CraftItemStack(mcItems[i]).addUnsafeEnchantments(item.getEnchantments());
-			}
-		}
-	}
-
-	public static void setItem(Inventory inventory, int index, ItemStack item)
-	{
-		CraftInventory cInventory = (CraftInventory)inventory;
-		if (item == null)
-		{
-			cInventory.getInventory().setItem(index, null);
-		}
-		else
-		{
-			net.minecraft.server.ItemStack stack = new net.minecraft.server.ItemStack(item.getTypeId(), item.getAmount(), item.getDurability());
-			new CraftItemStack(stack).addUnsafeEnchantments(item.getEnchantments());
-			cInventory.getInventory().setItem(index, stack);
-		}
-	}
-	
-	public static void setItemInHand(Inventory inventory, ItemStack item)
-	{
-		CraftInventoryPlayer cInventory = (CraftInventoryPlayer)inventory;
-		if (item == null)
-		{
-			cInventory.getInventory().setItem(cInventory.getInventory().itemInHandIndex, null);
-		}
-		else
-		{
-			net.minecraft.server.ItemStack stack = new net.minecraft.server.ItemStack(item.getTypeId(), item.getAmount(), item.getDurability());
-			new CraftItemStack(stack).addUnsafeEnchantments(item.getEnchantments());
-			cInventory.getInventory().setItem(cInventory.getInventory().itemInHandIndex, stack);
-		}
-	}
-}
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/ShowInventory.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/ShowInventory.java
@ -5,7 +5,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.IInventory;
-import net.minecraft.server.InventoryPlayer;
+import net.minecraft.server.PlayerInventory;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
 import org.bukkit.entity.Player;
@ -19,7 +19,7 @@ public class ShowInventory
 		try
 		{
 			final EntityPlayer entityPlayer = ((CraftPlayer)player).getHandle();
-			final CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(((CraftPlayer)player).getHandle()));
+			final CraftInventoryPlayer inv = new CraftInventoryPlayer(new PlayerInventory(((CraftPlayer)player).getHandle()));
 			inv.clear();
 			entityPlayer.a((IInventory)inv.getInventory());
 		}
@ -34,7 +34,7 @@ public class ShowInventory
 		try
 		{
 			final EntityPlayer entityPlayer = ((CraftPlayer)player).getHandle();
-			final CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(((CraftPlayer)player).getHandle()));
+			final CraftInventoryPlayer inv = new CraftInventoryPlayer(new PlayerInventory(((CraftPlayer)player).getHandle()));
 			inv.clear();
 			InventoryWorkaround.addItem(inv, true, stack);
 			entityPlayer.a((IInventory)inv.getInventory());
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@ -332,10 +332,8 @@ chat:

 protect:
  # Database settings for sign/rail protection
-  # get mysql.jar and sqlite and place it in your serverroot/lib directory from here:
-  # https://github.com/essentials/Essentials/blob/master/lib/mysql.jar

-  # mysql, sqlite or none
+  # mysql or sqlite
  datatype: 'sqlite'

  # If you specified MySQL above, you MUST enter the appropriate details here.
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@ -1341,18 +1341,104 @@ cementbstairs,109,0
 greybrickstairs,109,0
 greybstairs,109,0
 mycel,110,0
+mycelium,110,0
+swampgrass,110,0
+sgrass,110,0
 waterlily,111,0
+lilypad,111,0
+lily,111,0
+swamppad,111,0
+lpad,111,0
+wlily,111,0
 netherbrick,112,0
+nbrick,112,0
+hellbrick,112,0
+deathbrick,112,0
+dbrick,112,0
+hbrick,112,0
 netherfence,113,0
+nfence,113,0
+hellfence,113,0
+deathfence,113,0
+dfence,113,0
+hfence,113,0
 netherbrickstairs,114,0
+nbrickstairs,114,0
+hellbrickstairs,114,0
+deathbrickstairs,114,0
+dbrickstairs,114,0
+hbrickstais,114,0
 netherwarts,115,0
+netherwart,115,0
+netherplant,115,0
+nethercrop,115,0
+hellwarts,115,0
+hellwart,115,0
+hellplant,115,0
+hellcrop,115,0
+deathwarts,115,0
+deathwart,115,0
+deathplant,115,0
+deathcrop,115,0
+nwarts,115,0
+nwart,115,0
+ncrop,115,0
+nplant,115,0
+hwarts,115,0
+hwart,115,0
+hplant,115,0
+hcrop,115,0
+dwarts,115,0
+dwart,115,0
+dplant,115,0
+dcrop,115,0
 enchantmenttable,116,0
+magictable,116,0
+etable,116,0
+booktable,116,0
+magicdesk,116,0
+enchantmentdesk,116,0
+edesk,116,0
+btable,116,0
+bdesk,116,0
+mtable,116,0
+mdesk,116,0
 brewingstand,117,0
+brewer,117,0
+potionstand,117,0
+potionbrewer,117,0
+pstand,117,0
+bstand,117,0
+pbrewer,117,0
 cauldron,118,0
+steelcauldron,118,0
+ironcauldron,118,0
+icauldron,118,0
+scauldron,118,0
+potioncauldron,118,0
+pcauldron,118,0
 enderportal,119,0
+endergoo,119,0
+endgoo,119,0
+endportal,119,0
+egoo,119,0
+eportal,119,0
 enderportalframe,120,0
+endportalframe,120,0
+endgooframe,120,0
+endergooframe,120,0
+egooframe,120,0
+eportalframe,120,0
 enderstone,121,0
+endstone,121,0
+endrock,121,0
+enderrock,121,0
+erock,121,0
+estone,121,0
 dragonegg,122,0
+degg,122,0
+bossegg,122,0
+begg,122,0
 ironshovel,256,0
 ironspade,256,0
 ishovel,256,0
@ -2224,19 +2310,101 @@ epearl,368,0
 bluepearl,368,0
 endergem,368,0
 blazerod,369,0
+goldenrod,369,0
+goldrod,369,0
+blazestick,369,0
+goldstick,369,0
+brod,369,0
+grod,369,0
+bstick,369,0
+gstick,369,0
 ghasttear,370,0
+ghastdrop,370,0
+ghosttear,370,0
+ghostdrop,370,0
+gtear,370,0
+gdrop,370,0
 goldnugget,371,0
+gnugget,371,0
+goldball,371,0
+goldpebble,371,0
+gball,371,0
+gpebble,371,0
+pigzombienugget,371,0
+pigzombieball,371,0
+pigzombiepebble,371,0
 netherstalk,372,0
+deathstalk,372,0
+hellstalk,372,0
+nstalk,372,0
+dstalk,372,0
+hstalk,372,0
 potion,373,0
+mixture,373,0
+potions,373,0
 glassbottle,374,0
+bottle,374,0
+gbottle,374,0
+gvase,374,0
+vase,374,0
+glassvase,374,0
+emptypotion,374,0
 spidereye,375,0
+eyeofspider,375,0
+spiderseye,375,0
+spiderball,375,0
+spidernugget,375,0
+spidersball,375,0
+spidersnugget,375,0
+seye,375,0
+sball,375,0
+snugget,375,0
 fermentedspidereye,376,0
+craftedspidereye,376,0
+fermentedeyeofspider,376,0
+craftedeyeofspider,376,0
+fspidereye,376,0
+feyeofspider,376,0
+ceyeofspider,376,0
+cspidereye,376,0
 blazepowder,377,0
+blazedust,377,0
+goldpowder,377,0
+golddust,377,0
+gdust,377,0
+gpowder,377,0
+bpowder,377,0
+bdust,377,0
 magmacream,378,0
-brewingsstanditem,379,0
+goldcream,378,0
+blazecream,378,0
+mcream,378,0
+gcream,378,0
+bcream,378,0
+combinedcream,378,0
+ccream,378,0
+brewingstanditem,379,0
+potionstanditem,379,0
 cauldronitem,380,0
+ironcauldronitem,380,0
+steelcauldronitem,380,0
+icauldronitem,380,0
+scauldronitem,380,0
 eyeofender,381,0
+endereye,381,0
+evilendereye,381,0
+evileyeofender,381,0
+evilenderpearl,381,0
+eeye,381,0
+eofender,381,0
 speckledmelon,382,0
+goldmelon,382,0
+sparklymelon,382,0
+glisteningmelon,382,0
+glisteringmelon,382,0
+shiningmelon,382,0
+gmelon,382,0
+smelon,382,0
 goldmusicrecord,2256,0
 goldmusicdisk,2256,0
 goldmusiccd,2256,0
@ -2255,6 +2423,7 @@ goldcd,2256,0
 gorecord,2256,0
 godisk,2256,0
 gocd,2256,0
+record1,2256,0
 greenmusicrecord,2257,0
 greenmusicdisk,2257,0
 greenmusiccd,2257,0
@ -2273,6 +2442,7 @@ greencd,2257,0
 grrecord,2257,0
 grdisk,2257,0
 grcd,2257,0
+record2,2257,0
 record3,2258,0
 record4,2259,0
 record5,2260,0
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@ -75,6 +75,8 @@ enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item
 enchantments = \u00a77Enchantments: {0}
 errorCallingCommand=Error calling command /{0}
 errorWithMessage=\u00a7cError: {0}
+essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
+essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
 essentialsReload=\u00a77Essentials Reloaded {0}
 extinguish=\u00a77You extinguished yourself.
 extinguishOthers=\u00a77You extinguished {0}.
@ -280,6 +282,7 @@ requestAcceptedFrom=\u00a77{0} accepted your teleport request.
 requestDenied=\u00a77Teleport request denied.
 requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Request sent to {0}\u00a77.
+requiredBukkit=You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Error occurred when trying to return player to jail.
 second=second
 seconds=seconds
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@ -75,6 +75,8 @@ enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item
 enchantments = \u00a77Enchantments: {0}
 errorCallingCommand=Fejl ved opkald af kommando /{0}
 errorWithMessage=\u00a7cFejl: {0}
+essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
+essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
 essentialsReload=\u00a77Essentials Genindl\u00e6st {0}
 extinguish=\u00a77Du slukkede dig selv.
 extinguishOthers=\u00a77Du slukkede {0}.
@ -280,6 +282,7 @@ requestAcceptedFrom=\u00a77{0} accepted your teleport request.
 requestDenied=\u00a77Teleporterings anmodning n\u00e6gtet.
 requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Anmodning sendt til {0}\u00a77.
+requiredBukkit=You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=En fejl opstod ved fors\u00f8g p\u00e5 at returnere spiller til f\u00e6ngsel.
 second=sekunde
 seconds=sekunder
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@ -75,6 +75,8 @@ enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item
 enchantments = \u00a77Enchantments: {0}
 errorCallingCommand=Fehler beim Aufrufen des Befehls /{0}
 errorWithMessage=\u00a7cFehler: {0}
+essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
+essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
 essentialsReload=\u00a77Essentials neu geladen {0}
 extinguish=\u00a77Du hast dich selbst gel\u00f6scht.
 extinguishOthers=\u00a77Du hast {0} gel\u00f6scht.
@ -280,6 +282,7 @@ requestAcceptedFrom=\u00a77{0} hat deine Teleportierungsanfrage angenommen.
 requestDenied=\u00a77Teleportierungsanfrage verweigert.
 requestDeniedFrom=\u00a77{0} hat deine Teleportierungsanfrage abgelehnt.
 requestSent=\u00a77Anfrage gesendet an {0}\u00a77.
+requiredBukkit=You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Fehler beim Versuch, den Spieler ins Gef\u00e4ngnis zu teleportieren.
 second=Sekunde
 seconds=Sekunden
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@ -75,6 +75,8 @@ enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item
 enchantments = \u00a77Enchantments: {0}
 errorCallingCommand=Error calling command /{0}
 errorWithMessage=\u00a7cError: {0}
+essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
+essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
 essentialsReload=\u00a77Essentials Reloaded {0}
 extinguish=\u00a77You extinguished yourself.
 extinguishOthers=\u00a77You extinguished {0}.
@ -280,6 +282,7 @@ requestAcceptedFrom=\u00a77{0} accepted your teleport request.
 requestDenied=\u00a77Teleport request denied.
 requestDeniedFrom=\u00a77{0} denied your teleport request
 requestSent=\u00a77Request sent to {0}\u00a77.
+requiredBukkit=You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Error occurred when trying to return player to jail.
 second=second
 seconds=seconds
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@ -75,6 +75,8 @@ enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item
 enchantments = \u00a77Enchantments: {0}
 errorCallingCommand=Error al ejecutar el comando /{0}
 errorWithMessage=\u00a7cError: {0}
+essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
+essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
 essentialsReload=\u00a77Essentials Recargado {0}
 extinguish=\u00a77Te has suicidado.
 extinguishOthers=\u00a77Has matado a {0}.
@ -280,6 +282,7 @@ requestAcceptedFrom=\u00a77{0} acepto tu peticion de teletransporte.
 requestDenied=\u00a77Peticion de teletransporte denegada.
 requestDeniedFrom=\u00a77{0} ha denegado tu peticion de teletransporte.
 requestSent=\u00a77Peticion enviada a {0}\u00a77.
+requiredBukkit=You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Error al intentar quitar al jugador de la carcel.
 second=segundo
 seconds=segundos
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@ -75,6 +75,8 @@ enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item
 enchantments = \u00a77Enchantments : {0}
 errorCallingCommand=Erreur en appelant la commande /{0}
 errorWithMessage=\u00a7cErreur : {0}
+essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
+essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
 essentialsReload=\u00a77Essentials Recharg\u00e9 {0}
 extinguish=\u00a77Vous cessez de br\u00fbler.
 extinguishOthers=\u00a77Vous avez \u00e9teint la combustion de {0}.
@ -280,6 +282,7 @@ requestAcceptedFrom=\u00a77{0} a accept\u00e9 votre demande de t\u00e9l\u00e9por
 requestDenied=\u00a77Demande de t\u00e9l\u00e9portation refus\u00e9e.
 requestDeniedFrom=\u00a77{0} a refus\u00e9 votre demande de t\u00e9l\u00e9portation.
 requestSent=\u00a77Requ\u00eate envoy\u00e9e \u00e0 {0}\u00a77.
+requiredBukkit=You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Erreur survenue lors de la tentative d''emprisonner de nouveau un joueur.
 second=seconde
 seconds=secondes
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@ -75,6 +75,8 @@ enchantmentRemoved = \u00a77The enchantment {0} has been removed from your item
 enchantments = \u00a77Enchantments: {0}
 errorCallingCommand=Fout bij het aanroepen van de opdracht /{0}
 errorWithMessage=\u00a7cFout: {0}
+essentialsHelp1=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, go to http://tiny.cc/EssentialsChat
+essentialsHelp2=The file is broken and Essentials can't open it. Essentials is now disabled. If you can't fix the file yourself, either type /essentialshelp in game or go to http://tiny.cc/EssentialsChat
 essentialsReload=\u00a77Essentials is herladen {0}
 extinguish=\u00a77Je hebt jezelf geblust.
 extinguishOthers=\u00a77Je hebt {0} geblust.
@ -280,6 +282,7 @@ requestAcceptedFrom=\u00a77{0} accepted your teleport request.
 requestDenied=\u00a77Teleporteer aanvraag geweigerd.
 requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Aanvraag verstuurd naar {0}\u00a77.
+requiredBukkit=You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
 returnPlayerToJailError=Fout opgetreden bij terugzetten van speler in gevangenis.
 second=seconde
 seconds=seconde
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@ -198,6 +198,10 @@ commands:
    description: Mutes or unmutes a player.
    usage: /<command> <player> [datediff]
    aliases: [emute]
+  near:
+    description: Lists the players near by.
+    usage: /<command> [radius]
+    aliases: [nearby,enear,enearby]
  nick:
    description: Change your nickname or that of another player.
    usage: /<command> [player] <nickname|off>
--- a/EssentialsChat/nbproject/project.properties
+++ b/EssentialsChat/nbproject/project.properties
@ -79,8 +79,7 @@ javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
@ -21,6 +21,15 @@ public class EssentialsChat extends JavaPlugin
 	{
 		final PluginManager pluginManager = getServer().getPluginManager();
 		final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials");
+		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
+		{
+			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
+		}
+		if (!ess.isEnabled())
+		{
+			this.setEnabled(false);
+			return;
+		}

 		chatListener = new HashMap<String, IEssentialsChatListener>();

@ -30,16 +39,16 @@ public class EssentialsChat extends JavaPlugin
 		pluginManager.registerEvent(Type.PLAYER_CHAT, playerListenerLowest, Priority.Lowest, this);
 		pluginManager.registerEvent(Type.PLAYER_CHAT, playerListenerNormal, Priority.Normal, this);
 		pluginManager.registerEvent(Type.PLAYER_CHAT, playerListenerHighest, Priority.Highest, this);
-		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
-		{
-			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
-		}
+
 		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 	}

 	public void onDisable()
 	{
-		chatListener.clear();
+		if (chatListener != null)
+		{
+			chatListener.clear();
+		}
 	}

 	public void addEssentialsChatListener(final String plugin, final IEssentialsChatListener listener)
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@ -79,8 +79,7 @@ javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
+++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
@ -28,13 +28,17 @@ public class EssentialsGeoIP extends JavaPlugin
 	{
 		final PluginManager pm = getServer().getPluginManager();
 		final IEssentials ess = (IEssentials)pm.getPlugin("Essentials");
-		final EssentialsGeoIPPlayerListener playerListener = new EssentialsGeoIPPlayerListener(getDataFolder(), ess);
-		pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
-
 		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
 		{
 			logger.log(Level.WARNING, _("versionMismatchAll"));
 		}
+		if (!ess.isEnabled()) {
+			this.setEnabled(false);
+			return;
+		}
+		final EssentialsGeoIPPlayerListener playerListener = new EssentialsGeoIPPlayerListener(getDataFolder(), ess);
+		pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
+
 		logger.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));

 		logger.log(Level.INFO, "This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/.");
--- a/EssentialsPermissionsCommands/build.xml
+++ b/EssentialsPermissionsCommands/build.xml
@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="EssentialsPermissionsCommands" default="default" basedir=".">
-    <description>Builds, tests, and runs the project EssentialsPermissionsCommands.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="EssentialsPermissionsCommands-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
--- a/EssentialsPermissionsCommands/manifest.mf
+++ b/EssentialsPermissionsCommands/manifest.mf
@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
--- a/EssentialsPermissionsCommands/nbproject/build-impl.xml
+++ b/EssentialsPermissionsCommands/nbproject/build-impl.xml
--- a/EssentialsPermissionsCommands/nbproject/genfiles.properties
+++ b/EssentialsPermissionsCommands/nbproject/genfiles.properties
@ -1,8 +0,0 @@
-build.xml.data.CRC32=9c3a069f
-build.xml.script.CRC32=0a912bb3
-build.xml.stylesheet.CRC32=28e38971@1.43.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=9c3a069f
-nbproject/build-impl.xml.script.CRC32=2a10b0d4
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
--- a/EssentialsPermissionsCommands/nbproject/project.properties
+++ b/EssentialsPermissionsCommands/nbproject/project.properties
@ -1,125 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=EssentialsPermissionsCommands
-application.vendor=
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/EssentialsPermissionsCommands.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
-file.reference.Permissions3.jar=../lib/Permissions3.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=true
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${reference.Essentials.jar}:\
-    ${file.reference.Permissions3.jar}:\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.Essentials=../Essentials
-reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
--- a/EssentialsPermissionsCommands/nbproject/project.xml
+++ b/EssentialsPermissionsCommands/nbproject/project.xml
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>EssentialsPermissionsCommands</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-            <definitions>../lib/nblibraries.properties</definitions>
-        </libraries>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>Essentials</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-        </references>
-    </configuration>
-</project>
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangadd.java
@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangadd extends EssentialsCommand
-{
-	public Commandmangadd()
-	{
-		super("mangadd");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String group = args[0];
-		String command = "permissions g:" + group + " create";
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddi.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangaddi extends EssentialsCommand
-{
-	public Commandmangaddi()
-	{
-		super("mangaddi");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String target = args[0];
-		final String group = args[1];
-		String command = "permissions g:"+target+" parents add "+group;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangaddp.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangaddp extends EssentialsCommand
-{
-	public Commandmangaddp()
-	{
-		super("mangaddp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String target = args[0];
-		final String perm = args[1];
-		String command = "permissions g:"+target+" perms add "+perm;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangcheckp.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangcheckp extends EssentialsCommand
-{
-	public Commandmangcheckp()
-	{
-		super("mangcheckp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String target = args[0];
-		final String perm = args[1];
-		String command = "permissions g:"+target+" has "+perm;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdel.java
@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangdel extends EssentialsCommand
-{
-	public Commandmangdel()
-	{
-		super("mangdel");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String group = args[0];
-		String command = "permissions g:"+group+" delete";
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdeli.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangdeli extends EssentialsCommand
-{
-	public Commandmangdeli()
-	{
-		super("mangdeli");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String target = args[0];
-		final String group = args[1];
-		String command = "permissions g:"+target+" parents remove "+group;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmangdelp.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmangdelp extends EssentialsCommand
-{
-	public Commandmangdelp()
-	{
-		super("mangdelp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String target = args[0];
-		final String perm = args[1];
-		String command = "permissions g:"+target+" perms remove "+perm;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanglistp.java
@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanglistp extends EssentialsCommand
-{
-	public Commandmanglistp()
-	{
-		super("manglistp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String target = args[0];
-		String command = "permissions g:"+target+" perms list";
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanload.java
@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanload extends EssentialsCommand
-{
-	public Commandmanload()
-	{
-		super("manload");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-                String world = "all";
-		if (args.length > 1)
-		{
-			world = args[0];
-		}
-		String command = "permissions -reload "+world;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
@ -1,32 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanuadd extends EssentialsCommand
-{
-	public Commandmanuadd()
-	{
-		super("manuadd");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		final String group = args[1];
-                //TODO: Make this command add a player if it doesnt exist /permissions +player+ create
-		String command = "permissions "+player+" parents add "+group;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddp.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanuaddp extends EssentialsCommand
-{
-	public Commandmanuaddp()
-	{
-		super("manuaddp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		final String perm = args[1];
-		String command = "permissions "+player+" perms add "+perm;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuaddsub.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanuaddsub extends EssentialsCommand
-{
-	public Commandmanuaddsub()
-	{
-		super("manuaddsub");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		final String group = args[1];
-		String command = "permissions "+player+" parents add "+group;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanucheckp.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanucheckp extends EssentialsCommand
-{
-	public Commandmanucheckp()
-	{
-		super("manucheckp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		final String perm = args[1];
-		String command = "permissions "+player+" has "+perm;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudel.java
@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanudel extends EssentialsCommand
-{
-	public Commandmanudel()
-	{
-		super("manudel");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		String command = "permissions "+player+" delete";
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelp.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanudelp extends EssentialsCommand
-{
-	public Commandmanudelp()
-	{
-		super("manudelp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		final String perm = args[1];
-		String command = "permissions "+player+" perms remove "+perm;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanudelsub.java
@ -1,31 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanudelsub extends EssentialsCommand
-{
-	public Commandmanudelsub()
-	{
-		super("manudelsub");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		final String group = args[1];
-		String command = "permissions "+player+" parents remove "+group;
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanulistp.java
@ -1,30 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandmanulistp extends EssentialsCommand
-{
-	public Commandmanulistp()
-	{
-		super("manulistp");
-	}
-
-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final String player = args[0];
-		String command = "permissions "+player+" perms list";
-		sender.sendMessage(commandLabel + " is deprecated. Use " + command + " instead.");
-		ess.getServer().dispatchCommand(sender, command);
-	}
-	
-	
-}
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
@ -1,57 +0,0 @@
-package com.earth2me.essentials.permissions;
-
-import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.Util;
-import com.nijiko.permissions.PermissionHandler;
-import com.nijikokun.bukkit.Permissions.Permissions;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-
-
-public class EssentialsPermissionsCommands extends JavaPlugin
-{
-	private static PermissionHandler permissionHandler = null;
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private IEssentials ess;
-
-	public static PermissionHandler getPermissionHandler()
-	{
-		return permissionHandler;
-	}
-
-	@Override
-	public void onEnable()
-	{
-		final PluginManager pluginManager = getServer().getPluginManager();
-		final Plugin permissionsPlugin = pluginManager.getPlugin("Permissions");
-
-		if (permissionsPlugin != null
-			&& permissionsPlugin.getDescription().getVersion().charAt(0) == '3')
-		{
-			permissionHandler = ((Permissions)permissionsPlugin).getHandler();
-		}
-		ess = (IEssentials)pluginManager.getPlugin("Essentials");
-
-		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) {
-			LOGGER.log(Level.WARNING, Util.i18n("versionMismatchAll"));
-		}
-		LOGGER.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
-		
-	}
-
-	@Override
-	public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args)
-	{
-		return ess.onCommandEssentials(sender, command, label, args, EssentialsPermissionsCommands.class.getClassLoader(), "com.earth2me.essentials.permissions.Command", "groupmanager.");
-	}
-
-	@Override
-	public void onDisable()
-	{
-	}
-}
--- a/EssentialsPermissionsCommands/src/plugin.yml
+++ b/EssentialsPermissionsCommands/src/plugin.yml
@ -1,166 +0,0 @@
-# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
-name: EssentialsPermissionsCommands
-main: com.earth2me.essentials.permissions.EssentialsPermissionsCommands
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
-website: http://www.earth2me.net:8001/
-description: Adds commands aliases to Permissions 3
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
-depend: [Permissions, Essentials]
-commands:
-  manuadd:
-    description: Move a player to desired group.(Adds to the file if not exists)
-    usage: /<command> <player> <group>
-    permission: groupmanager.manuadd
-  manudel:
-    description: Remove any user specific configuration. Make him default group.
-    usage: /<command> <player>
-    permission: groupmanager.manudel
-  manuaddsub:
-    description: Add a group to a player's subgroup list.
-    usage: /<command> <player> <group>
-    permission: groupmanager.manuaddsub
-  manudelsub:
-    description: Remove a group to a player's subgroup list.
-    usage: /<command> <player> <group>
-    permission: groupmanager.manudelsub
-  mangadd:
-    description: Add group to the system.
-    usage: /<command> <group>
-    permission: groupmanager.mangadd
-  mangdel:
-    description: Removes group from the system(all it's users become default)
-    usage: /<command> <group>
-    permission: groupmanager.mangdel
-  manuaddp:
-    description: Add permission diretly to the player.
-    usage: /<command> <player> <permission>
-    permission: groupmanager.manuaddp
-  manudelp:
-    description: Removes permission diretly from the player.
-    usage: /<command> <player> <permission>
-    permission: groupmanager.manudelp
-  manulistp:
-    description: List all permissions from a player.
-    usage: /<command> <player>
-    permission: groupmanager.manulistp
-  manucheckp:
-    description: Verify if user has a permission, and where it comes from.
-    usage: /<command> <player> <permission>
-    permission: groupmanager.manucheckp
-  mangaddp:
-    description: Add permission to a group.
-    usage: /<command> <group> <permission>
-    permission: groupmanager.mangaddp
-  mangdelp:
-    description: Removes permission from a group.
-    usage: /<command> <group> <permission>
-    permission: groupmanager.mangdelp
-  manglistp:
-    description: Lists all permissions from a group.
-    usage: /<command> <group>
-    permission: groupmanager.manglistp
-  mangcheckp:
-    description: Check if group has a permission, and where it comes from.
-    usage: /<command> <group> <permission>
-    permission: groupmanager.mangcheckp
-  mangaddi:
-    description: Add a group to another group inheritance list.
-    usage: /<command> <group1> <group2>
-    permission: groupmanager.mangaddi
-  mangdeli:
-    description: Remove a group from another group inheritance list.
-    usage: /<command> <group1> <group2>
-    permission: groupmanager.mangdeli
-  manuaddv:
-    description: Add, or replaces, a variable to a user (like prefix or suffix).
-    usage: /<command> <user> <variable> <value>
-    permission: groupmanager.manuaddv
-  manudelv:
-    description: Remove a variable from a user.
-    usage: /<command> <user> <variable>
-    permission: groupmanager.manudelv
-  manulistv:
-    description: List variables a user has (like prefix or suffix).
-    usage: /<command> <user>
-    permission: groupmanager.manulistv
-  manucheckv:
-    description: Verify a value of a variable of user, and where it comes from.
-    usage: /<command> <user> <variable>
-    permission: groupmanager.manucheckv
-  mangaddv:
-    description: Add, or replaces, a variable to a group (like prefix or suffix).
-    usage: /<command> <group> <variable> <value>
-    permission: groupmanager.mangaddv
-  mangdelv:
-    description: Remove a variable from a group.
-    usage: /<command> <group> <variable>
-    permission: groupmanager.mangdelv
-  manglistv:
-    description: List variables a group has (like prefix or suffix).
-    usage: /<command> <group>
-    permission: groupmanager.manglistv
-  mangcheckv:
-    description: Verify a value of a variable of group, and where it comes from.
-    usage: /<command> <group> <variable>
-    permission: groupmanager.mangcheckv
-  manwhois:
-    description: Tell the group that user belongs.
-    usage: /<command> <player>
-    permission: groupmanager.manwhois
-  tempadd:
-    description: Creates a temporary permission copy for that user.
-    usage: /<command> <player>
-    permission: groupmanager.tempadd
-  tempdel:
-    description: Remove the temporary permission copy for player.
-    usage: /<command> <player>
-    permission: groupmanager.tempdel
-  templist:
-    description: List players in overload-permissions mode made by /tempadd.
-    usage: /<command>
-    permission: groupmanager.templist
-  tempdelall:
-    description: Remove all overrides made by command /tempadd.
-    usage: /<command>
-    permission: groupmanager.tempdelall
-  mansave:
-    description: Save all permissions on file.
-    usage: /<command>
-    permission: groupmanager.mansave
-  manload:
-    description: Reload current world and config.yml. Or load given world.
-    usage: /<command> [world]
-    permission: groupmanager.manload
-  listgroups:
-    description: List the groups available.
-    usage: /<command>
-    permission: groupmanager.listgroups
-  manpromote:
-    description: Promote a player in the same heritage line to a higher rank.
-    usage: /<command> <player> <group>
-    permission: groupmanager.manpromote
-  mandemote:
-    description: Demote a player in the same heritage line to a lower rank.
-    usage: /<command> <player> <group>
-    permission: groupmanager.mandemote
-  mantogglevalidate:
-    description: Toggle on/off the validating if player is online.
-    usage: /<command>
-    permission: groupmanager.mantogglevalidate
-  mantogglesave:
-    description: Toggle on/ff the autosave.
-    usage: /<command>
-    permission: groupmanager.mantogglesave
-  manworld:
-    description: Prints the selected world name
-    usage: /<command>
-    permission: groupmanager.manworld
-  manselect:
-    description: Select a world to work with next commands.
-    usage: /<command> <world>
-    permission: groupmanager.manselect
-  manclear:
-    description: Clear world selection. Next commands will work on your world.
-    usage: /<command>
-    permission: groupmanager.manclear
--- a/EssentialsProtect/MANIFEST.MF
+++ b/EssentialsProtect/MANIFEST.MF
@ -1,2 +1 @@
 Manifest-Version: 1.0
-Class-Path: ../lib/mysql.jar ../lib/sqlite.jar
--- a/EssentialsProtect/nbproject/project.properties
+++ b/EssentialsProtect/nbproject/project.properties
@ -83,8 +83,7 @@ javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyBlockListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyBlockListener.java
@ -0,0 +1,36 @@
+package com.earth2me.essentials.protect;
+
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockListener;
+
+
+public class EmergencyBlockListener extends BlockListener
+{
+
+	@Override
+	public void onBlockBurn(final BlockBurnEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@Override
+	public void onBlockIgnite(final BlockIgniteEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@Override
+	public void onBlockFromTo(final BlockFromToEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@Override
+	public void onBlockBreak(final BlockBreakEvent event)
+	{
+		event.setCancelled(true);
+	}
+}
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyEntityListener.java
@ -0,0 +1,22 @@
+package com.earth2me.essentials.protect;
+
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityListener;
+
+
+public class EmergencyEntityListener extends EntityListener
+{
+
+	@Override
+	public void onEntityExplode(final EntityExplodeEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@Override
+	public void onEntityDamage(final EntityDamageEvent event)
+	{
+		event.setCancelled(true);
+	}
+}
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyPlayerListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyPlayerListener.java
@ -0,0 +1,16 @@
+package com.earth2me.essentials.protect;
+
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerListener;
+
+
+public class EmergencyPlayerListener extends PlayerListener
+{
+
+	@Override
+	public void onPlayerJoin(PlayerJoinEvent event)
+	{
+		event.getPlayer().sendMessage("Essentials Protect is in emergency mode. Check your log for errors.");
+	}
+	
+}
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
@ -0,0 +1,124 @@
+package com.earth2me.essentials.protect;
+
+import com.earth2me.essentials.IConf;
+import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.protect.data.ProtectedBlockMemory;
+import com.earth2me.essentials.protect.data.ProtectedBlockMySQL;
+import com.earth2me.essentials.protect.data.ProtectedBlockSQLite;
+import java.beans.PropertyVetoException;
+import static com.earth2me.essentials.I18n._;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+
+public class EssentialsConnect
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient IEssentials ess;
+	private final transient IProtect protect;
+
+	public EssentialsConnect(Plugin essPlugin, Plugin essProtect)
+	{
+		if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion()))
+		{
+			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
+		}
+		ess = (IEssentials)essPlugin;
+		protect = (IProtect)essProtect;
+		ProtectReloader pr = new ProtectReloader();
+		pr.reloadConfig();
+		ess.addReloadListener(pr);
+		LOGGER.info(_("loadinfo", essProtect.getDescription().getName(), essProtect.getDescription().getVersion(), "essentials team"));
+
+	}
+
+	public void onDisable()
+	{
+	}
+
+	public IEssentials getEssentials()
+	{
+		return ess;
+	}
+
+	public void alert(final User user, final String item, final String type)
+	{
+		final Location loc = user.getLocation();
+		final String warnMessage = _("alertFormat", user.getName(), type, item,
+									 loc.getWorld().getName() + "," + loc.getBlockX() + ","
+									 + loc.getBlockY() + "," + loc.getBlockZ());
+		LOGGER.log(Level.WARNING, warnMessage);
+		for (Player p : ess.getServer().getOnlinePlayers())
+		{
+			final User alertUser = ess.getUser(p);
+			if (alertUser.isAuthorized("essentials.protect.alerts"))
+			{
+				alertUser.sendMessage(warnMessage);
+			}
+		}
+	}
+
+
+	private class ProtectReloader implements IConf
+	{
+		@Override
+		public void reloadConfig()
+		{
+			if (protect.getStorage() != null)
+			{
+				protect.getStorage().onPluginDeactivation();
+			}
+			for (ProtectConfig protectConfig : ProtectConfig.values())
+			{
+				if (protectConfig.isList())
+				{
+					protect.getSettingsList().put(protectConfig, ess.getSettings().getProtectList(protectConfig.getConfigName()));
+				}
+				else if (protectConfig.isString())
+				{
+					protect.getSettingsString().put(protectConfig, ess.getSettings().getProtectString(protectConfig.getConfigName()));
+				}
+				else
+				{
+					protect.getSettingsBoolean().put(protectConfig, ess.getSettings().getProtectBoolean(protectConfig.getConfigName(), protectConfig.getDefaultValueBoolean()));
+				}
+
+			}
+
+			if (protect.getSettingString(ProtectConfig.datatype).equalsIgnoreCase("mysql"))
+			{
+				try
+				{
+					protect.setStorage(new ProtectedBlockMySQL(
+							protect.getSettingString(ProtectConfig.mysqlDB),
+							protect.getSettingString(ProtectConfig.dbUsername),
+							protect.getSettingString(ProtectConfig.dbPassword)));
+				}
+				catch (PropertyVetoException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+			}
+			else
+			{
+				try
+				{
+					protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db"));
+				}
+				catch (PropertyVetoException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+			}
+			if (protect.getSettingBool(ProtectConfig.memstore))
+			{
+				protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect));
+			}
+
+		}
+	}
+}
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@ -1,14 +1,6 @@
 package com.earth2me.essentials.protect;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.IConf;
-import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.User;
 import com.earth2me.essentials.protect.data.IProtectedBlock;
-import com.earth2me.essentials.protect.data.ProtectedBlockMemory;
-import com.earth2me.essentials.protect.data.ProtectedBlockMySQL;
-import com.earth2me.essentials.protect.data.ProtectedBlockSQLite;
-import java.beans.PropertyVetoException;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@ -16,15 +8,15 @@ import java.util.logging.Filter;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Priority;
 import org.bukkit.event.Event.Type;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;


-public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
+public class EssentialsProtect extends JavaPlugin implements IProtect
 {
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private static com.mchange.v2.log.MLogger C3P0logger;
@ -32,7 +24,7 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
 	private final transient Map<ProtectConfig, String> settingsString = new EnumMap<ProtectConfig, String>(ProtectConfig.class);
 	private final transient Map<ProtectConfig, List<Integer>> settingsList = new EnumMap<ProtectConfig, List<Integer>>(ProtectConfig.class);
 	private transient IProtectedBlock storage = null;
-	public transient IEssentials ess = null;
+	private transient EssentialsConnect ess = null;

 	@Override
 	public void onLoad()
@ -50,7 +42,13 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
 	public void onEnable()
 	{
 		final PluginManager pm = this.getServer().getPluginManager();
-		ess = (IEssentials)pm.getPlugin("Essentials");
+		final Plugin essPlugin = pm.getPlugin("Essentials");
+		if (essPlugin == null || !essPlugin.isEnabled())
+		{
+			enableEmergencyMode(pm);
+			return;
+		}
+		ess = new EssentialsConnect(essPlugin, this);

 		final EssentialsProtectPlayerListener playerListener = new EssentialsProtectPlayerListener(this);
 		pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Low, this);
@ -76,14 +74,25 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
 		pm.registerEvent(Type.LIGHTNING_STRIKE, weatherListener, Priority.Highest, this);
 		pm.registerEvent(Type.THUNDER_CHANGE, weatherListener, Priority.Highest, this);
 		pm.registerEvent(Type.WEATHER_CHANGE, weatherListener, Priority.Highest, this);
+	}

-		reloadConfig();
-		ess.addReloadListener(this);
-		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
+	private void enableEmergencyMode(final PluginManager pm)
+	{
+		final EmergencyBlockListener emBlockListener = new EmergencyBlockListener();
+		final EmergencyEntityListener emEntityListener = new EmergencyEntityListener();
+		final EmergencyPlayerListener emPlayerListener = new EmergencyPlayerListener();
+		pm.registerEvent(Type.PLAYER_JOIN, emPlayerListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_BURN, emBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_IGNITE, emBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_FROMTO, emBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_BREAK, emBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.ENTITY_DAMAGE, emEntityListener, Priority.Low, this);
+		pm.registerEvent(Type.ENTITY_EXPLODE, emEntityListener, Priority.Low, this);
+		for (Player player : getServer().getOnlinePlayers())
 		{
-			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
+			player.sendMessage("Essentials Protect is in emergency mode. Check your log for errors.");
 		}
-		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
+		LOGGER.log(Level.SEVERE, "Essentials not installed or failed to load. Essenials Protect is in emergency mode now.");
 	}

 	@Override
@ -93,84 +102,38 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
 		return itemList != null && !itemList.isEmpty() && itemList.contains(id);
 	}

-	@Override
-	public void alert(final User user, final String item, final String type)
-	{
-		final Location loc = user.getLocation();
-		final String warnMessage = _("alertFormat", user.getName(), type, item,
-									 loc.getWorld().getName() + "," + loc.getBlockX() + ","
-									 + loc.getBlockY() + "," + loc.getBlockZ());
-		LOGGER.log(Level.WARNING, warnMessage);
-		for (Player p : this.getServer().getOnlinePlayers())
-		{
-			final User alertUser = ess.getUser(p);
-			if (alertUser.isAuthorized("essentials.protect.alerts"))
-			{
-				alertUser.sendMessage(warnMessage);
-			}
-		}
-	}
-
-	public void reloadConfig()
-	{
-		if (storage != null)
-		{
-			storage.onPluginDeactivation();
-		}
-		for (ProtectConfig protectConfig : ProtectConfig.values())
-		{
-			if (protectConfig.isList())
-			{
-				settingsList.put(protectConfig, ess.getSettings().getProtectList(protectConfig.getConfigName()));
-			}
-			else if (protectConfig.isString())
-			{
-				settingsString.put(protectConfig, ess.getSettings().getProtectString(protectConfig.getConfigName()));
-			}
-			else
-			{
-				settingsBoolean.put(protectConfig, ess.getSettings().getProtectBoolean(protectConfig.getConfigName(), protectConfig.getDefaultValueBoolean()));
-			}
-
-		}
-
-		if (getSettingString(ProtectConfig.datatype).equalsIgnoreCase("mysql"))
-		{
-			try
-			{
-				storage = new ProtectedBlockMySQL(
-						getSettingString(ProtectConfig.mysqlDB),
-						getSettingString(ProtectConfig.dbUsername),
-						getSettingString(ProtectConfig.dbPassword));
-			}
-			catch (PropertyVetoException ex)
-			{
-				LOGGER.log(Level.SEVERE, null, ex);
-			}
-		}
-		else
-		{
-			try
-			{
-				storage = new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db");
-			}
-			catch (PropertyVetoException ex)
-			{
-				LOGGER.log(Level.SEVERE, null, ex);
-			}
-		}
-		if (getSettingBool(ProtectConfig.memstore))
-		{
-			storage = new ProtectedBlockMemory(storage, this);
-		}
-	}
-
 	@Override
 	public IProtectedBlock getStorage()
 	{
 		return storage;
 	}

+	@Override
+	public void setStorage(IProtectedBlock pb)
+	{
+		storage = pb;
+	}
+
+	public EssentialsConnect getEssentialsConnect()
+	{
+		return ess;
+	}
+	
+	public Map<ProtectConfig, Boolean> getSettingsBoolean()
+	{
+		return settingsBoolean;
+	}
+
+	public Map<ProtectConfig, String> getSettingsString()
+	{
+		return settingsString;
+	}
+
+	public Map<ProtectConfig, List<Integer>> getSettingsList()
+	{
+		return settingsList;
+	}
+
 	@Override
 	public boolean getSettingBool(final ProtectConfig protectConfig)
 	{
@ -200,9 +163,4 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
 		{
 		}
 	}
-
-	public IEssentials getEssentials()
-	{
-		return ess;
-	}
 }
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
@ -20,7 +20,7 @@ public class EssentialsProtectBlockListener extends BlockListener
 	public EssentialsProtectBlockListener(final IProtect parent)
 	{
 		this.prot = parent;
-		this.ess = prot.getEssentials();
+		this.ess = prot.getEssentialsConnect().getEssentials();
 	}

 	@Override
@ -50,7 +50,7 @@ public class EssentialsProtectBlockListener extends BlockListener

 		if (prot.checkProtectionItems(ProtectConfig.alert_on_placement, id))
 		{
-			prot.alert(user, blockPlaced.getType().toString(), _("alertPlaced"));
+			prot.getEssentialsConnect().alert(user, blockPlaced.getType().toString(), _("alertPlaced"));
 		}

 		final Block below = blockPlaced.getRelative(BlockFace.DOWN);
@ -248,7 +248,7 @@ public class EssentialsProtectBlockListener extends BlockListener

 		if (prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId))
 		{
-			prot.alert(user, type.toString(), _("alertBroke"));
+			prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke"));
 		}
 		final IProtectedBlock storage = prot.getStorage();

--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@ -21,7 +21,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 	public EssentialsProtectEntityListener(final IProtect prot)
 	{
 		this.prot = prot;
-		this.ess = prot.getEssentials();
+		this.ess = prot.getEssentialsConnect().getEssentials();
 	}

 	@Override
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
@ -19,7 +19,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener
 	public EssentialsProtectPlayerListener(final IProtect prot)
 	{
 		this.prot = prot;
-		this.ess = prot.getEssentials();
+		this.ess = prot.getEssentialsConnect().getEssentials();
 	}

 	@Override
@ -83,7 +83,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener
 		if (item != null
 			&& prot.checkProtectionItems(ProtectConfig.alert_on_use, item.getTypeId()))
 		{
-			prot.alert(user, item.getType().toString(), _("alertUsed"));
+			prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed"));
 		}
 	}
 }
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java
@ -1,14 +1,13 @@
 package com.earth2me.essentials.protect;

-import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.User;
 import com.earth2me.essentials.protect.data.IProtectedBlock;
+import java.util.List;
+import java.util.Map;
+import org.bukkit.plugin.Plugin;


-public interface IProtect
+public interface IProtect extends Plugin
 {
-	void alert(final User user, final String item, final String type);
-
 	boolean checkProtectionItems(final ProtectConfig list, final int id);

 	boolean getSettingBool(final ProtectConfig protectConfig);
@ -17,5 +16,13 @@ public interface IProtect

 	IProtectedBlock getStorage();

-	IEssentials getEssentials();
+	void setStorage(IProtectedBlock pb);
+
+	EssentialsConnect getEssentialsConnect();
+
+	Map<ProtectConfig, Boolean> getSettingsBoolean();
+
+	Map<ProtectConfig, String> getSettingsString();
+
+	Map<ProtectConfig, List<Integer>> getSettingsList();
 }
--- a/EssentialsProtect/src/plugin.yml
+++ b/EssentialsProtect/src/plugin.yml
@ -6,4 +6,4 @@ version: TeamCity
 website: http://www.earth2me.net:8001/
 description: Provides protection for various parts of the world.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
-depend: [Essentials]
+softdepend: [Essentials]
--- a/EssentialsSpawn/nbproject/project.properties
+++ b/EssentialsSpawn/nbproject/project.properties
@ -79,8 +79,7 @@ javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
@ -21,15 +21,18 @@ public class EssentialsSpawn extends JavaPlugin
 	{
 		final PluginManager pluginManager = getServer().getPluginManager();
 		ess = (IEssentials)pluginManager.getPlugin("Essentials");
-		final EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(ess);
-		pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.Low, this);
-		pluginManager.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this);
-
-
 		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
 		{
 			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
 		}
+		if (!ess.isEnabled()) {
+			this.setEnabled(false);
+			return;
+		}
+		final EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(ess);
+		pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.Low, this);
+		pluginManager.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this);
+
 		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 	}

--- a/EssentialsUpdate/nbproject/project.properties
+++ b/EssentialsUpdate/nbproject/project.properties
@ -67,8 +67,7 @@ file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 includes=**
 jar.compress=true
 javac.classpath=\
-    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
-    ${libs.junit_4.classpath}
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@ -78,7 +77,8 @@ javac.source=1.6
 javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
-    ${build.classes.dir}
+    ${build.classes.dir}:\
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/EssentialsXMPP/build.xml
+++ b/EssentialsXMPP/build.xml
@ -74,7 +74,7 @@
 	<target name="-post-jar">
 	    <jar jarfile="${dist.dir}/EssentialsXMPP.jar">
 	      <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-	      <zipfileset src="../lib/smack-3.2.0.jar" excludes="META-INF/*" />
+	      <zipfileset src="../lib/smack-3.2.1.jar" excludes="META-INF/*" />
 	      <manifest>
 	        <attribute name="Classpath" value="Essentials.jar"/>
 	      </manifest>
--- a/EssentialsXMPP/nbproject/project.properties
+++ b/EssentialsXMPP/nbproject/project.properties
@ -64,7 +64,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
-file.reference.smack-3.2.0.jar=../lib/smack-3.2.0.jar
+file.reference.smack-3.2.1.jar=../lib/smack-3.2.1.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=true
@ -72,7 +72,7 @@ jar.index=${jnlp.enabled}
 javac.classpath=\
    ${reference.Essentials.jar}:\
    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
-    ${file.reference.smack-3.2.0.jar}
+    ${file.reference.smack-3.2.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked
 javac.deprecation=false
@ -83,8 +83,7 @@ javac.target=1.6
 javac.test.classpath=\
    ${javac.classpath}:\
    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
    ${javac.test.classpath}
 javadoc.additionalparam=
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
@ -36,9 +36,14 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP

 		final PluginManager pluginManager = getServer().getPluginManager();
 		ess = (IEssentials)pluginManager.getPlugin("Essentials");
-		if (ess == null)
+		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
 		{
-			LOGGER.log(Level.SEVERE, "Failed to load Essentials before EssentialsXMPP");
+			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
+		}
+		if (!ess.isEnabled())
+		{
+			this.setEnabled(false);
+			return;
 		}

 		final EssentialsXMPPPlayerListener playerListener = new EssentialsXMPPPlayerListener(ess);
@ -52,17 +57,16 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
 		ess.addReloadListener(users);
 		ess.addReloadListener(xmpp);

-		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
-		{
-			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
-		}
 		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 	}

 	@Override
 	public void onDisable()
 	{
-		xmpp.disconnect();
+		if (xmpp != null)
+		{
+			xmpp.disconnect();
+		}
 	}

 	@Override
--- a/lib/EssentialsiConomyBridge.jar
+++ b/lib/EssentialsiConomyBridge.jar
--- a/lib/VanishNoPickup.jar
+++ b/lib/VanishNoPickup.jar
--- a/lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+++ b/lib/bukkit-1.0.0-R1-SNAPSHOT.jar
--- a/lib/craftbukkit-1.0.0-SNAPSHOT.jar
+++ b/lib/craftbukkit-1.0.0-SNAPSHOT.jar
--- a/lib/gson.jar
+++ b/lib/gson.jar
--- a/lib/junit/junit-3.8.2-api.zip
+++ b/lib/junit/junit-3.8.2-api.zip
--- a/lib/junit/junit-3.8.2.jar
+++ b/lib/junit/junit-3.8.2.jar
--- a/lib/junit_4.10/junit-4.10-src.jar
+++ b/lib/junit_4.10/junit-4.10-src.jar
--- a/lib/junit_4.10/junit-4.10.jar
+++ b/lib/junit_4.10/junit-4.10.jar
--- a/lib/junit_4/junit-4.5-api.zip
+++ b/lib/junit_4/junit-4.5-api.zip
--- a/lib/junit_4/junit-4.5-src.jar
+++ b/lib/junit_4/junit-4.5-src.jar
--- a/lib/junit_4/junit-4.5.jar
+++ b/lib/junit_4/junit-4.5.jar
--- a/lib/mysql.jar
+++ b/lib/mysql.jar
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@ -1,13 +1,7 @@
 libs.CopyLibs.classpath=\
    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
-libs.junit.classpath=\
-    ${base}/junit/junit-3.8.2.jar
-libs.junit.javadoc=\
-    ${base}/junit/junit-3.8.2-api.zip
-libs.junit_4.classpath=\
-    ${base}/junit_4/junit-4.5.jar
-libs.junit_4.javadoc=\
-    ${base}/junit_4/junit-4.5-api.zip
-libs.junit_4.src=\
-    ${base}/junit_4/junit-4.5-src.jar
+libs.junit_4.10.classpath=\
+    ${base}/junit_4.10/junit-4.10.jar
+libs.junit_4.10.src=\
+    ${base}/junit_4.10/junit-4.10-src.jar
 project.EssentialsGroupManager=../EssentialsGroupManager
--- a/lib/smack-3.2.1.jar
+++ b/lib/smack-3.2.1.jar
--- a/lib/sqlite.jar
+++ b/lib/sqlite.jar