diff options
66 files changed, 208 insertions, 226 deletions
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 488abb02d..f7dae5740 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: Essentials3 -main: com.earth2me.essentials.Essentials +main: net.ess3.Essentials # Note to developers: This next line cannot change, or the automatic versioning system will break. version: ${build.number} website: http://tiny.cc/EssentialsWiki diff --git a/Essentials/test/com/earth2me/essentials/EconomyTest.java b/Essentials/test/com/earth2me/essentials/EconomyTest.java index dd37c9ea4..e89bc832c 100644 --- a/Essentials/test/com/earth2me/essentials/EconomyTest.java +++ b/Essentials/test/com/earth2me/essentials/EconomyTest.java @@ -1,12 +1,7 @@ package com.earth2me.essentials; -import com.earth2me.essentials.api.NoLoanPermittedException; -import com.earth2me.essentials.api.UserDoesNotExistException; -import com.earth2me.essentials.user.User; -import java.io.IOException; -import junit.framework.TestCase; -import org.bukkit.World.Environment; -import org.bukkit.plugin.InvalidDescriptionException; +import net.ess3.api.NoLoanPermittedException; +import net.ess3.api.UserDoesNotExistException; import org.junit.Test; diff --git a/Essentials/test/com/earth2me/essentials/EssentialsTest.java b/Essentials/test/com/earth2me/essentials/EssentialsTest.java index 9f8505c7d..39ce92d25 100644 --- a/Essentials/test/com/earth2me/essentials/EssentialsTest.java +++ b/Essentials/test/com/earth2me/essentials/EssentialsTest.java @@ -4,6 +4,7 @@ import com.earth2me.essentials.testserver.Plugin; import com.earth2me.essentials.testserver.Server; import java.util.logging.Logger; import junit.framework.TestCase; +import net.ess3.Essentials; public abstract class EssentialsTest extends TestCase { protected final transient Server server; diff --git a/Essentials/test/com/earth2me/essentials/StorageTest.java b/Essentials/test/com/earth2me/essentials/StorageTest.java index 3bc3124a1..8513a177c 100644 --- a/Essentials/test/com/earth2me/essentials/StorageTest.java +++ b/Essentials/test/com/earth2me/essentials/StorageTest.java @@ -1,17 +1,16 @@ package com.earth2me.essentials; -import com.earth2me.essentials.utils.ExecuteTimer; -import com.earth2me.essentials.settings.Settings; -import com.earth2me.essentials.storage.ObjectLoadException; -import com.earth2me.essentials.storage.StorageObject; -import com.earth2me.essentials.storage.YamlStorageReader; -import com.earth2me.essentials.storage.YamlStorageWriter; +import net.ess3.utils.ExecuteTimer; +import net.ess3.settings.Settings; +import net.ess3.storage.ObjectLoadException; +import net.ess3.storage.StorageObject; +import net.ess3.storage.YamlStorageReader; +import net.ess3.storage.YamlStorageWriter; import java.io.*; -import junit.framework.TestCase; + import org.bukkit.Location; import org.bukkit.World; import org.bukkit.World.Environment; -import org.bukkit.plugin.InvalidDescriptionException; import org.junit.Test; @@ -72,16 +71,16 @@ public class StorageTest extends EssentialsTest ext.start(); final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); final Reader reader = new InputStreamReader(bais); - final com.earth2me.essentials.user.UserData userdata = new YamlStorageReader(reader, null).load(com.earth2me.essentials.user.UserData.class); + final net.ess3.user.UserData userdata = new YamlStorageReader(reader, null).load(net.ess3.user.UserData.class); ext.mark("load empty user"); final ByteArrayInputStream bais3 = new ByteArrayInputStream(new byte[0]); final Reader reader3 = new InputStreamReader(bais3); - final com.earth2me.essentials.user.UserData userdata3 = new YamlStorageReader(reader3, null).load(com.earth2me.essentials.user.UserData.class); + final net.ess3.user.UserData userdata3 = new YamlStorageReader(reader3, null).load(net.ess3.user.UserData.class); ext.mark("load empty user (class cached)"); for (int j = 0; j < 10000; j++) { - userdata.getHomes().put("home", new com.earth2me.essentials.storage.StoredLocation(new Location(world, j, j, j))); + userdata.getHomes().put("home", new net.ess3.storage.StoredLocation(new Location(world, j, j, j))); } ext.mark("change home 10000 times"); final ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -99,11 +98,11 @@ public class StorageTest extends EssentialsTest ext.mark("debug output"); final ByteArrayInputStream bais2 = new ByteArrayInputStream(written); final Reader reader2 = new InputStreamReader(bais2); - final com.earth2me.essentials.user.UserData userdata2 = new YamlStorageReader(reader2, null).load(com.earth2me.essentials.user.UserData.class); + final net.ess3.user.UserData userdata2 = new YamlStorageReader(reader2, null).load(net.ess3.user.UserData.class); ext.mark("reload file"); final ByteArrayInputStream bais4 = new ByteArrayInputStream(written); final Reader reader4 = new InputStreamReader(bais4); - final com.earth2me.essentials.user.UserData userdata4 = new YamlStorageReader(reader4, null).load(com.earth2me.essentials.user.UserData.class); + final net.ess3.user.UserData userdata4 = new YamlStorageReader(reader4, null).load(net.ess3.user.UserData.class); ext.mark("reload file (cached)"); System.out.println(userdata.toString()); System.out.println(userdata2.toString()); diff --git a/Essentials/test/com/earth2me/essentials/UserTest.java b/Essentials/test/com/earth2me/essentials/UserTest.java index 4c2643068..75d762a75 100644 --- a/Essentials/test/com/earth2me/essentials/UserTest.java +++ b/Essentials/test/com/earth2me/essentials/UserTest.java @@ -1,11 +1,6 @@ package com.earth2me.essentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.user.User; -import java.io.IOException; -import junit.framework.TestCase; -import org.bukkit.World.Environment; -import org.bukkit.plugin.InvalidDescriptionException; +import net.ess3.api.IUser; public class UserTest extends EssentialsTest diff --git a/Essentials/test/com/earth2me/essentials/UtilTest.java b/Essentials/test/com/earth2me/essentials/UtilTest.java index ad2c501a1..10b214280 100644 --- a/Essentials/test/com/earth2me/essentials/UtilTest.java +++ b/Essentials/test/com/earth2me/essentials/UtilTest.java @@ -1,16 +1,13 @@ package com.earth2me.essentials; -import com.earth2me.essentials.api.InvalidNameException; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.Util; -import java.io.IOException; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.DateUtil; +import net.ess3.utils.Util; + import java.util.Calendar; import java.util.GregorianCalendar; import java.util.logging.Level; import java.util.logging.Logger; -import junit.framework.TestCase; -import org.bukkit.World.Environment; -import org.bukkit.plugin.InvalidDescriptionException; public class UtilTest extends EssentialsTest diff --git a/Essentials/test/com/earth2me/essentials/testserver/Player.java b/Essentials/test/com/earth2me/essentials/testserver/Player.java index b10073ee9..6e18abb88 100644 --- a/Essentials/test/com/earth2me/essentials/testserver/Player.java +++ b/Essentials/test/com/earth2me/essentials/testserver/Player.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.testserver; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.api.server.*; +import net.ess3.api.IUser; +import net.ess3.api.server.*; public class Player implements Player { diff --git a/Essentials/test/com/earth2me/essentials/testserver/Plugin.java b/Essentials/test/com/earth2me/essentials/testserver/Plugin.java index ea27fe79a..cb5334da5 100644 --- a/Essentials/test/com/earth2me/essentials/testserver/Plugin.java +++ b/Essentials/test/com/earth2me/essentials/testserver/Plugin.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.testserver; -import com.earth2me.essentials.api.server.IPlugin; +import net.ess3.api.server.IPlugin; import java.io.File; import java.io.InputStream; diff --git a/Essentials/test/com/earth2me/essentials/testserver/Server.java b/Essentials/test/com/earth2me/essentials/testserver/Server.java index d070abcb6..eb9a74bdb 100644 --- a/Essentials/test/com/earth2me/essentials/testserver/Server.java +++ b/Essentials/test/com/earth2me/essentials/testserver/Server.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.testserver; -import com.earth2me.essentials.api.server.CommandSender; -import com.earth2me.essentials.api.server.Player; -import com.earth2me.essentials.api.server.IServer; -import com.earth2me.essentials.api.server.World; +import net.ess3.api.server.CommandSender; +import net.ess3.api.server.Player; +import net.ess3.api.server.IServer; +import net.ess3.api.server.World; import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/Essentials/test/com/earth2me/essentials/testserver/World.java b/Essentials/test/com/earth2me/essentials/testserver/World.java index 9044b302e..d1994c479 100644 --- a/Essentials/test/com/earth2me/essentials/testserver/World.java +++ b/Essentials/test/com/earth2me/essentials/testserver/World.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.testserver; -import com.earth2me.essentials.api.server.World; -import com.earth2me.essentials.api.server.Location; +import net.ess3.api.server.Location; import org.bukkit.TreeType; public class World implements World { diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java index 0e8004895..dbdc9483b 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java @@ -1,6 +1,6 @@ package com.earth2me.essentials; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import java.io.*; import java.util.HashMap; import java.util.Locale; diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java index e9d2b670e..859c08982 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -1,12 +1,13 @@ package com.earth2me.essentials; -import com.earth2me.essentials.economy.WorthHolder; -import com.earth2me.essentials.storage.ManagedFile; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.settings.Spawns; -import com.earth2me.essentials.storage.StoredLocation; -import com.earth2me.essentials.storage.YamlStorageWriter; +import net.ess3.Warps; +import net.ess3.economy.WorthHolder; +import net.ess3.storage.ManagedFile; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.settings.Spawns; +import net.ess3.storage.StoredLocation; +import net.ess3.storage.YamlStorageWriter; import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; @@ -659,7 +660,7 @@ public class EssentialsUpgrade config.load(); if (!config.hasProperty("jails")) { - final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails(); + final net.ess3.settings.Jails jails = new net.ess3.settings.Jails(); Set<String> keys = config.getKeys(false); for (String jailName : keys) { diff --git a/Essentials2Compat/src/plugin.yml b/Essentials2Compat/src/plugin.yml index e3d9afe83..fc318c962 100644 --- a/Essentials2Compat/src/plugin.yml +++ b/Essentials2Compat/src/plugin.yml @@ -1,5 +1,5 @@ name: Essentials -main: com.earth2me.essentials.Essentials +main: net.ess3.Essentials version: 2.9 website: http://tiny.cc/EssentialsWiki description: Compatibility plugin for older plugins diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java index 9a8bd9e88..361bbbdda 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.permissions.BasePermission; +import net.ess3.api.IPermission; +import net.ess3.permissions.BasePermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java index 887ac8337..4f6630187 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class ChatStore diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java index a4d4283a7..53f2aa591 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.chat; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerHighest; import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerLowest; import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerNormal; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index 8037234fd..6376f9171 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -1,14 +1,14 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IRanks; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.IRanks; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.Locale; import java.util.Map; import java.util.logging.Logger; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java index 401fa1142..86b4760c5 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.chat; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.logging.Logger; import org.bukkit.Location; import org.bukkit.Server; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java index 576c93e6f..eba0b02c8 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.chat.listenerlevel; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.api.IEssentials; import com.earth2me.essentials.chat.ChatStore; import com.earth2me.essentials.chat.EssentialsChatPlayer; import java.util.Map; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java index 3fcff995c..7be17c73c 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.chat.listenerlevel; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import com.earth2me.essentials.chat.ChatStore; import com.earth2me.essentials.chat.EssentialsChatPlayer; import java.util.Map; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java index c456b700d..f6b8fa334 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.chat.listenerlevel; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.api.IEssentials; import com.earth2me.essentials.chat.ChatStore; import com.earth2me.essentials.chat.EssentialsChatPlayer; import java.util.Map; diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java index e2d82d644..39d7528df 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.geoip; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.settings.geoip.GeoIP; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import net.ess3.api.IEssentials; +import net.ess3.settings.geoip.GeoIP; +import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.io.IOException; import org.bukkit.plugin.Plugin; diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java index b6697a658..125ba3144 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.geoip; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import java.util.logging.Level; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java index 158457155..c0fbfa9f7 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.geoip; -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.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IReload; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import com.maxmind.geoip.Location; import com.maxmind.geoip.LookupService; import com.maxmind.geoip.regionName; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java b/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java index b6a74df22..50be5dadb 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.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/com/earth2me/essentials/protect/BlockPlacePermissions.java index 00f7d6c4e..0e553a243 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.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/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java index 539ff208b..67993175d 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.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 static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IReload; +import net.ess3.api.IUser; import com.earth2me.essentials.protect.data.ProtectedBlockMySQL; import com.earth2me.essentials.protect.data.ProtectedBlockSQLite; import java.beans.PropertyVetoException; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index f69ede53a..1a711bd8d 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.protect; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import com.earth2me.essentials.protect.data.IProtectedBlock; import java.util.ArrayList; import java.util.List; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index 9766a1a11..dabf2b0a0 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.protect; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.craftbukkit.FakeExplosion; +import net.ess3.api.IEssentials; +import net.ess3.craftbukkit.FakeExplosion; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index a14fde8bc..d92265442 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.protect; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java index 7cd147aee..e623fe003 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.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/com/earth2me/essentials/protect/Permissions.java index 2404e165f..0cb2d49ef 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.protect; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IPermission; +import net.ess3.utils.Util; +import net.ess3.api.IPermission; 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/com/earth2me/essentials/protect/ProtectHolder.java index 2e2451397..d9df03bbf 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.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/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java index 54266b3b9..4992eb795 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.util.HashSet; import java.util.Locale; import java.util.Set; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSignsPlugin.java index 04421161e..f0e33f9cd 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSignsPlugin.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Bukkit; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java b/EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java index 98030a6e6..a7d8c24cb 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.IEssentialsModule; +import net.ess3.api.IEssentialsModule; public interface ISignsPlugin extends IEssentialsModule { SignsConfigHolder getSettings(); diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java index 2ef64003a..52fdbb336 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class SignBalance extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java index b16cdb07e..3d9315249 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Material; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java index 1f5951a16..252ac76cf 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class SignBuy extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java index 056c79e67..f56a2ede6 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class SignDisposal extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java index 4c5deb51f..6463ab5de 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.bukkit.Enchantments; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import net.ess3.bukkit.Enchantments; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.util.Locale; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java index 96d5e7222..077c54813 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.api.IEssentials; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java index 1452d4570..a96045a2f 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java @@ -1,13 +1,11 @@ package com.earth2me.essentials.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; import org.bukkit.Material; -import org.bukkit.event.inventory.InventoryType; -import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java index 74fc33509..217d8da77 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.util.Locale; import org.bukkit.GameMode; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java index 920ff04e0..09f1f9cc7 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class SignHeal extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java index f6471123f..6270baf8f 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.KitPermissions; -import com.earth2me.essentials.settings.Kit; +import net.ess3.api.ChargeException; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.permissions.KitPermissions; +import net.ess3.settings.Kit; import java.util.Locale; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignMail.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignMail.java index 7845c86a6..483964bf2 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignMail.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignMail.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.util.List; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java index 3aed5d155..4dd8db93f 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.api.IEssentials; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java index ca4f6b869..7986e5ca2 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.util.*; import org.bukkit.Location; import org.bukkit.Material; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java index 1ec8da077..8b1eac2c8 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class SignSell extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java index 577cc7a6b..057614372 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.commands.Commandspawnmob; +import net.ess3.api.ChargeException; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.commands.Commandspawnmob; public class SignSpawnmob extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java index 3479b70b0..6f56ba51e 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class SignTime extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java index 7622493b7..15296ecc9 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java @@ -1,11 +1,11 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import org.bukkit.inventory.ItemStack; //TODO: Sell Enchantment on Trade signs? diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java index ba724b733..a69c2ce8e 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.WarpPermissions; +import net.ess3.api.ChargeException; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.permissions.WarpPermissions; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java index 17f7014fb..17d28c195 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.ChargeException; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class SignWeather extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java index c40e8f184..d8113e36d 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfigHolder.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfigHolder.java index dcf436b03..274c2a1be 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfigHolder.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfigHolder.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import net.ess3.api.IEssentials; +import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.io.IOException; import java.util.*; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java index eb8025f5b..b27eb3c45 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.permissions.BasePermission; +import net.ess3.api.IPermission; +import net.ess3.permissions.BasePermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java index 4fe9283df..bc4ef0b6c 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; +import net.ess3.api.IUser; +import net.ess3.commands.EssentialsCommand; +import net.ess3.commands.NotEnoughArgumentsException; public class Commandsetxmpp extends EssentialsCommand diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java index c11e212e7..0a5b41218 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java @@ -1,10 +1,8 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.Console; -import com.earth2me.essentials.api.server.CommandSender; -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import org.bukkit.command.CommandSender; +import net.ess3.Console; +import net.ess3.commands.EssentialsCommand; +import net.ess3.commands.NotEnoughArgumentsException; import org.bukkit.entity.Player; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java index 13d152306..392e20d5c 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java @@ -1,10 +1,9 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.api.server.CommandSender; -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; +import net.ess3.commands.EssentialsCommand; +import net.ess3.commands.NotEnoughArgumentsException; import java.util.List; -import org.bukkit.command.CommandSender; + import org.bukkit.entity.Player; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java index fea8dd2e2..e4727d8a5 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java @@ -1,10 +1,10 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.commands.EssentialsCommandHandler; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ICommandHandler; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.commands.EssentialsCommandHandler; +import static net.ess3.I18n._; +import net.ess3.api.ICommandHandler; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.util.List; import java.util.Locale; import java.util.logging.Level; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java index b6daf8114..2d454deb1 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java index 83851d055..df329156d 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IUser; import java.util.List; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java index 0f17e8660..44ad39d2d 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.api.IReload; +import net.ess3.api.IReload; import java.io.File; import java.io.IOException; import java.util.*; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index 64dd5aff2..d4fb64756 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.xmpp; -import com.earth2me.essentials.api.IReload; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IReload; +import net.ess3.api.IUser; import java.io.File; import java.util.*; import java.util.logging.Handler; |