minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 12:31:26 +02:00
Code Issues Releases Wiki Activity

Package Renames

Browse Source
This commit is contained in:
ementalo
2012-07-16 15:01:16 +01:00
parent 9d41899b97
commit 3c385e6927
66 changed files with 208 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/plugin.yml
View File

@@ -1,6 +1,6 @@
# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
name: Essentials3 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. # Note to developers: This next line cannot change, or the automatic versioning system will break.
version: ${build.number} version: ${build.number}
website: http://tiny.cc/EssentialsWiki website: http://tiny.cc/EssentialsWiki

9
Essentials/test/com/earth2me/essentials/EconomyTest.java
View File

@@ -1,12 +1,7 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.api.NoLoanPermittedException; import net.ess3.api.NoLoanPermittedException;
import com.earth2me.essentials.api.UserDoesNotExistException; import net.ess3.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 org.junit.Test; import org.junit.Test;

1
Essentials/test/com/earth2me/essentials/EssentialsTest.java
View File

@@ -4,6 +4,7 @@ import com.earth2me.essentials.testserver.Plugin;
import com.earth2me.essentials.testserver.Server; import com.earth2me.essentials.testserver.Server;
import java.util.logging.Logger; import java.util.logging.Logger;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.ess3.Essentials;
public abstract class EssentialsTest extends TestCase { public abstract class EssentialsTest extends TestCase {
protected final transient Server server; protected final transient Server server;

25
Essentials/test/com/earth2me/essentials/StorageTest.java
View File

@@ -1,17 +1,16 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.utils.ExecuteTimer; import net.ess3.utils.ExecuteTimer;
import com.earth2me.essentials.settings.Settings; import net.ess3.settings.Settings;
import com.earth2me.essentials.storage.ObjectLoadException; import net.ess3.storage.ObjectLoadException;
import com.earth2me.essentials.storage.StorageObject; import net.ess3.storage.StorageObject;
import com.earth2me.essentials.storage.YamlStorageReader; import net.ess3.storage.YamlStorageReader;
import com.earth2me.essentials.storage.YamlStorageWriter; import net.ess3.storage.YamlStorageWriter;
import java.io.*; import java.io.*;
import junit.framework.TestCase;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.plugin.InvalidDescriptionException;
import org.junit.Test; import org.junit.Test;
@@ -72,16 +71,16 @@ public class StorageTest extends EssentialsTest
ext.start(); ext.start();
final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
final Reader reader = new InputStreamReader(bais); 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"); ext.mark("load empty user");
final ByteArrayInputStream bais3 = new ByteArrayInputStream(new byte[0]); final ByteArrayInputStream bais3 = new ByteArrayInputStream(new byte[0]);
final Reader reader3 = new InputStreamReader(bais3); 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)"); ext.mark("load empty user (class cached)");
for (int j = 0; j < 10000; j++) 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"); ext.mark("change home 10000 times");
final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -99,11 +98,11 @@ public class StorageTest extends EssentialsTest
ext.mark("debug output"); ext.mark("debug output");
final ByteArrayInputStream bais2 = new ByteArrayInputStream(written); final ByteArrayInputStream bais2 = new ByteArrayInputStream(written);
final Reader reader2 = new InputStreamReader(bais2); 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"); ext.mark("reload file");
final ByteArrayInputStream bais4 = new ByteArrayInputStream(written); final ByteArrayInputStream bais4 = new ByteArrayInputStream(written);
final Reader reader4 = new InputStreamReader(bais4); 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)"); ext.mark("reload file (cached)");
System.out.println(userdata.toString()); System.out.println(userdata.toString());
System.out.println(userdata2.toString()); System.out.println(userdata2.toString());

7
Essentials/test/com/earth2me/essentials/UserTest.java
View File

@@ -1,11 +1,6 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.api.IUser; import net.ess3.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;
public class UserTest extends EssentialsTest public class UserTest extends EssentialsTest

11
Essentials/test/com/earth2me/essentials/UtilTest.java
View File

