package name change to net.ess3

21 files changed, 45 insertions, 164 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
deleted file mode 100644
index feeeb19df..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.earth2me.essentials.protect;
-
-
-/*public enum ProtectConfig
-{
-	datatype("protect.datatype", "sqlite"),
-	mysqlDB("protect.mysqlDb", "jdbc:mysql://localhost:3306/minecraft"),
-	dbUsername("protect.username", "root"),
-	dbPassword("protect.password", ""),
-	memstore("protect.memstore", false),
-	disable_contactdmg("protect.disable.contactdmg", false),
-	disable_lavadmg("protect.disable.lavadmg", false),
-	disable_build("protect.disable.build", true),
-	disable_use("protect.disable.use", true),
-	disable_pvp("protect.disable.pvp", false),
-	disable_projectiles("protect.disable.projectiles", false),
-	disable_fall("protect.disable.fall", false),
-	disable_suffocate("protect.disable.suffocate", false),
-	disable_firedmg("protect.disable.firedmg", false),
-	disable_lightning("protect.disable.lightning", false),
-	disable_drown("protect.disable.drown", false),
-	disable_weather_storm("protect.disable.weather.storm", false),
-	disable_weather_lightning("protect.disable.weather.lightning", false),
-	disable_weather_thunder("protect.disable.weather.thunder", false),
-	prevent_fire_spread("protect.prevent.fire-spread", true),
-	prevent_flint_fire("protect.prevent.flint-fire", false),
-	prevent_lava_fire_spread("protect.prevent.lava-fire-spread", true),
-	prevent_lightning_fire_spread("protect.prevent.lightning-fire-spread", true),
-	prevent_water_flow("protect.prevent.water-flow", false),
-	prevent_lava_flow("protect.prevent.lava-flow", false),
-	prevent_water_bucket_flow("protect.prevent.water-bucket-flow", false),
-	prevent_portal_creation("protect.prevent.portal-creation", false),
-	prevent_block_on_rail("protect.protect.prevent-block-on-rails", false),
-	prevent_tnt_explosion("protect.prevent.tnt-explosion", false),
-	prevent_tnt_playerdmg("protect.prevent.tnt-playerdamage", false),
-	prevent_fireball_explosion("protect.prevent.fireball-explosion", false),
-	prevent_fireball_fire("protect.prevent.fireball-fire", false),
-	prevent_fireball_playerdmg("protect.prevent.fireball-playerdamage", false),
-	prevent_creeper_explosion("protect.prevent.creeper-explosion", true),
-	prevent_creeper_playerdmg("protect.prevent.creeper-playerdamage", false),
-	prevent_creeper_blockdmg("protect.prevent.creeper-blockdamage", false),
-	prevent_enderman_pickup("protect.prevent.enderman-pickup", false),
-	prevent_villager_death("protect.prevent.villager-death", false),
-	prevent_enderdragon_blockdmg("protect.prevent.enderdragon-blockdamage", true),
-	prevent_entitytarget("protect.prevent.entitytarget", false),
-	protect_rails("protect.protect.rails", true),
-	protect_below_rails("protect.protect.block-below", true),
-	protect_signs("protect.protect.signs", true),
-	protect_against_signs("protect.protect.block-below", true),
-	enderdragon_fakeexplosions("protect.enderdragon-fakeexplosions", false),
-	alert_on_placement("protect.alert.on-placement"),
-	alert_on_use("protect.alert.on-use"),
-	alert_on_break("protect.alert.on-break"),
-	blacklist_placement("protect.blacklist.placement"),
-	blacklist_usage("protect.blacklist.usage"),
-	blacklist_break("protect.blacklist.break"),
-	blacklist_piston("protect.blacklist.piston");
-	private final String configName;
-	private final String defValueString;
-	private final boolean defValueBoolean;
-	private final boolean isList;
-	private final boolean isString;
-
-	private ProtectConfig(final String configName)
-	{
-		this(configName, null, false, true, false);
-	}
-
-	private ProtectConfig(final String configName, final String defValueString)
-	{
-		this(configName, defValueString, false, false, true);
-	}
-
-	private ProtectConfig(final String configName, final boolean defValueBoolean)
-	{
-		this(configName, null, defValueBoolean, false, false);
-	}
-
-	private ProtectConfig(final String configName, final String defValueString, final boolean defValueBoolean, final boolean isList, final boolean isString)
-	{
-		this.configName = configName;
-		this.defValueString = defValueString;
-		this.defValueBoolean = defValueBoolean;
-		this.isList = isList;
-		this.isString = isString;
-	}
-
-	/**
-	 * @return the configName
-	 *//*
-	public String getConfigName()
-	{
-		return configName;
-	}
-
-	/**
-	 * @return the default value String
-	 *//*
-	public String getDefaultValueString()
-	{
-		return defValueString;
-	}
-
-	/**
-	 * @return the default value boolean
-	 *//*
-	public boolean getDefaultValueBoolean()
-	{
-		return defValueBoolean;
-	}
-
-	public boolean isString()
-	{
-		return isString;
-	}
-
-	public boolean isList()
-	{
-		return isList;
-	}
-}*/
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java b/EssentialsProtect/src/net/ess3/protect/BlockBreakPermissions.java
index 05a376a03..1a07588e8 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java
+++ b/EssentialsProtect/src/net/ess3/protect/BlockBreakPermissions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
+import net.ess3.api.IPermission;
+import net.ess3.permissions.AbstractSuperpermsPermission;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java b/EssentialsProtect/src/net/ess3/protect/BlockPlacePermissions.java
index e7a4c29c5..87e771e73 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java
+++ b/EssentialsProtect/src/net/ess3/protect/BlockPlacePermissions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
+import net.ess3.api.IPermission;
+import net.ess3.permissions.AbstractSuperpermsPermission;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java b/EssentialsProtect/src/net/ess3/protect/EmergencyListener.java
index 5f9253c55..2d70ee698 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EmergencyListener.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
index ceb425e6a..c3fcfe441 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
@@ -1,11 +1,11 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IReload;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.protect.data.ProtectedBlockMySQL;
-import com.earth2me.essentials.protect.data.ProtectedBlockSQLite;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IReload;
+import net.ess3.api.IUser;
+import net.ess3.protect.data.ProtectedBlockMySQL;
+import net.ess3.protect.data.ProtectedBlockSQLite;
 import java.beans.PropertyVetoException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java