@@ -1,16 +1,13 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.api.InvalidNameException; import net.ess3.api.InvalidNameException;
import com.earth2me.essentials.utils.DateUtil; import net.ess3.utils.DateUtil;
import com.earth2me.essentials.utils.Util; import net.ess3.utils.Util;
import java.io.IOException;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import junit.framework.TestCase;
import org.bukkit.World.Environment;
import org.bukkit.plugin.InvalidDescriptionException;
public class UtilTest extends EssentialsTest public class UtilTest extends EssentialsTest

4
Essentials/test/com/earth2me/essentials/testserver/Player.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.testserver; package com.earth2me.essentials.testserver;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.api.server.*; import net.ess3.api.server.*;
public class Player implements Player { public class Player implements Player {

2
Essentials/test/com/earth2me/essentials/testserver/Plugin.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.testserver; 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.File;
import java.io.InputStream; import java.io.InputStream;

8
Essentials/test/com/earth2me/essentials/testserver/Server.java
View File

@@ -1,9 +1,9 @@
package com.earth2me.essentials.testserver; package com.earth2me.essentials.testserver;
import com.earth2me.essentials.api.server.CommandSender; import net.ess3.api.server.CommandSender;
import com.earth2me.essentials.api.server.Player; import net.ess3.api.server.Player;
import com.earth2me.essentials.api.server.IServer; import net.ess3.api.server.IServer;
import com.earth2me.essentials.api.server.World; import net.ess3.api.server.World;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

3
Essentials/test/com/earth2me/essentials/testserver/World.java
View File

@@ -1,7 +1,6 @@
package com.earth2me.essentials.testserver; package com.earth2me.essentials.testserver;
import com.earth2me.essentials.api.server.World; import net.ess3.api.server.Location;
import com.earth2me.essentials.api.server.Location;
import org.bukkit.TreeType; import org.bukkit.TreeType;
public class World implements World { public class World implements World {

2
Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import java.io.*; import java.io.*;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;

17
Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
View File

@@ -1,12 +1,13 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.economy.WorthHolder; import net.ess3.Warps;
import com.earth2me.essentials.storage.ManagedFile; import net.ess3.economy.WorthHolder;
import static com.earth2me.essentials.I18n._; import net.ess3.storage.ManagedFile;
import com.earth2me.essentials.api.IEssentials; import static net.ess3.I18n._;
import com.earth2me.essentials.settings.Spawns; import net.ess3.api.IEssentials;
import com.earth2me.essentials.storage.StoredLocation; import net.ess3.settings.Spawns;
import com.earth2me.essentials.storage.YamlStorageWriter; import net.ess3.storage.StoredLocation;
import net.ess3.storage.YamlStorageWriter;
import java.io.*; import java.io.*;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.DigestInputStream; import java.security.DigestInputStream;
@@ -659,7 +660,7 @@ public class EssentialsUpgrade
config.load(); config.load();
if (!config.hasProperty("jails")) 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); Set<String> keys = config.getKeys(false);
for (String jailName : keys) for (String jailName : keys)
{ {

2
Essentials2Compat/src/plugin.yml
View File

@@ -1,5 +1,5 @@
name: Essentials name: Essentials
main: com.earth2me.essentials.Essentials main: net.ess3.Essentials
version: 2.9 version: 2.9
website: http://tiny.cc/EssentialsWiki website: http://tiny.cc/EssentialsWiki
description: Compatibility plugin for older plugins description: Compatibility plugin for older plugins

4
EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import com.earth2me.essentials.api.IPermission; import net.ess3.api.IPermission;
import com.earth2me.essentials.permissions.BasePermission; import net.ess3.permissions.BasePermission;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

6
EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class ChatStore public class ChatStore

4
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerHighest; import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerHighest;
import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerLowest; import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerLowest;
import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerNormal; import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerNormal;

18
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
View File

@@ -1,14 +1,14 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.utils.Util; import net.ess3.utils.Util;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IRanks; import net.ess3.api.IRanks;
import com.earth2me.essentials.api.ISettings; import net.ess3.api.ISettings;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.permissions.Permissions; import net.ess3.permissions.Permissions;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;

8
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
View File

@@ -1,9 +1,9 @@
package com.earth2me.essentials.chat; package com.earth2me.essentials.chat;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.permissions.Permissions; import net.ess3.permissions.Permissions;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;

2
EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.chat.listenerlevel; 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.ChatStore;
import com.earth2me.essentials.chat.EssentialsChatPlayer; import com.earth2me.essentials.chat.EssentialsChatPlayer;
import java.util.Map; import java.util.Map;

4
EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.chat.listenerlevel; package com.earth2me.essentials.chat.listenerlevel;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.chat.ChatStore; import com.earth2me.essentials.chat.ChatStore;
import com.earth2me.essentials.chat.EssentialsChatPlayer; import com.earth2me.essentials.chat.EssentialsChatPlayer;
import java.util.Map; import java.util.Map;

2
EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.chat.listenerlevel; 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.ChatStore;
import com.earth2me.essentials.chat.EssentialsChatPlayer; import com.earth2me.essentials.chat.EssentialsChatPlayer;
import java.util.Map; import java.util.Map;

6
EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.geoip; package com.earth2me.essentials.geoip;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.settings.geoip.GeoIP; import net.ess3.settings.geoip.GeoIP;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import net.ess3.storage.AsyncStorageObjectHolder;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;

4
EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.geoip; package com.earth2me.essentials.geoip;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

10
EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.geoip; package com.earth2me.essentials.geoip;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IReload; import net.ess3.api.IReload;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.permissions.Permissions; import net.ess3.permissions.Permissions;
import com.maxmind.geoip.Location; import com.maxmind.geoip.Location;
import com.maxmind.geoip.LookupService; import com.maxmind.geoip.LookupService;
import com.maxmind.geoip.regionName; import com.maxmind.geoip.regionName;

4
EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IPermission; import net.ess3.api.IPermission;
import com.earth2me.essentials.permissions.AbstractSuperpermsPermission; import net.ess3.permissions.AbstractSuperpermsPermission;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

4
EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IPermission; import net.ess3.api.IPermission;
import com.earth2me.essentials.permissions.AbstractSuperpermsPermission; import net.ess3.permissions.AbstractSuperpermsPermission;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

8
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
View File

@@ -1,9 +1,9 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IReload; import net.ess3.api.IReload;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.protect.data.ProtectedBlockMySQL; import com.earth2me.essentials.protect.data.ProtectedBlockMySQL;
import com.earth2me.essentials.protect.data.ProtectedBlockSQLite; import com.earth2me.essentials.protect.data.ProtectedBlockSQLite;
import java.beans.PropertyVetoException; import java.beans.PropertyVetoException;

4
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.protect.data.IProtectedBlock; import com.earth2me.essentials.protect.data.IProtectedBlock;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

4
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.craftbukkit.FakeExplosion; import net.ess3.craftbukkit.FakeExplosion;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;

4
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IPermission; import net.ess3.api.IPermission;
import com.earth2me.essentials.permissions.AbstractSuperpermsPermission; import net.ess3.permissions.AbstractSuperpermsPermission;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

4
EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.utils.Util; import net.ess3.utils.Util;
import com.earth2me.essentials.api.IPermission; import net.ess3.api.IPermission;
import java.util.Locale; import java.util.Locale;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;

6
EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.protect; package com.earth2me.essentials.protect;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.settings.protect.Protect; import net.ess3.settings.protect.Protect;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import net.ess3.storage.AsyncStorageObjectHolder;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

12
EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
View File

@@ -1,11 +1,11 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.utils.Util; import net.ess3.utils.Util;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;

4
EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSignsPlugin.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.IEssentialsModule; import net.ess3.api.IEssentialsModule;
public interface ISignsPlugin extends IEssentialsModule { public interface ISignsPlugin extends IEssentialsModule {
SignsConfigHolder getSettings(); SignsConfigHolder getSettings();

6
EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class SignBalance extends EssentialsSign public class SignBalance extends EssentialsSign

4
EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Material; import org.bukkit.Material;

8
EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java
View File

@@ -1,9 +1,9 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class SignBuy extends EssentialsSign public class SignBuy extends EssentialsSign

4
EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class SignDisposal extends EssentialsSign public class SignDisposal extends EssentialsSign

12
EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java
View File

@@ -1,11 +1,11 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import com.earth2me.essentials.bukkit.Enchantments; import net.ess3.bukkit.Enchantments;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.Locale; import java.util.Locale;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

12
EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java
View File

@@ -1,13 +1,11 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround; import net.ess3.craftbukkit.InventoryWorkaround;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

10
EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.Locale; import java.util.Locale;
import org.bukkit.GameMode; import org.bukkit.GameMode;

10
EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class SignHeal extends EssentialsSign public class SignHeal extends EssentialsSign

12
EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
View File

@@ -1,11 +1,11 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.permissions.KitPermissions; import net.ess3.permissions.KitPermissions;
import com.earth2me.essentials.settings.Kit; import net.ess3.settings.Kit;
import java.util.Locale; import java.util.Locale;

6
EssentialsSigns/src/com/earth2me/essentials/signs/SignMail.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.List; import java.util.List;

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;

12
EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
View File

@@ -1,11 +1,11 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.utils.Util; import net.ess3.utils.Util;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.*; import java.util.*;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;

8
EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java
View File

@@ -1,9 +1,9 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class SignSell extends EssentialsSign public class SignSell extends EssentialsSign

10
EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.commands.Commandspawnmob; import net.ess3.commands.Commandspawnmob;
public class SignSpawnmob extends EssentialsSign public class SignSpawnmob extends EssentialsSign

10
EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class SignTime extends EssentialsSign public class SignTime extends EssentialsSign

12
EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
View File

@@ -1,11 +1,11 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.utils.Util; import net.ess3.utils.Util;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
//TODO: Sell Enchantment on Trade signs? //TODO: Sell Enchantment on Trade signs?

10
EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.permissions.WarpPermissions; import net.ess3.permissions.WarpPermissions;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

10
EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.ChargeException; import net.ess3.api.ChargeException;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.economy.Trade; import net.ess3.economy.Trade;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
public class SignWeather extends EssentialsSign public class SignWeather extends EssentialsSign

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.storage.StorageObject; import net.ess3.storage.StorageObject;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

4
EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfigHolder.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.storage.AsyncStorageObjectHolder; import net.ess3.storage.AsyncStorageObjectHolder;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;

4
EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.signs; package com.earth2me.essentials.signs;
import com.earth2me.essentials.api.IPermission; import net.ess3.api.IPermission;
import com.earth2me.essentials.permissions.BasePermission; import net.ess3.permissions.BasePermission;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

6
EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import com.earth2me.essentials.commands.EssentialsCommand; import net.ess3.commands.EssentialsCommand;
import com.earth2me.essentials.commands.NotEnoughArgumentsException; import net.ess3.commands.NotEnoughArgumentsException;
public class Commandsetxmpp extends EssentialsCommand public class Commandsetxmpp extends EssentialsCommand

8
EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java
View File

@@ -1,10 +1,8 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.Console; import net.ess3.Console;
import com.earth2me.essentials.api.server.CommandSender; import net.ess3.commands.EssentialsCommand;
import com.earth2me.essentials.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

7
EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java
View File

@@ -1,10 +1,9 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.server.CommandSender; import net.ess3.commands.EssentialsCommand;
import com.earth2me.essentials.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import java.util.List; import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

10
EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.commands.EssentialsCommandHandler; import net.ess3.commands.EssentialsCommandHandler;
import static com.earth2me.essentials.I18n._; import static net.ess3.I18n._;
import com.earth2me.essentials.api.ICommandHandler; import net.ess3.api.ICommandHandler;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.logging.Level; import java.util.logging.Level;

4
EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.IEssentials; import net.ess3.api.IEssentials;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.util.List; import java.util.List;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
View File

@@ -1,6 +1,6 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.IReload; import net.ess3.api.IReload;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;

4
EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
View File

@@ -1,7 +1,7 @@
package com.earth2me.essentials.xmpp; package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.IReload; import net.ess3.api.IReload;
import com.earth2me.essentials.api.IUser; import net.ess3.api.IUser;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
import java.util.logging.Handler; import java.util.logging.Handler;