index fa3fff70d..9f1e58e10 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java
@@ -1,10 +1,11 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import com.earth2me.essentials.protect.data.IProtectedBlock;
+import net.ess3.protect.data.IProtectedBlock;
 import java.util.logging.Filter;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
+
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
@@ -40,7 +41,7 @@ public class EssentialsProtect extends JavaPlugin implements IProtect
 	public void onEnable()
 	{
 		final PluginManager pm = this.getServer().getPluginManager();
-		final Plugin essPlugin = pm.getPlugin("Essentials3");
+		final Plugin essPlugin = pm.getPlugin("Essentials-3");
 		if (essPlugin == null || !essPlugin.isEnabled())
 		{
 			enableEmergencyMode(pm);
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
index 89dcc71cb..ecfee8e20 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
@@ -1,9 +1,10 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.protect.data.IProtectedBlock;
+import static net.ess3.I18n._;
+import net.ess3.protect.data.IProtectedBlock;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java
index 8966b5336..67df5c8c5 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
 import org.bukkit.Material;
 import org.bukkit.block.Block;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectPlayerListener.java
index 9b870d383..64e4a529b 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectPlayerListener.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java
index babebac71..6f08bdd13 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java b/EssentialsProtect/src/net/ess3/protect/IProtect.java
index d25661bf8..df2a454a0 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java
+++ b/EssentialsProtect/src/net/ess3/protect/IProtect.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import com.earth2me.essentials.protect.data.IProtectedBlock;
+import net.ess3.protect.data.IProtectedBlock;
 import org.bukkit.plugin.Plugin;
 
 
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java b/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java
index c4cfd617d..d9ecf9bc0 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java
+++ b/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.permissions.AbstractSuperpermsPermission;
+import net.ess3.api.IPermission;
+import net.ess3.permissions.AbstractSuperpermsPermission;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java
index edd9a1d40..37042618b 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java
+++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import com.earth2me.essentials.api.IPermission;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.api.IPermission;
+import net.ess3.utils.Util;
 import java.util.Locale;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
index 626f82dd5..145a5e97e 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java
+++ b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.protect;
+package net.ess3.protect;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.settings.protect.Protect;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import net.ess3.api.IEssentials;
+import net.ess3.settings.protect.Protect;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java b/EssentialsProtect/src/net/ess3/protect/data/IProtectedBlock.java
index 755baface..a27adfb3c 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java
+++ b/EssentialsProtect/src/net/ess3/protect/data/IProtectedBlock.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect.data;
+package net.ess3.protect.data;
 
 import java.util.List;
 import org.bukkit.block.Block;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java b/EssentialsProtect/src/net/ess3/protect/data/OwnedBlock.java
index dc28feae8..cac1826e9 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java
+++ b/EssentialsProtect/src/net/ess3/protect/data/OwnedBlock.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect.data;
+package net.ess3.protect.data;
 
 
 public class OwnedBlock
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockJDBC.java
index 53d5de945..70475c6f5 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java
+++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockJDBC.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect.data;
+package net.ess3.protect.data;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import java.beans.PropertyVetoException;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMemory.java
index 7b38d54eb..10c825154 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java
+++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMemory.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect.data;
+package net.ess3.protect.data;
 
 import java.util.*;
 import java.util.Map.Entry;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMySQL.java
index 39070c30c..9fd17d0a7 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java
+++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMySQL.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect.data;
+package net.ess3.protect.data;
 
 import java.beans.PropertyVetoException;
 import java.sql.Connection;
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockSQLite.java
index 464c620fe..65dbac213 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java
+++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockSQLite.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.protect.data;
+package net.ess3.protect.data;
 
 import java.beans.PropertyVetoException;
 import java.sql.Connection;
diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml
index b11803595..1510a4fa1 100644
--- a/EssentialsProtect/src/plugin.yml
+++ b/EssentialsProtect/src/plugin.yml
@@ -1,6 +1,6 @@
 # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
 name: EssentialsProtect
-main: com.earth2me.essentials.protect.EssentialsProtect
+main: net.ess3.protect.EssentialsProtect
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
 version: ${build.number}
 website: http://tiny.cc/EssentialsWiki