diff options
-rw-r--r-- | Essentials/src/com/earth2me/essentials/api/IWarp.java | 9 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/api/server/IPermission.java | 5 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/api/server/IPlayer.java | 5 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/api/server/IServer.java | 5 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/storage/StorageObject.java | 6 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/user/IOfflineUser.java | 9 | ||||
-rw-r--r-- | Essentials/src/net/ess3/Console.java (renamed from Essentials/src/com/earth2me/essentials/Console.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/Essentials.java (renamed from Essentials/src/com/earth2me/essentials/Essentials.java) | 61 | ||||
-rw-r--r-- | Essentials/src/net/ess3/EssentialsTimer.java (renamed from Essentials/src/com/earth2me/essentials/EssentialsTimer.java) | 15 | ||||
-rw-r--r-- | Essentials/src/net/ess3/I18n.java (renamed from Essentials/src/com/earth2me/essentials/I18n.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/ItemDb.java (renamed from Essentials/src/com/earth2me/essentials/ItemDb.java) | 18 | ||||
-rw-r--r-- | Essentials/src/net/ess3/Jails.java (renamed from Essentials/src/com/earth2me/essentials/Jails.java) | 20 | ||||
-rw-r--r-- | Essentials/src/net/ess3/Kits.java (renamed from Essentials/src/com/earth2me/essentials/Kits.java) | 24 | ||||
-rw-r--r-- | Essentials/src/net/ess3/Teleport.java (renamed from Essentials/src/com/earth2me/essentials/Teleport.java) | 24 | ||||
-rw-r--r-- | Essentials/src/net/ess3/Warps.java (renamed from Essentials/src/com/earth2me/essentials/Warps.java) | 24 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/ChargeException.java (renamed from Essentials/src/com/earth2me/essentials/api/ChargeException.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IBackup.java (renamed from Essentials/src/com/earth2me/essentials/api/IBackup.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/ICommandHandler.java (renamed from Essentials/src/com/earth2me/essentials/api/ICommandHandler.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IEconomy.java (renamed from Essentials/src/com/earth2me/essentials/api/IEconomy.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IEssentials.java (renamed from Essentials/src/com/earth2me/essentials/api/IEssentials.java) | 11 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IEssentialsModule.java (renamed from Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/II18n.java (renamed from Essentials/src/com/earth2me/essentials/api/II18n.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IItemDb.java (renamed from Essentials/src/com/earth2me/essentials/api/IItemDb.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IJails.java (renamed from Essentials/src/com/earth2me/essentials/api/IJails.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IKits.java (renamed from Essentials/src/com/earth2me/essentials/api/IKits.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IPermission.java (renamed from Essentials/src/com/earth2me/essentials/api/IPermission.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IRanks.java (renamed from Essentials/src/com/earth2me/essentials/api/IRanks.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IReload.java (renamed from Essentials/src/com/earth2me/essentials/api/IReload.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IReplyTo.java (renamed from Essentials/src/com/earth2me/essentials/api/IReplyTo.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/ISettings.java (renamed from Essentials/src/com/earth2me/essentials/api/ISettings.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/ITeleport.java (renamed from Essentials/src/com/earth2me/essentials/api/ITeleport.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IUser.java (renamed from Essentials/src/com/earth2me/essentials/api/IUser.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IUserMap.java (renamed from Essentials/src/com/earth2me/essentials/api/IUserMap.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IWarp.java | 9 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IWarps.java (renamed from Essentials/src/com/earth2me/essentials/api/IWarps.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/IWorth.java (renamed from Essentials/src/com/earth2me/essentials/api/IWorth.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/InvalidNameException.java (renamed from Essentials/src/com/earth2me/essentials/api/InvalidNameException.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/NoLoanPermittedException.java (renamed from Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/UserDoesNotExistException.java (renamed from Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/server/IPermission.java | 5 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/server/IPermissionsManager.java (renamed from Essentials/src/com/earth2me/essentials/api/server/IPermissionsManager.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/server/IPlayer.java | 5 | ||||
-rw-r--r-- | Essentials/src/net/ess3/api/server/IServer.java | 5 | ||||
-rw-r--r-- | Essentials/src/net/ess3/backup/Backup.java (renamed from Essentials/src/com/earth2me/essentials/backup/Backup.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/bukkit/Enchantments.java (renamed from Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/bukkit/EssentialsPlugin.java (renamed from Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/bukkit/Mob.java (renamed from Essentials/src/com/earth2me/essentials/bukkit/Mob.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/bukkit/Server.java (renamed from Essentials/src/com/earth2me/essentials/bukkit/Server.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandafk.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandafk.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandantioch.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandantioch.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandback.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandback.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandbackup.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandbackup.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandbalance.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandbalance.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandbalancetop.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandban.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandban.java) | 13 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandbanip.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandbanip.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandbigtree.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandbreak.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandbreak.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandbroadcast.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandburn.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandburn.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandclearinventory.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandcompass.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandcompass.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commanddelhome.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commanddeljail.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commanddelwarp.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commanddepth.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commanddepth.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandeco.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandeco.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandenchant.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandenchant.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandessentials.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandessentials.java) | 9 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandexp.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandexp.java) | 276 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandext.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandext.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandfeed.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandfeed.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandfireball.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandfireball.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandfly.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandfly.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandgamemode.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandgc.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandgc.java) | 5 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandgetpos.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandgive.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandgive.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandgod.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandgod.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandhat.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandhat.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandheal.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandheal.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandhelp.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandhelp.java) | 18 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandhelpop.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandhome.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandhome.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandignore.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandignore.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandinfo.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandinfo.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandinvsee.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commanditem.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commanditem.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commanditemdb.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandjails.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandjails.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandjump.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandjump.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandkick.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandkick.java) | 11 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandkickall.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandkickall.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandkill.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandkill.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandkillall.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandkillall.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandkit.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandkit.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandkittycannon.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandlightning.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandlightning.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandlist.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandlist.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandmail.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandmail.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandme.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandme.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandmore.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandmore.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandmotd.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandmotd.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandmsg.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandmsg.java) | 14 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandmute.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandmute.java) | 14 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandnear.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandnear.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandnick.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandnick.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandnuke.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandnuke.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandpay.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandpay.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandping.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandping.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandpowertool.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandpowertooltoggle.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandptime.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandptime.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandr.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandr.java) | 14 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandrealname.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandrealname.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandremove.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandremove.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandrepair.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandrepair.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandrules.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandrules.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandseen.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandseen.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsell.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsell.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsethome.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsethome.java) | 20 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsetjail.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsetspawn.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsetspawn.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsetwarp.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsetworth.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java) | 7 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsocialspy.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandspawn.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandspawn.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandspawner.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandspawner.java) | 20 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandspawnmob.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java) | 18 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsudo.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsudo.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandsuicide.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtempban.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtempban.java) | 17 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandthunder.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandthunder.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtime.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtime.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtogglejail.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java) | 15 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtop.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtop.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtp.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtp.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpa.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpa.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpaall.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpaccept.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java) | 14 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpahere.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpall.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpall.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpdeny.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtphere.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtphere.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpo.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpo.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtpohere.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtppos.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtppos.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtptoggle.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandtree.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandtree.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandunban.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandunban.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandunbanip.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandunlimited.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandvanish.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandvanish.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandwarp.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandwarp.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandweather.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandweather.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandwhois.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandwhois.java) | 18 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandworld.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandworld.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/Commandworth.java (renamed from Essentials/src/com/earth2me/essentials/commands/Commandworth.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/EssentialsCommand.java (renamed from Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java) | 14 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/EssentialsCommandHandler.java (renamed from Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java) | 13 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/IEssentialsCommand.java (renamed from Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/NoChargeException.java (renamed from Essentials/src/com/earth2me/essentials/commands/NoChargeException.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java (renamed from Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/commands/WarpNotFoundException.java (renamed from Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/craftbukkit/FakeInventory.java (renamed from Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java (renamed from Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/craftbukkit/SetExpFix.java (renamed from Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/Economy.java (renamed from Essentials/src/com/earth2me/essentials/economy/Economy.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/Money.java (renamed from Essentials/src/com/earth2me/essentials/economy/Money.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/MoneyHolder.java (renamed from Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/Trade.java (renamed from Essentials/src/com/earth2me/essentials/economy/Trade.java) | 20 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/Worth.java (renamed from Essentials/src/com/earth2me/essentials/economy/Worth.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/WorthHolder.java (renamed from Essentials/src/com/earth2me/essentials/economy/WorthHolder.java) | 14 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/Method.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/Method.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/Methods.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/Methods.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/BOSE6.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/BOSE7.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/MCUR.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/VaultEco.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/iCo4.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/iCo5.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/iCo6.java (renamed from Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/listener/EssentialsBlockListener.java (renamed from Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/listener/EssentialsEntityListener.java (renamed from Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java) | 15 | ||||
-rw-r--r-- | Essentials/src/net/ess3/listener/EssentialsPlayerListener.java (renamed from Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java) | 26 | ||||
-rw-r--r-- | Essentials/src/net/ess3/listener/EssentialsPluginListener.java (renamed from Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java) | 18 | ||||
-rw-r--r-- | Essentials/src/net/ess3/listener/TntExplodeListener.java (renamed from Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/metrics/Metrics.java (renamed from Essentials/src/com/earth2me/essentials/metrics/Metrics.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/metrics/MetricsListener.java (renamed from Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java) | 7 | ||||
-rw-r--r-- | Essentials/src/net/ess3/metrics/MetricsStarter.java (renamed from Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java) | 18 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java (renamed from Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/BasePermission.java (renamed from Essentials/src/com/earth2me/essentials/permissions/BasePermission.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/EnchantPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/EnchantPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/GivePermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/GivePermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/GroupsPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/GroupsPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/HelpPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/HelpPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/ItemPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/ItemPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/KitPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/KitPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/NoCommandCostPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/NoCommandCostPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/Permissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/Permissions.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/SpawnerPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/SpawnerPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/SpawnmobPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/SpawnmobPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/UnlimitedItemPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/WarpPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/WarpPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/permissions/WorldPermissions.java (renamed from Essentials/src/com/earth2me/essentials/permissions/WorldPermissions.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/ranks/GMGroups.java (renamed from Essentials/src/com/earth2me/essentials/ranks/GMGroups.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/ranks/RankOptions.java (renamed from Essentials/src/com/earth2me/essentials/ranks/RankOptions.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/ranks/Ranks.java (renamed from Essentials/src/com/earth2me/essentials/ranks/Ranks.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/ranks/RanksStorage.java (renamed from Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java) | 16 | ||||
-rw-r--r-- | Essentials/src/net/ess3/ranks/VaultGroups.java (renamed from Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Backup.java (renamed from Essentials/src/com/earth2me/essentials/settings/Backup.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Chat.java (renamed from Essentials/src/com/earth2me/essentials/settings/Chat.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Commands.java (renamed from Essentials/src/com/earth2me/essentials/settings/Commands.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Economy.java (renamed from Essentials/src/com/earth2me/essentials/settings/Economy.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/General.java (renamed from Essentials/src/com/earth2me/essentials/settings/General.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Jails.java (renamed from Essentials/src/com/earth2me/essentials/settings/Jails.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Kit.java (renamed from Essentials/src/com/earth2me/essentials/settings/Kit.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Kits.java (renamed from Essentials/src/com/earth2me/essentials/settings/Kits.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Settings.java (renamed from Essentials/src/com/earth2me/essentials/settings/Settings.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/SettingsHolder.java (renamed from Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Spawns.java (renamed from Essentials/src/com/earth2me/essentials/settings/Spawns.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/SpawnsHolder.java (renamed from Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java) | 30 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Warp.java (renamed from Essentials/src/com/earth2me/essentials/settings/Warp.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/WarpHolder.java (renamed from Essentials/src/com/earth2me/essentials/settings/WarpHolder.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/WorldOptions.java (renamed from Essentials/src/com/earth2me/essentials/settings/WorldOptions.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/Worlds.java (renamed from Essentials/src/com/earth2me/essentials/settings/Worlds.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Afk.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/Afk.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Back.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/Back.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/God.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/God.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Help.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/Help.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Home.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/Home.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Lightning.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/Lightning.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/List.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/List.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Spawnmob.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/Spawnmob.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Tpa.java (renamed from Essentials/src/com/earth2me/essentials/settings/commands/Tpa.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/geoip/Database.java (renamed from Essentials/src/com/earth2me/essentials/settings/geoip/Database.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/geoip/GeoIP.java (renamed from Essentials/src/com/earth2me/essentials/settings/geoip/GeoIP.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/protect/Prevent.java (renamed from Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/protect/Protect.java (renamed from Essentials/src/com/earth2me/essentials/settings/protect/Protect.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/protect/SignsAndRails.java (renamed from Essentials/src/com/earth2me/essentials/settings/protect/SignsAndRails.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java (renamed from Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java (renamed from Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java) | 7 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java (renamed from Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/BukkitConstructor.java (renamed from Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java) | 5 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/Comment.java (renamed from Essentials/src/com/earth2me/essentials/storage/Comment.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/EnchantmentLevel.java (renamed from Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/IStorageObjectHolder.java (renamed from Essentials/src/com/earth2me/essentials/storage/IStorageObjectHolder.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/IStorageObjectMap.java (renamed from Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/IStorageReader.java (renamed from Essentials/src/com/earth2me/essentials/storage/IStorageReader.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/IStorageWriter.java (renamed from Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/ListType.java (renamed from Essentials/src/com/earth2me/essentials/storage/ListType.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/Location.java (renamed from Essentials/src/com/earth2me/essentials/storage/Location.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/ManagedFile.java (renamed from Essentials/src/com/earth2me/essentials/storage/ManagedFile.java) | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/MapKeyType.java (renamed from Essentials/src/com/earth2me/essentials/storage/MapKeyType.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/MapValueType.java (renamed from Essentials/src/com/earth2me/essentials/storage/MapValueType.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/ObjectLoadException.java (renamed from Essentials/src/com/earth2me/essentials/storage/ObjectLoadException.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/StorageObject.java | 6 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/StorageObjectMap.java (renamed from Essentials/src/com/earth2me/essentials/storage/StorageObjectMap.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/YamlStorageReader.java (renamed from Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/storage/YamlStorageWriter.java (renamed from Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/Ban.java (renamed from Essentials/src/com/earth2me/essentials/user/Ban.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/CooldownException.java (renamed from Essentials/src/com/earth2me/essentials/user/CooldownException.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/IOfflinePlayer.java (renamed from Essentials/src/com/earth2me/essentials/user/IOfflinePlayer.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/IOfflineUser.java | 9 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/Inventory.java (renamed from Essentials/src/com/earth2me/essentials/user/Inventory.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/User.java (renamed from Essentials/src/com/earth2me/essentials/user/User.java) | 24 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/UserBase.java (renamed from Essentials/src/com/earth2me/essentials/user/UserBase.java) | 28 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/UserData.java (renamed from Essentials/src/com/earth2me/essentials/user/UserData.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/user/UserMap.java (renamed from Essentials/src/com/earth2me/essentials/user/UserMap.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/DateUtil.java (renamed from Essentials/src/com/earth2me/essentials/utils/DateUtil.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/DescParseTickFormat.java (renamed from Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/ExecuteTimer.java (renamed from Essentials/src/com/earth2me/essentials/utils/ExecuteTimer.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/LocationUtil.java (renamed from Essentials/src/com/earth2me/essentials/utils/LocationUtil.java) | 4 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/Util.java (renamed from Essentials/src/com/earth2me/essentials/utils/Util.java) | 21 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java (renamed from Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/Punycode.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java (renamed from Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/PunycodeException.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/ArrayListInput.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/ArrayListInput.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/HelpInput.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/HelpInput.java) | 12 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/IText.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/IText.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java) | 8 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextInput.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextPager.java) | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/TextInput.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java) | 10 | ||||
-rw-r--r-- | Essentials/src/net/ess3/utils/textreader/TextPager.java (renamed from Essentials/src/com/earth2me/essentials/utils/textreader/TextPager.java) | 7 | ||||
-rw-r--r-- | Essentials/src/plugin.yml | 2 | ||||
-rw-r--r-- | Essentials/test/net/ess3/EconomyTest.java (renamed from Essentials/test/com/earth2me/essentials/EconomyTest.java) | 8 | ||||
-rw-r--r-- | Essentials/test/net/ess3/FakeOfflinePlayer.java (renamed from Essentials/test/com/earth2me/essentials/FakeOfflinePlayer.java) | 2 | ||||
-rw-r--r-- | Essentials/test/net/ess3/FakeServer.java (renamed from Essentials/test/com/earth2me/essentials/FakeServer.java) | 2 | ||||
-rw-r--r-- | Essentials/test/net/ess3/FakeWorld.java (renamed from Essentials/test/com/earth2me/essentials/FakeWorld.java) | 2 | ||||
-rw-r--r-- | Essentials/test/net/ess3/StorageTest.java (renamed from Essentials/test/com/earth2me/essentials/StorageTest.java) | 24 | ||||
-rw-r--r-- | Essentials/test/net/ess3/UserTest.java (renamed from Essentials/test/com/earth2me/essentials/UserTest.java) | 6 | ||||
-rw-r--r-- | Essentials/test/net/ess3/UtilTest.java (renamed from Essentials/test/com/earth2me/essentials/UtilTest.java) | 8 | ||||
-rw-r--r-- | Essentials2Compat/src/com/earth2me/essentials/Economy.java (renamed from Essentials2Compat/src/com/earth2me/essentials/api/Economy.java) | 11 | ||||
-rw-r--r-- | Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java | 2 | ||||
-rw-r--r-- | Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java | 17 | ||||
-rw-r--r-- | Essentials2Compat/src/plugin.yml | 2 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/ChatPermissions.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java) | 6 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/ChatStore.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java) | 8 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/EssentialsChat.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java) | 14 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java) | 22 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEvent.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java) | 2 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java) | 8 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java) | 9 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java) | 12 | ||||
-rw-r--r-- | EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java (renamed from EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java) | 8 | ||||
-rw-r--r-- | EssentialsChat/src/plugin.yml | 2 | ||||
-rw-r--r-- | EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java (renamed from EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java) | 8 | ||||
-rw-r--r-- | EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java (renamed from EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java) | 8 | ||||
-rw-r--r-- | EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java (renamed from EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java) | 12 | ||||
-rw-r--r-- | EssentialsGeoIP/src/plugin.yml | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java | 121 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/BlockBreakPermissions.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java) | 6 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/BlockPlacePermissions.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java) | 6 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EmergencyListener.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java) | 14 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java) | 7 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java) | 7 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsProtectPlayerListener.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java) | 4 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/IProtect.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java) | 4 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java) | 6 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/Permissions.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java) | 6 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/ProtectHolder.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java) | 8 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/data/IProtectedBlock.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/data/OwnedBlock.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockJDBC.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMemory.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMySQL.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockSQLite.java (renamed from EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java) | 2 | ||||
-rw-r--r-- | EssentialsProtect/src/plugin.yml | 2 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/EssentialsSign.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java) | 14 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSignsPlugin.java) | 8 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/ISignsPlugin.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java) | 4 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignBalance.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java) | 10 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignBlockListener.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java) | 10 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignBuy.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java) | 10 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignDisposal.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java) | 6 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignEnchant.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java) | 14 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignEntityListener.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java) | 4 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignException.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignException.java) | 2 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignFree.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java) | 12 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignGameMode.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java) | 12 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignHeal.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java) | 12 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignKit.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java) | 14 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignMail.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignMail.java) | 8 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignPlayerListener.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java) | 4 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignProtection.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java) | 16 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignSell.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java) | 10 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignSpawnmob.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java) | 12 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignTime.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java) | 12 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignTrade.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java) | 14 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignWarp.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java) | 12 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignWeather.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java) | 12 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/Signs.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/Signs.java) | 2 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignsConfig.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java) | 4 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfigHolder.java) | 6 | ||||
-rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignsPermissions.java (renamed from EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java) | 6 | ||||
-rw-r--r-- | EssentialsSigns/src/plugin.yml | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/com/earth2me/essentials/update/tasks/Task.java | 7 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java) | 4 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/GetFile.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/ModuleInfo.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/ModuleInfo.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/PastieUpload.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/PastieUpload.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/PostToUrl.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/PostToUrl.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/UpdateCheck.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/UpdateFile.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/UpdateProcess.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java) | 8 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/Version.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/Version.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/VersionInfo.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java) | 6 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/Command.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/Command.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/ConfigCommand.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/ErrorsCommand.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/HelpCommand.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/HelpCommand.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/IrcBot.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/ListCommand.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/ListCommand.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/StartupCommand.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/chat/UsernameUtil.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/AbstractState.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java) | 5 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractYesNoState.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/AdvancedMode.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/AdvancedMode.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/Changelog.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java) | 6 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChat.java) | 6 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/EssentialsChatSettings.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChatSettings.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsGeoIP.java) | 7 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsProtect.java) | 7 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/InstallationFinishedEvent.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/StateMachine.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java) | 8 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/StateMap.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java) | 2 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java) | 5 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java) | 14 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java (renamed from EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java) | 5 | ||||
-rw-r--r-- | EssentialsUpdate/src/net/ess3/update/tasks/Task.java | 7 | ||||
-rw-r--r-- | EssentialsUpdate/src/plugin.yml | 2 | ||||
-rw-r--r-- | EssentialsUpdate/test/com/ess3/update/UploadTest.java (renamed from EssentialsUpdate/test/com/earth2me/essentials/update/UploadTest.java) | 3 | ||||
-rw-r--r-- | EssentialsUpdate/test/com/ess3/update/VersionTest.java (renamed from EssentialsUpdate/test/com/earth2me/essentials/update/VersionTest.java) | 5 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/Commandsetxmpp.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java) | 8 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java) | 8 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java) | 6 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java) | 16 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java) | 6 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java) | 4 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/UserManager.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java) | 4 | ||||
-rw-r--r-- | EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java (renamed from EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java) | 8 | ||||
-rw-r--r-- | EssentialsXMPP/src/plugin.yml | 4 |
408 files changed, 1642 insertions, 1760 deletions
diff --git a/Essentials/src/com/earth2me/essentials/api/IWarp.java b/Essentials/src/com/earth2me/essentials/api/IWarp.java deleted file mode 100644 index f08e5757d..000000000 --- a/Essentials/src/com/earth2me/essentials/api/IWarp.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.earth2me.essentials.api; - -import com.earth2me.essentials.settings.Warp; -import com.earth2me.essentials.storage.IStorageObjectHolder; - - -public interface IWarp extends IStorageObjectHolder<Warp> -{ -} diff --git a/Essentials/src/com/earth2me/essentials/api/server/IPermission.java b/Essentials/src/com/earth2me/essentials/api/server/IPermission.java deleted file mode 100644 index 3b5cf2eb4..000000000 --- a/Essentials/src/com/earth2me/essentials/api/server/IPermission.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.earth2me.essentials.api.server; - -public interface IPermission { - -} diff --git a/Essentials/src/com/earth2me/essentials/api/server/IPlayer.java b/Essentials/src/com/earth2me/essentials/api/server/IPlayer.java deleted file mode 100644 index 7d0899e81..000000000 --- a/Essentials/src/com/earth2me/essentials/api/server/IPlayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.earth2me.essentials.api.server; - -public interface IPlayer { - -} diff --git a/Essentials/src/com/earth2me/essentials/api/server/IServer.java b/Essentials/src/com/earth2me/essentials/api/server/IServer.java deleted file mode 100644 index 2c267b6cb..000000000 --- a/Essentials/src/com/earth2me/essentials/api/server/IServer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.earth2me.essentials.api.server; - -public interface IServer { - -} diff --git a/Essentials/src/com/earth2me/essentials/storage/StorageObject.java b/Essentials/src/com/earth2me/essentials/storage/StorageObject.java deleted file mode 100644 index 0c66fefcf..000000000 --- a/Essentials/src/com/earth2me/essentials/storage/StorageObject.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.earth2me.essentials.storage; - - -public interface StorageObject -{ -} diff --git a/Essentials/src/com/earth2me/essentials/user/IOfflineUser.java b/Essentials/src/com/earth2me/essentials/user/IOfflineUser.java deleted file mode 100644 index d6266df49..000000000 --- a/Essentials/src/com/earth2me/essentials/user/IOfflineUser.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.earth2me.essentials.user; - -import com.earth2me.essentials.storage.IStorageObjectHolder; - - -public interface IOfflineUser extends IStorageObjectHolder<UserData>, IOfflinePlayer -{ - -} diff --git a/Essentials/src/com/earth2me/essentials/Console.java b/Essentials/src/net/ess3/Console.java index 2e43883cf..93c638a77 100644 --- a/Essentials/src/com/earth2me/essentials/Console.java +++ b/Essentials/src/net/ess3/Console.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials; +package net.ess3; -import com.earth2me.essentials.api.IReplyTo; +import net.ess3.api.IReplyTo; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/net/ess3/Essentials.java index 1095443c5..a13e8e4e6 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/net/ess3/Essentials.java @@ -15,27 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.earth2me.essentials; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.*; -import com.earth2me.essentials.backup.Backup; -import com.earth2me.essentials.commands.EssentialsCommandHandler; -import com.earth2me.essentials.economy.Economy; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.economy.WorthHolder; -import com.earth2me.essentials.economy.register.Methods; -import com.earth2me.essentials.listener.*; -import com.earth2me.essentials.metrics.Metrics; -import com.earth2me.essentials.metrics.MetricsListener; -import com.earth2me.essentials.metrics.MetricsStarter; -import com.earth2me.essentials.ranks.RanksStorage; -import com.earth2me.essentials.settings.SettingsHolder; -import com.earth2me.essentials.settings.SpawnsHolder; -import com.earth2me.essentials.user.IOfflinePlayer; -import com.earth2me.essentials.user.User; -import com.earth2me.essentials.user.UserMap; -import com.earth2me.essentials.utils.ExecuteTimer; +package net.ess3; + +import net.ess3.api.*; +import net.ess3.backup.Backup; +import net.ess3.commands.EssentialsCommandHandler; +import net.ess3.economy.Economy; +import net.ess3.economy.Trade; +import net.ess3.economy.WorthHolder; +import net.ess3.economy.register.Methods; +import net.ess3.listener.*; +import net.ess3.metrics.Metrics; +import net.ess3.metrics.MetricsListener; +import net.ess3.metrics.MetricsStarter; +import net.ess3.ranks.RanksStorage; +import net.ess3.settings.SettingsHolder; +import net.ess3.settings.SpawnsHolder; +import net.ess3.user.IOfflinePlayer; +import net.ess3.user.User; +import net.ess3.user.UserMap; +import net.ess3.utils.ExecuteTimer; import java.io.File; import java.io.FileReader; import java.io.IOException; @@ -112,7 +111,7 @@ public class Essentials extends JavaPlugin implements IEssentials } i18n = new I18n(this); i18n.onEnable(); - LOGGER.log(Level.INFO, _("usingTempFolderForTesting")); + LOGGER.log(Level.INFO, I18n._("usingTempFolderForTesting")); LOGGER.log(Level.INFO, dataFolder.toString()); this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null); settings = new SettingsHolder(this); @@ -137,7 +136,7 @@ public class Essentials extends JavaPlugin implements IEssentials && !plugin.getDescription().getVersion().equals(this.getDescription().getVersion()) && !plugin.getDescription().getName().equals("EssentialsAntiCheat")) { - LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName())); + LOGGER.log(Level.WARNING, I18n._("versionMismatch", plugin.getDescription().getName())); } } final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion()); @@ -147,8 +146,8 @@ public class Essentials extends JavaPlugin implements IEssentials if (versionNumber < BUKKIT_VERSION && versionNumber > 100) { LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *"); - LOGGER.log(Level.SEVERE, _("notRecommendedBukkit")); - LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION))); + LOGGER.log(Level.SEVERE, I18n._("notRecommendedBukkit")); + LOGGER.log(Level.SEVERE, I18n._("requiredBukkit", Integer.toString(BUKKIT_VERSION))); LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *"); this.setEnabled(false); return; @@ -156,7 +155,7 @@ public class Essentials extends JavaPlugin implements IEssentials } else { - LOGGER.log(Level.INFO, _("bukkitFormatChanged")); + LOGGER.log(Level.INFO, I18n._("bukkitFormatChanged")); LOGGER.log(Level.INFO, getServer().getVersion()); LOGGER.log(Level.INFO, getServer().getBukkitVersion()); } @@ -188,7 +187,7 @@ public class Essentials extends JavaPlugin implements IEssentials execTimer.mark("Init(Worth/ItemDB)"); kits = new Kits(this); reloadList.add(kits); - commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", this); + commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "net.ess3.commands.Command", "essentials.", this); reloadList.add(commandHandler); economy = new Economy(this); reloadList.add(economy); @@ -200,11 +199,11 @@ public class Essentials extends JavaPlugin implements IEssentials { if (pm.getPlugin("EssentialsUpdate") != null) { - LOGGER.log(Level.SEVERE, _("essentialsHelp2")); + LOGGER.log(Level.SEVERE, I18n._("essentialsHelp2")); } else { - LOGGER.log(Level.SEVERE, _("essentialsHelp1")); + LOGGER.log(Level.SEVERE, I18n._("essentialsHelp1")); } LOGGER.log(Level.SEVERE, exception.toString()); pm.registerEvents(new Listener() @@ -274,7 +273,7 @@ public class Essentials extends JavaPlugin implements IEssentials if (user.isVanished()) { user.toggleVanished(); - p.sendMessage(_("unvanishedReload")); + p.sendMessage(I18n._("unvanishedReload")); } } i18n.onDisable(); @@ -299,7 +298,7 @@ public class Essentials extends JavaPlugin implements IEssentials public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args) { return commandHandler.handleCommand(sender, command, commandLabel, args); - //return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null); + //return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "net.ess3.commands.Command", "essentials.", null); } @Override diff --git a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java index 6874c069c..f2ec6c441 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java +++ b/Essentials/src/net/ess3/EssentialsTimer.java @@ -1,11 +1,10 @@ -package com.earth2me.essentials; +package net.ess3; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.UserData.TimestampType; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData.TimestampType; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; @@ -73,7 +72,7 @@ public class EssentialsTimer implements Runnable final List<String> mail = user.getMails(); if (mail != null && !mail.isEmpty()) { - user.sendMessage(_("youHaveNewMail", mail.size())); + user.sendMessage(I18n._("youHaveNewMail", mail.size())); } } } diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/net/ess3/I18n.java index de4afec94..0086576a8 100644 --- a/Essentials/src/com/earth2me/essentials/I18n.java +++ b/Essentials/src/net/ess3/I18n.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials; +package net.ess3; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.II18n; +import net.ess3.api.IEssentials; +import net.ess3.api.II18n; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/Essentials/src/com/earth2me/essentials/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java index cfcc00dd2..448eb7baa 100644 --- a/Essentials/src/com/earth2me/essentials/ItemDb.java +++ b/Essentials/src/net/ess3/ItemDb.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials; - -import com.earth2me.essentials.storage.ManagedFile; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IItemDb; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +package net.ess3; + +import net.ess3.storage.ManagedFile; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IItemDb; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -67,7 +67,7 @@ public class ItemDb implements IItemDb final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH)); @Cleanup - com.earth2me.essentials.api.ISettings settings = ess.getSettings(); + net.ess3.api.ISettings settings = ess.getSettings(); settings.acquireReadLock(); final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize(); diff --git a/Essentials/src/com/earth2me/essentials/Jails.java b/Essentials/src/net/ess3/Jails.java index b23e1bb10..244d40853 100644 --- a/Essentials/src/com/earth2me/essentials/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials; +package net.ess3; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IJails; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IJails; +import net.ess3.api.IUser; +import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.util.*; import java.util.logging.Level; @@ -30,14 +30,14 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.PluginManager; -public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails +public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails { private static final transient Logger LOGGER = Bukkit.getLogger(); private static transient boolean enabled = false; public Jails(final IEssentials ess) { - super(ess, com.earth2me.essentials.settings.Jails.class); + super(ess, net.ess3.settings.Jails.class); onReload(); } @@ -168,9 +168,9 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett { if (getData().getJails() == null) { - getData().setJails(new HashMap<String, com.earth2me.essentials.storage.Location>()); + getData().setJails(new HashMap<String, net.ess3.storage.Location>()); } - getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.Location(loc)); + getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new net.ess3.storage.Location(loc)); } finally { diff --git a/Essentials/src/com/earth2me/essentials/Kits.java b/Essentials/src/net/ess3/Kits.java index 806266d32..fe9c55851 100644 --- a/Essentials/src/com/earth2me/essentials/Kits.java +++ b/Essentials/src/net/ess3/Kits.java @@ -1,25 +1,25 @@ -package com.earth2me.essentials; +package net.ess3; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IKits; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.commands.NoChargeException; -import com.earth2me.essentials.settings.Kit; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; -import com.earth2me.essentials.user.UserData.TimestampType; -import com.earth2me.essentials.utils.DateUtil; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IKits; +import net.ess3.api.IUser; +import net.ess3.commands.NoChargeException; +import net.ess3.settings.Kit; +import net.ess3.storage.AsyncStorageObjectHolder; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.DateUtil; import java.io.File; import java.io.IOException; import java.util.*; import org.bukkit.inventory.ItemStack; -public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Kits> implements IKits +public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> implements IKits { public Kits(final IEssentials ess) { - super(ess, com.earth2me.essentials.settings.Kits.class); + super(ess, net.ess3.settings.Kits.class); onReload(); } diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/net/ess3/Teleport.java index 0a97fbc5b..e703679cc 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/net/ess3/Teleport.java @@ -1,15 +1,15 @@ -package com.earth2me.essentials; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ITeleport; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.CooldownException; -import com.earth2me.essentials.user.UserData.TimestampType; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.LocationUtil; +package net.ess3; + +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ITeleport; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; +import net.ess3.user.CooldownException; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.DateUtil; +import net.ess3.utils.LocationUtil; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.logging.Logger; diff --git a/Essentials/src/com/earth2me/essentials/Warps.java b/Essentials/src/net/ess3/Warps.java index bbf01678b..751b762ce 100644 --- a/Essentials/src/com/earth2me/essentials/Warps.java +++ b/Essentials/src/net/ess3/Warps.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IWarp; -import com.earth2me.essentials.api.IWarps; -import com.earth2me.essentials.api.InvalidNameException; -import com.earth2me.essentials.commands.WarpNotFoundException; -import com.earth2me.essentials.settings.WarpHolder; -import com.earth2me.essentials.storage.StorageObjectMap; +package net.ess3; + +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IWarp; +import net.ess3.api.IWarps; +import net.ess3.api.InvalidNameException; +import net.ess3.commands.WarpNotFoundException; +import net.ess3.settings.WarpHolder; +import net.ess3.storage.StorageObjectMap; import java.io.File; import java.util.*; import java.util.logging.Logger; @@ -77,10 +77,10 @@ public class Warps extends StorageObjectMap<IWarp> implements IWarps @Override public void setWarp(final String name, final Location loc) throws Exception { - setWarp(name, new com.earth2me.essentials.storage.Location(loc)); + setWarp(name, new net.ess3.storage.Location(loc)); } - public void setWarp(final String name, final com.earth2me.essentials.storage.Location loc) throws Exception + public void setWarp(final String name, final net.ess3.storage.Location loc) throws Exception { IWarp warp = getObject(name); if (warp == null) diff --git a/Essentials/src/com/earth2me/essentials/api/ChargeException.java b/Essentials/src/net/ess3/api/ChargeException.java index 5b157ce63..48a004791 100644 --- a/Essentials/src/com/earth2me/essentials/api/ChargeException.java +++ b/Essentials/src/net/ess3/api/ChargeException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; public class ChargeException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/api/IBackup.java b/Essentials/src/net/ess3/api/IBackup.java index 8af074c54..03fb232eb 100644 --- a/Essentials/src/com/earth2me/essentials/api/IBackup.java +++ b/Essentials/src/net/ess3/api/IBackup.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; public interface IBackup extends Runnable diff --git a/Essentials/src/com/earth2me/essentials/api/ICommandHandler.java b/Essentials/src/net/ess3/api/ICommandHandler.java index f756c16c4..33093d4bd 100644 --- a/Essentials/src/com/earth2me/essentials/api/ICommandHandler.java +++ b/Essentials/src/net/ess3/api/ICommandHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import java.util.Map; import org.bukkit.command.Command; diff --git a/Essentials/src/com/earth2me/essentials/api/IEconomy.java b/Essentials/src/net/ess3/api/IEconomy.java index 092d86c88..f0cf6f7fe 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEconomy.java +++ b/Essentials/src/net/ess3/api/IEconomy.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; public interface IEconomy extends IReload diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index 488b1aceb..7a8c3ccaf 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -1,10 +1,11 @@ -package com.earth2me.essentials.api; +package net.ess3.api; -import com.earth2me.essentials.EssentialsTimer; -import com.earth2me.essentials.economy.register.Methods; -import com.earth2me.essentials.listener.TntExplodeListener; -import com.earth2me.essentials.metrics.Metrics; +import net.ess3.EssentialsTimer; +import net.ess3.economy.register.Methods; +import net.ess3.listener.TntExplodeListener; +import net.ess3.metrics.Metrics; import java.util.List; + import org.bukkit.World; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java b/Essentials/src/net/ess3/api/IEssentialsModule.java index cc185980a..c4c6f3a45 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEssentialsModule.java +++ b/Essentials/src/net/ess3/api/IEssentialsModule.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; public interface IEssentialsModule diff --git a/Essentials/src/com/earth2me/essentials/api/II18n.java b/Essentials/src/net/ess3/api/II18n.java index 567d4e59e..198ee47c4 100644 --- a/Essentials/src/com/earth2me/essentials/api/II18n.java +++ b/Essentials/src/net/ess3/api/II18n.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/api/IItemDb.java b/Essentials/src/net/ess3/api/IItemDb.java index 29f97488c..8a20c85a1 100644 --- a/Essentials/src/com/earth2me/essentials/api/IItemDb.java +++ b/Essentials/src/net/ess3/api/IItemDb.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/api/IJails.java b/Essentials/src/net/ess3/api/IJails.java index fb8d2f090..bf616d7ec 100644 --- a/Essentials/src/com/earth2me/essentials/api/IJails.java +++ b/Essentials/src/net/ess3/api/IJails.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import java.util.Collection; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/api/IKits.java b/Essentials/src/net/ess3/api/IKits.java index 33d0de153..62ad57321 100644 --- a/Essentials/src/com/earth2me/essentials/api/IKits.java +++ b/Essentials/src/net/ess3/api/IKits.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.api; +package net.ess3.api; -import com.earth2me.essentials.commands.NoChargeException; -import com.earth2me.essentials.settings.Kit; +import net.ess3.commands.NoChargeException; +import net.ess3.settings.Kit; import java.util.Collection; diff --git a/Essentials/src/com/earth2me/essentials/api/IPermission.java b/Essentials/src/net/ess3/api/IPermission.java index d388bff47..987f0b481 100644 --- a/Essentials/src/com/earth2me/essentials/api/IPermission.java +++ b/Essentials/src/net/ess3/api/IPermission.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; diff --git a/Essentials/src/com/earth2me/essentials/api/IRanks.java b/Essentials/src/net/ess3/api/IRanks.java index e29b31302..4785bbb70 100644 --- a/Essentials/src/com/earth2me/essentials/api/IRanks.java +++ b/Essentials/src/net/ess3/api/IRanks.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import java.text.MessageFormat; diff --git a/Essentials/src/com/earth2me/essentials/api/IReload.java b/Essentials/src/net/ess3/api/IReload.java index 75403b55c..964d88841 100644 --- a/Essentials/src/com/earth2me/essentials/api/IReload.java +++ b/Essentials/src/net/ess3/api/IReload.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; public interface IReload diff --git a/Essentials/src/com/earth2me/essentials/api/IReplyTo.java b/Essentials/src/net/ess3/api/IReplyTo.java index 3003ca3df..b1393d22f 100644 --- a/Essentials/src/com/earth2me/essentials/api/IReplyTo.java +++ b/Essentials/src/net/ess3/api/IReplyTo.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/api/ISettings.java b/Essentials/src/net/ess3/api/ISettings.java index a445d21b4..971f96871 100644 --- a/Essentials/src/com/earth2me/essentials/api/ISettings.java +++ b/Essentials/src/net/ess3/api/ISettings.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.api; +package net.ess3.api; -import com.earth2me.essentials.settings.Settings; -import com.earth2me.essentials.storage.IStorageObjectHolder; +import net.ess3.settings.Settings; +import net.ess3.storage.IStorageObjectHolder; public interface ISettings extends IStorageObjectHolder<Settings> diff --git a/Essentials/src/com/earth2me/essentials/api/ITeleport.java b/Essentials/src/net/ess3/api/ITeleport.java index 16c05a917..afec3e213 100644 --- a/Essentials/src/com/earth2me/essentials/api/ITeleport.java +++ b/Essentials/src/net/ess3/api/ITeleport.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.api; +package net.ess3.api; -import com.earth2me.essentials.economy.Trade; +import net.ess3.economy.Trade; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/api/IUser.java b/Essentials/src/net/ess3/api/IUser.java index fa54ffd21..cad866601 100644 --- a/Essentials/src/com/earth2me/essentials/api/IUser.java +++ b/Essentials/src/net/ess3/api/IUser.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.api; +package net.ess3.api; -import com.earth2me.essentials.storage.IStorageObjectHolder; -import com.earth2me.essentials.user.CooldownException; -import com.earth2me.essentials.user.UserData; +import net.ess3.storage.IStorageObjectHolder; +import net.ess3.user.CooldownException; +import net.ess3.user.UserData; import java.util.List; import org.bukkit.Location; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/api/IUserMap.java b/Essentials/src/net/ess3/api/IUserMap.java index fbe6cfa0e..1184bd1c5 100644 --- a/Essentials/src/com/earth2me/essentials/api/IUserMap.java +++ b/Essentials/src/net/ess3/api/IUserMap.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import java.io.File; import java.util.Set; diff --git a/Essentials/src/net/ess3/api/IWarp.java b/Essentials/src/net/ess3/api/IWarp.java new file mode 100644 index 000000000..149a9cfc6 --- /dev/null +++ b/Essentials/src/net/ess3/api/IWarp.java @@ -0,0 +1,9 @@ +package net.ess3.api; + +import net.ess3.settings.Warp; +import net.ess3.storage.IStorageObjectHolder; + + +public interface IWarp extends IStorageObjectHolder<Warp> +{ +} diff --git a/Essentials/src/com/earth2me/essentials/api/IWarps.java b/Essentials/src/net/ess3/api/IWarps.java index 2a98ecc64..908994486 100644 --- a/Essentials/src/com/earth2me/essentials/api/IWarps.java +++ b/Essentials/src/net/ess3/api/IWarps.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import java.io.File; import java.util.Collection; diff --git a/Essentials/src/com/earth2me/essentials/api/IWorth.java b/Essentials/src/net/ess3/api/IWorth.java index 4add98771..ffc38a203 100644 --- a/Essentials/src/com/earth2me/essentials/api/IWorth.java +++ b/Essentials/src/net/ess3/api/IWorth.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java b/Essentials/src/net/ess3/api/InvalidNameException.java index 951c66b17..7d08d73ad 100644 --- a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java +++ b/Essentials/src/net/ess3/api/InvalidNameException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package net.ess3.api; public class InvalidNameException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java b/Essentials/src/net/ess3/api/NoLoanPermittedException.java index f21bf98cc..88a3ec6c7 100644 --- a/Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java +++ b/Essentials/src/net/ess3/api/NoLoanPermittedException.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.api; +package net.ess3.api; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; public class NoLoanPermittedException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java b/Essentials/src/net/ess3/api/UserDoesNotExistException.java index 531d9ead6..e18502dd1 100644 --- a/Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java +++ b/Essentials/src/net/ess3/api/UserDoesNotExistException.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.api; +package net.ess3.api; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; public class UserDoesNotExistException extends Exception diff --git a/Essentials/src/net/ess3/api/server/IPermission.java b/Essentials/src/net/ess3/api/server/IPermission.java new file mode 100644 index 000000000..23fee3a03 --- /dev/null +++ b/Essentials/src/net/ess3/api/server/IPermission.java @@ -0,0 +1,5 @@ +package net.ess3.api.server; + +public interface IPermission { + +} diff --git a/Essentials/src/com/earth2me/essentials/api/server/IPermissionsManager.java b/Essentials/src/net/ess3/api/server/IPermissionsManager.java index d8f017e20..d422868b4 100644 --- a/Essentials/src/com/earth2me/essentials/api/server/IPermissionsManager.java +++ b/Essentials/src/net/ess3/api/server/IPermissionsManager.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api.server; +package net.ess3.api.server; public interface IPermissionsManager { diff --git a/Essentials/src/net/ess3/api/server/IPlayer.java b/Essentials/src/net/ess3/api/server/IPlayer.java new file mode 100644 index 000000000..4ae44a480 --- /dev/null +++ b/Essentials/src/net/ess3/api/server/IPlayer.java @@ -0,0 +1,5 @@ +package net.ess3.api.server; + +public interface IPlayer { + +} diff --git a/Essentials/src/net/ess3/api/server/IServer.java b/Essentials/src/net/ess3/api/server/IServer.java new file mode 100644 index 000000000..efb5d1415 --- /dev/null +++ b/Essentials/src/net/ess3/api/server/IServer.java @@ -0,0 +1,5 @@ +package net.ess3.api.server; + +public interface IServer { + +} diff --git a/Essentials/src/com/earth2me/essentials/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index 2da391af9..454ad127f 100644 --- a/Essentials/src/com/earth2me/essentials/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.backup; +package net.ess3.backup; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IBackup; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; +import static net.ess3.I18n._; +import net.ess3.api.IBackup; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java b/Essentials/src/net/ess3/bukkit/Enchantments.java index 5cbff9919..b577f06e3 100644 --- a/Essentials/src/com/earth2me/essentials/bukkit/Enchantments.java +++ b/Essentials/src/net/ess3/bukkit/Enchantments.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.bukkit; +package net.ess3.bukkit; import java.util.HashMap; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java b/Essentials/src/net/ess3/bukkit/EssentialsPlugin.java index f58f2e5b6..44d821bf1 100644 --- a/Essentials/src/com/earth2me/essentials/bukkit/EssentialsPlugin.java +++ b/Essentials/src/net/ess3/bukkit/EssentialsPlugin.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.bukkit; +package net.ess3.bukkit; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Mob.java b/Essentials/src/net/ess3/bukkit/Mob.java index 3d78b2a82..c618a1038 100644 --- a/Essentials/src/com/earth2me/essentials/bukkit/Mob.java +++ b/Essentials/src/net/ess3/bukkit/Mob.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.bukkit; +package net.ess3.bukkit; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import java.util.Collections; import java.util.HashMap; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/bukkit/Server.java b/Essentials/src/net/ess3/bukkit/Server.java index 1c10d9a7b..2491a4952 100644 --- a/Essentials/src/com/earth2me/essentials/bukkit/Server.java +++ b/Essentials/src/net/ess3/bukkit/Server.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.bukkit; +package net.ess3.bukkit; -import com.earth2me.essentials.api.server.IServer; +import net.ess3.api.server.IServer; import lombok.Delegate; public class Server implements IServer { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/net/ess3/commands/Commandafk.java index a571ec652..97f7b247b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/net/ess3/commands/Commandafk.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java b/Essentials/src/net/ess3/commands/Commandantioch.java index eea30448d..818d1c97f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java +++ b/Essentials/src/net/ess3/commands/Commandantioch.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.LocationUtil; +import net.ess3.api.IUser; +import net.ess3.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.entity.TNTPrimed; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/net/ess3/commands/Commandback.java index d325b7f6a..ef785b11a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java +++ b/Essentials/src/net/ess3/commands/Commandback.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.WorldPermissions; public class Commandback extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java b/Essentials/src/net/ess3/commands/Commandbackup.java index 6ea8aec87..2b1e68750 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java +++ b/Essentials/src/net/ess3/commands/Commandbackup.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IBackup; -import com.earth2me.essentials.api.ISettings; +import static net.ess3.I18n._; +import net.ess3.api.IBackup; +import net.ess3.api.ISettings; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/net/ess3/commands/Commandbalance.java index c8491a2c0..401323d48 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java +++ b/Essentials/src/net/ess3/commands/Commandbalance.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index 1508a134f..98c3d3d90 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.textreader.ArrayListInput; -import com.earth2me.essentials.utils.textreader.TextPager; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IUser; +import net.ess3.utils.textreader.ArrayListInput; +import net.ess3.utils.textreader.TextPager; import java.text.DateFormat; import java.util.*; import java.util.Map.Entry; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java index 1bf3bded2..98d970987 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/net/ess3/commands/Commandban.java @@ -1,11 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import org.bukkit.Server; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.Ban; +import net.ess3.Console; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.Ban; import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java index c9d4caa89..c55e57440 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java +++ b/Essentials/src/net/ess3/commands/Commandbanip.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java index aa5645c85..fda8b8fb5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java +++ b/Essentials/src/net/ess3/commands/Commandbigtree.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.LocationUtil; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.TreeType; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java b/Essentials/src/net/ess3/commands/Commandbreak.java index 6d2d7bb04..8c90f0571 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java +++ b/Essentials/src/net/ess3/commands/Commandbreak.java @@ -1,14 +1,12 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; + +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import static net.ess3.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import static com.earth2me.essentials.I18n._; -import java.util.ArrayList; -import java.util.List; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.inventory.ItemStack; public class Commandbreak extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java b/Essentials/src/net/ess3/commands/Commandbroadcast.java index df2c5e114..d4fb48c4e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java +++ b/Essentials/src/net/ess3/commands/Commandbroadcast.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java b/Essentials/src/net/ess3/commands/Commandburn.java index 08b8739b5..af0b91599 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java +++ b/Essentials/src/net/ess3/commands/Commandburn.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java index fea6c024f..c46eb7206 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java +++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java b/Essentials/src/net/ess3/commands/Commandcompass.java index 7314f8b6e..8554c4608 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java +++ b/Essentials/src/net/ess3/commands/Commandcompass.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commandcompass extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java index 629d00592..b7606def6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java +++ b/Essentials/src/net/ess3/commands/Commanddelhome.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.Locale; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java b/Essentials/src/net/ess3/commands/Commanddeljail.java index 9daae2fad..4aa7c479e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java +++ b/Essentials/src/net/ess3/commands/Commanddeljail.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java b/Essentials/src/net/ess3/commands/Commanddelwarp.java index 482652b15..a97514886 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java +++ b/Essentials/src/net/ess3/commands/Commanddelwarp.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java b/Essentials/src/net/ess3/commands/Commanddepth.java index 73d3c7150..31f621767 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java +++ b/Essentials/src/net/ess3/commands/Commanddepth.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commanddepth extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java index 3269d2114..680e5d1b4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java +++ b/Essentials/src/net/ess3/commands/Commandeco.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import static com.earth2me.essentials.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import static net.ess3.I18n._; import java.util.Locale; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java index 114f51a4d..7e38d13fc 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java +++ b/Essentials/src/net/ess3/commands/Commandenchant.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.bukkit.Enchantments; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.EnchantPermissions; +import net.ess3.bukkit.Enchantments; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IUser; +import net.ess3.permissions.EnchantPermissions; import java.util.Locale; import java.util.Map; import java.util.Set; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java index c6b0967c0..a3dad9d19 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java +++ b/Essentials/src/net/ess3/commands/Commandessentials.java @@ -1,12 +1,11 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.metrics.Metrics; +import static net.ess3.I18n._; +import net.ess3.metrics.Metrics; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandexp.java b/Essentials/src/net/ess3/commands/Commandexp.java index 081ef6bc3..104a294e5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandexp.java +++ b/Essentials/src/net/ess3/commands/Commandexp.java @@ -1,139 +1,139 @@ -package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.craftbukkit.SetExpFix;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.utils.Util;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandexp extends EssentialsCommand
-{
- @Override
- public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
- {
-
- if (args.length == 0)
- {
- showExp(user, user);
- }
- else if (args[0].equalsIgnoreCase("set") && Permissions.EXP_SET.isAuthorized(user))
- {
- if (args.length == 3 && Permissions.EXP_SET_OTHERS.isAuthorized(user))
- {
- expMatch(user, args[1], args[2], false);
- }
- else
- {
- setExp(user, user, args[1], false);
- }
- }
- else if (args[0].equalsIgnoreCase("give") && Permissions.EXP_GIVE.isAuthorized(user))
- {
- if (args.length == 3 && Permissions.EXP_GIVE_OTHERS.isAuthorized(user))
- {
- expMatch(user, args[1], args[2], true);
- }
- else
- {
- setExp(user, user, args[1], true);
- }
- }
- else
- {
- String match = args[0].trim();
- if (args.length == 2)
- {
- match = args[1].trim();
- }
- if (match.equalsIgnoreCase("show") || !Permissions.EXP_OTHERS.isAuthorized(user))
- {
- showExp(user, user);
- }
- else
- {
- showMatch(user, match);
- }
- }
- }
-
-
- public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
- {
- if (args.length < 1)
- {
- throw new NotEnoughArgumentsException();
- }
- else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
- {
- expMatch(sender, args[1], args[2], false);
- }
- else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
- {
- expMatch(sender, args[1], args[2], true);
- }
- else
- {
- String match = args[0].trim();
- if (args.length == 2)
- {
- match = args[1].trim();
- }
- showMatch(sender, match);
- }
- }
-
- private void showMatch(final CommandSender sender, final String match) throws NotEnoughArgumentsException
- {
- boolean foundUser = false;
- for (Player matchPlayer : server.matchPlayer(match))
- {
- foundUser = true;
- final IUser target = ess.getUser(matchPlayer);
- showExp(sender, target);
- }
- if (!foundUser)
- {
- throw new NotEnoughArgumentsException(_("playerNotFound"));
- }
- }
-
- private void expMatch(final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException
- {
- boolean foundUser = false;
- for (Player matchPlayer : server.matchPlayer(match))
- {
- final IUser target = ess.getUser(matchPlayer);
- setExp(sender, target, amount, toggle);
- foundUser = true;
- }
- if (!foundUser)
- {
- throw new NotEnoughArgumentsException(_("playerNotFound"));
- }
- }
-
- private void showExp(final CommandSender sender, final IUser target)
- {
- final int totalExp = SetExpFix.getTotalExperience(target);
- final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1));
- sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft));
- }
-
- private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
- {
- Long amount = Long.parseLong(strAmount);
- if (give)
- {
- amount += SetExpFix.getTotalExperience(target);
- }
- if (amount > Integer.MAX_VALUE)
- {
- amount = (long)Integer.MAX_VALUE;
- }
- SetExpFix.setTotalExperience(target, amount.intValue());
- sender.sendMessage(_("expSet", target.getDisplayName(), amount));
- }
+package net.ess3.commands; + +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.SetExpFix; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + + +public class Commandexp extends EssentialsCommand +{ + @Override + public void run(final IUser user, final String commandLabel, final String[] args) throws Exception + { + + if (args.length == 0) + { + showExp(user, user); + } + else if (args[0].equalsIgnoreCase("set") && Permissions.EXP_SET.isAuthorized(user)) + { + if (args.length == 3 && Permissions.EXP_SET_OTHERS.isAuthorized(user)) + { + expMatch(user, args[1], args[2], false); + } + else + { + setExp(user, user, args[1], false); + } + } + else if (args[0].equalsIgnoreCase("give") && Permissions.EXP_GIVE.isAuthorized(user)) + { + if (args.length == 3 && Permissions.EXP_GIVE_OTHERS.isAuthorized(user)) + { + expMatch(user, args[1], args[2], true); + } + else + { + setExp(user, user, args[1], true); + } + } + else + { + String match = args[0].trim(); + if (args.length == 2) + { + match = args[1].trim(); + } + if (match.equalsIgnoreCase("show") || !Permissions.EXP_OTHERS.isAuthorized(user)) + { + showExp(user, user); + } + else + { + showMatch(user, match); + } + } + } + + + public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception + { + if (args.length < 1) + { + throw new NotEnoughArgumentsException(); + } + else if (args.length > 2 && args[0].equalsIgnoreCase("set")) + { + expMatch(sender, args[1], args[2], false); + } + else if (args.length > 2 && args[0].equalsIgnoreCase("give")) + { + expMatch(sender, args[1], args[2], true); + } + else + { + String match = args[0].trim(); + if (args.length == 2) + { + match = args[1].trim(); + } + showMatch(sender, match); + } + } + + private void showMatch(final CommandSender sender, final String match) throws NotEnoughArgumentsException + { + boolean foundUser = false; + for (Player matchPlayer : server.matchPlayer(match)) + { + foundUser = true; + final IUser target = ess.getUser(matchPlayer); + showExp(sender, target); + } + if (!foundUser) + { + throw new NotEnoughArgumentsException(_("playerNotFound")); + } + } + + private void expMatch(final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException + { + boolean foundUser = false; + for (Player matchPlayer : server.matchPlayer(match)) + { + final IUser target = ess.getUser(matchPlayer); + setExp(sender, target, amount, toggle); + foundUser = true; + } + if (!foundUser) + { + throw new NotEnoughArgumentsException(_("playerNotFound")); + } + } + + private void showExp(final CommandSender sender, final IUser target) + { + final int totalExp = SetExpFix.getTotalExperience(target); + final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1)); + sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft)); + } + + private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give) + { + Long amount = Long.parseLong(strAmount); + if (give) + { + amount += SetExpFix.getTotalExperience(target); + } + if (amount > Integer.MAX_VALUE) + { + amount = (long)Integer.MAX_VALUE; + } + SetExpFix.setTotalExperience(target, amount.intValue()); + sender.sendMessage(_("expSet", target.getDisplayName(), amount)); + } }
\ No newline at end of file diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandext.java b/Essentials/src/net/ess3/commands/Commandext.java index 8e689506a..f3413f0fd 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandext.java +++ b/Essentials/src/net/ess3/commands/Commandext.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java index e7c8f9fe4..55bca0932 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java +++ b/Essentials/src/net/ess3/commands/Commandfeed.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java index f13f3ee75..8882f0106 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfireball.java +++ b/Essentials/src/net/ess3/commands/Commandfireball.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IUser; import org.bukkit.entity.Fireball; import org.bukkit.entity.SmallFireball; import org.bukkit.util.Vector; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java b/Essentials/src/net/ess3/commands/Commandfly.java index 93498e2d6..d36923764 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java +++ b/Essentials/src/net/ess3/commands/Commandfly.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java index 83a2577d6..535afeb77 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java +++ b/Essentials/src/net/ess3/commands/Commandgamemode.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.Locale; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java index 4097c5e83..dfb2917c7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java +++ b/Essentials/src/net/ess3/commands/Commandgc.java @@ -1,8 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.ChatColor; -import org.bukkit.Server; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java b/Essentials/src/net/ess3/commands/Commandgetpos.java index c31c76d3c..e4ac2b4fe 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java +++ b/Essentials/src/net/ess3/commands/Commandgetpos.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java index f0f0380ac..13f5572c4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java +++ b/Essentials/src/net/ess3/commands/Commandgive.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.GivePermissions; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.GivePermissions; +import net.ess3.utils.Util; import java.util.Locale; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/net/ess3/commands/Commandgod.java index e23553036..7cb424d81 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java +++ b/Essentials/src/net/ess3/commands/Commandgod.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java index 91108225c..18fb73cca 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhat.java +++ b/Essentials/src/net/ess3/commands/Commandhat.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java index fe620b390..d529a56ef 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java +++ b/Essentials/src/net/ess3/commands/Commandheal.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.UserData.TimestampType; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData.TimestampType; import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java b/Essentials/src/net/ess3/commands/Commandhelp.java index b9989ddd5..7c2248e49 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java +++ b/Essentials/src/net/ess3/commands/Commandhelp.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.utils.textreader.HelpInput; -import com.earth2me.essentials.utils.textreader.IText; -import com.earth2me.essentials.utils.textreader.KeywordReplacer; -import com.earth2me.essentials.utils.textreader.TextInput; -import com.earth2me.essentials.utils.textreader.TextPager; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.Util; +import net.ess3.utils.textreader.HelpInput; +import net.ess3.utils.textreader.IText; +import net.ess3.utils.textreader.KeywordReplacer; +import net.ess3.utils.textreader.TextInput; +import net.ess3.utils.textreader.TextPager; import java.util.Locale; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java index 42a69b4b1..b720ab590 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java +++ b/Essentials/src/net/ess3/commands/Commandhelpop.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.logging.Level; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java index cb3220479..4d3ddd0c1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/net/ess3/commands/Commandhome.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; + +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; +import net.ess3.permissions.WorldPermissions; +import net.ess3.utils.Util; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.permissions.WorldPermissions; -import com.earth2me.essentials.utils.Util; -import de.bananaco.permissions.worlds.WorldPermissionSet; import java.util.List; import java.util.Locale; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java b/Essentials/src/net/ess3/commands/Commandignore.java index 9b06cfa64..af9f2b710 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java +++ b/Essentials/src/net/ess3/commands/Commandignore.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commandignore extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinfo.java b/Essentials/src/net/ess3/commands/Commandinfo.java index 924e0a74a..cf8d90818 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandinfo.java +++ b/Essentials/src/net/ess3/commands/Commandinfo.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.utils.textreader.IText; -import com.earth2me.essentials.utils.textreader.KeywordReplacer; -import com.earth2me.essentials.utils.textreader.TextInput; -import com.earth2me.essentials.utils.textreader.TextPager; +import net.ess3.utils.textreader.IText; +import net.ess3.utils.textreader.KeywordReplacer; +import net.ess3.utils.textreader.TextInput; +import net.ess3.utils.textreader.TextPager; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java index 349caaf63..cf0b18ea6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java +++ b/Essentials/src/net/ess3/commands/Commandinvsee.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IUser; public class Commandinvsee extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java index 0dae772cc..df371a752 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java +++ b/Essentials/src/net/ess3/commands/Commanditem.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.ItemPermissions; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.ItemPermissions; +import net.ess3.permissions.Permissions; import java.util.Locale; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java index fe1177fa2..ca869e61d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java +++ b/Essentials/src/net/ess3/commands/Commanditemdb.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjails.java b/Essentials/src/net/ess3/commands/Commandjails.java index 7e50c78e2..6a68c1e91 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandjails.java +++ b/Essentials/src/net/ess3/commands/Commandjails.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.utils.Util; +import net.ess3.utils.Util; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java index 4d4388b84..de5a1c0d3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java +++ b/Essentials/src/net/ess3/commands/Commandjump.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.LocationUtil; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; +import net.ess3.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java index fe11efcea..d6703aa19 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java +++ b/Essentials/src/net/ess3/commands/Commandkick.java @@ -1,9 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import net.ess3.Console; +import static net.ess3.I18n._; + +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/net/ess3/commands/Commandkickall.java index bd22d30c9..3de05b71f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java +++ b/Essentials/src/net/ess3/commands/Commandkickall.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java index 81e998b34..6f5560b1e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java +++ b/Essentials/src/net/ess3/commands/Commandkill.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java index d8868e2c4..5388af0c6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkillall.java +++ b/Essentials/src/net/ess3/commands/Commandkillall.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.bukkit.Mob; +import static net.ess3.I18n._; +import net.ess3.bukkit.Mob; import java.util.Collections; import java.util.Locale; import org.bukkit.Chunk; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/net/ess3/commands/Commandkit.java index 4130429f8..ca620165a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java +++ b/Essentials/src/net/ess3/commands/Commandkit.java @@ -1,16 +1,14 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.permissions.KitPermissions; -import com.earth2me.essentials.settings.Kit; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.KitPermissions; +import net.ess3.settings.Kit; +import net.ess3.utils.Util; import java.util.Collection; -import java.util.List; import java.util.Locale; import org.bukkit.command.CommandSender; -import org.bukkit.inventory.ItemStack; public class Commandkit extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java b/Essentials/src/net/ess3/commands/Commandkittycannon.java index 99a6aa0f3..74a3e7935 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java +++ b/Essentials/src/net/ess3/commands/Commandkittycannon.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.bukkit.Mob; +import net.ess3.api.IUser; +import net.ess3.bukkit.Mob; import java.util.Random; import org.bukkit.Location; import org.bukkit.entity.Ocelot; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java index b4dab9691..3ac1b0494 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java +++ b/Essentials/src/net/ess3/commands/Commandlightning.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.LightningStrike; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index db8ec5aea..5221ecad8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java +++ b/Essentials/src/net/ess3/commands/Commandlist.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; import java.util.*; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java index 1454345da..722f61403 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/net/ess3/commands/Commandmail.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.List; -import org.bukkit.Server; + import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/net/ess3/commands/Commandme.java index c420195cc..fb62ec234 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java +++ b/Essentials/src/net/ess3/commands/Commandme.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandme extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java index bbf9ede4c..fc2d2de00 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java +++ b/Essentials/src/net/ess3/commands/Commandmore.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.ItemPermissions; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.ItemPermissions; +import net.ess3.permissions.Permissions; import java.util.Locale; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java b/Essentials/src/net/ess3/commands/Commandmotd.java index c1d1e92bf..907a41b34 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java +++ b/Essentials/src/net/ess3/commands/Commandmotd.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.utils.textreader.IText; -import com.earth2me.essentials.utils.textreader.KeywordReplacer; -import com.earth2me.essentials.utils.textreader.TextInput; -import com.earth2me.essentials.utils.textreader.TextPager; +import net.ess3.utils.textreader.IText; +import net.ess3.utils.textreader.KeywordReplacer; +import net.ess3.utils.textreader.TextInput; +import net.ess3.utils.textreader.TextPager; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java index 7da2b9675..e4052de89 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java +++ b/Essentials/src/net/ess3/commands/Commandmsg.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IReplyTo; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import net.ess3.Console; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IReplyTo; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.List; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index e6873df03..78d13d077 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.UserData.TimestampType; -import com.earth2me.essentials.utils.DateUtil; +import static net.ess3.I18n._; + +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.DateUtil; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java index fc1450445..248adfa7f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java +++ b/Essentials/src/net/ess3/commands/Commandnear.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java index edbefafaf..e6e3df7f1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/net/ess3/commands/Commandnick.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.Locale; import lombok.Cleanup; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java b/Essentials/src/net/ess3/commands/Commandnuke.java index 4f6e3933a..9d39b6dca 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java +++ b/Essentials/src/net/ess3/commands/Commandnuke.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java index 1299aa6e3..d60f6ea18 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java +++ b/Essentials/src/net/ess3/commands/Commandpay.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandping.java b/Essentials/src/net/ess3/commands/Commandping.java index 8c253e183..13e99b912 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandping.java +++ b/Essentials/src/net/ess3/commands/Commandping.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.Util; public class Commandping extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java index 6cf391bf7..cd8fe57b7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java +++ b/Essentials/src/net/ess3/commands/Commandpowertool.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java index 24481bcec..a7875e1b7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java +++ b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commandpowertooltoggle extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java index e7e887189..51cd0485f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java +++ b/Essentials/src/net/ess3/commands/Commandptime.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.utils.DescParseTickFormat; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import net.ess3.utils.DescParseTickFormat; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.*; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java index 1d7100649..6dbebde81 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/net/ess3/commands/Commandr.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IReplyTo; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import net.ess3.Console; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IReplyTo; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java index 9d69d2ad6..0a5e7c783 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java +++ b/Essentials/src/net/ess3/commands/Commandrealname.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; import java.util.Locale; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java index 988a1f47f..af8a97d4c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/net/ess3/commands/Commandremove.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import java.util.Locale; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java index 05715b515..b523f076b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java +++ b/Essentials/src/net/ess3/commands/Commandrepair.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; - -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.IUser; -import com.earth2me.essentials.permissions.Permissions; +package net.ess3.commands; + +import net.ess3.api.ChargeException; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java b/Essentials/src/net/ess3/commands/Commandrules.java index da0a3eaec..1e15a6097 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java +++ b/Essentials/src/net/ess3/commands/Commandrules.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.utils.textreader.IText; -import com.earth2me.essentials.utils.textreader.KeywordReplacer; -import com.earth2me.essentials.utils.textreader.TextInput; -import com.earth2me.essentials.utils.textreader.TextPager; +import net.ess3.utils.textreader.IText; +import net.ess3.utils.textreader.KeywordReplacer; +import net.ess3.utils.textreader.TextInput; +import net.ess3.utils.textreader.TextPager; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index d9f456a0d..315fef9c0 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.storage.Location; -import com.earth2me.essentials.user.UserData.TimestampType; -import com.earth2me.essentials.utils.DateUtil; +import static net.ess3.I18n._; + +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.storage.Location; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.DateUtil; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java index 0b56843cd..a4e73661d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java +++ b/Essentials/src/net/ess3/commands/Commandsell.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.utils.Util; -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.utils.Util; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; import java.util.Locale; import java.util.logging.Level; import org.bukkit.Material; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index 5ef850264..ed2a3cb16 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; import java.util.HashMap; import java.util.Locale; import lombok.Cleanup; @@ -36,9 +36,9 @@ public class Commandsethome extends EssentialsCommand user.acquireWriteLock(); if (user.getData().getHomes() == null) { - user.getData().setHomes(new HashMap<String, com.earth2me.essentials.storage.Location>()); + user.getData().setHomes(new HashMap<String, net.ess3.storage.Location>()); } - user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.Location(user.getLocation())); + user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new net.ess3.storage.Location(user.getLocation())); } else { @@ -74,9 +74,9 @@ public class Commandsethome extends EssentialsCommand usersHome.acquireWriteLock(); if (usersHome.getData().getHomes() == null) { - usersHome.getData().setHomes(new HashMap<String, com.earth2me.essentials.storage.Location>()); + usersHome.getData().setHomes(new HashMap<String, net.ess3.storage.Location>()); } - usersHome.getData().getHomes().put(name, new com.earth2me.essentials.storage.Location(user.getLocation())); + usersHome.getData().getHomes().put(name, new net.ess3.storage.Location(user.getLocation())); } } } @@ -85,9 +85,9 @@ public class Commandsethome extends EssentialsCommand user.acquireWriteLock(); if (user.getData().getHomes() == null) { - user.getData().setHomes(new HashMap<String, com.earth2me.essentials.storage.Location>()); + user.getData().setHomes(new HashMap<String, net.ess3.storage.Location>()); } - user.getData().getHomes().put("home", new com.earth2me.essentials.storage.Location(user.getLocation())); + user.getData().getHomes().put("home", new net.ess3.storage.Location(user.getLocation())); } user.sendMessage(_("homeSet", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java b/Essentials/src/net/ess3/commands/Commandsetjail.java index 0b4c7f3ff..9938b025c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java +++ b/Essentials/src/net/ess3/commands/Commandsetjail.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.Util; public class Commandsetjail extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetspawn.java b/Essentials/src/net/ess3/commands/Commandsetspawn.java index 3af7e711f..ccf319892 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetspawn.java +++ b/Essentials/src/net/ess3/commands/Commandsetspawn.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.settings.SpawnsHolder; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.settings.SpawnsHolder; public class Commandsetspawn extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java index 8a1797f81..18f0a9701 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java +++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.api.IWarps; -import com.earth2me.essentials.permissions.WarpPermissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.api.IWarps; +import net.ess3.permissions.WarpPermissions; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java index 8bb06e48d..68fb2481e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java +++ b/Essentials/src/net/ess3/commands/Commandsetworth.java @@ -1,8 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import org.bukkit.command.CommandSender; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java b/Essentials/src/net/ess3/commands/Commandsocialspy.java index 86ae15fc8..c466af842 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java +++ b/Essentials/src/net/ess3/commands/Commandsocialspy.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commandsocialspy extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java index 0edcf870c..1f1b4a023 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawn.java +++ b/Essentials/src/net/ess3/commands/Commandspawn.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.settings.SpawnsHolder; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.settings.SpawnsHolder; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java index 81ae6a659..ee8b6f1d1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java +++ b/Essentials/src/net/ess3/commands/Commandspawner.java @@ -1,20 +1,18 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.bukkit.Mob; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.SpawnerPermissions; -import com.earth2me.essentials.utils.LocationUtil; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.bukkit.Mob; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; +import net.ess3.permissions.SpawnerPermissions; +import net.ess3.utils.LocationUtil; +import net.ess3.utils.Util; import java.util.Locale; import lombok.Cleanup; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.CreatureSpawner; -import org.bukkit.entity.EntityType; public class Commandspawner extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java index c9c8a2a4b..d5b0ed5e2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.bukkit.Mob; -import com.earth2me.essentials.bukkit.Mob.MobException; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.SpawnmobPermissions; -import com.earth2me.essentials.utils.LocationUtil; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.bukkit.Mob; +import net.ess3.bukkit.Mob.MobException; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.SpawnmobPermissions; +import net.ess3.utils.LocationUtil; +import net.ess3.utils.Util; import java.util.HashSet; import java.util.*; import org.bukkit.DyeColor; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java index 9d94bef89..15489a184 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java +++ b/Essentials/src/net/ess3/commands/Commandsudo.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; + +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import static net.ess3.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java index 1c6b99c32..979341053 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java +++ b/Essentials/src/net/ess3/commands/Commandsuicide.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java index 4068f8d18..fb3918231 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java +++ b/Essentials/src/net/ess3/commands/Commandtempban.java @@ -1,13 +1,12 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.Ban; -import com.earth2me.essentials.utils.DateUtil; -import org.bukkit.OfflinePlayer; +import net.ess3.Console; +import static net.ess3.I18n._; + +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.Ban; +import net.ess3.utils.DateUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java index 23c2e13b9..eb7d9e1e2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java +++ b/Essentials/src/net/ess3/commands/Commandthunder.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.World; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java index 35ba8dedc..48b322e31 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java +++ b/Essentials/src/net/ess3/commands/Commandtime.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.utils.DescParseTickFormat; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.utils.DescParseTickFormat; +import net.ess3.utils.Util; import java.util.*; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index 856a32153..1f2d52c49 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -1,13 +1,12 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.UserData.TimestampType; -import com.earth2me.essentials.utils.DateUtil; +import static net.ess3.I18n._; + +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.DateUtil; import lombok.Cleanup; -import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java index 1e9926ecd..3298f8acd 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java +++ b/Essentials/src/net/ess3/commands/Commandtop.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java index 93b0277e1..103202a24 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java +++ b/Essentials/src/net/ess3/commands/Commandtp.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.permissions.WorldPermissions; +import net.ess3.Console; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/net/ess3/commands/Commandtpa.java index f6003316d..48f17f28d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java +++ b/Essentials/src/net/ess3/commands/Commandtpa.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java index b5b889c30..36bfd4086 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java +++ b/Essentials/src/net/ess3/commands/Commandtpaall.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java index e0f3b7d0c..e2a86f5bc 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/net/ess3/commands/Commandtpahere.java index 3de6c0ba8..efff0cb50 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java +++ b/Essentials/src/net/ess3/commands/Commandtpahere.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java index e9f7419c3..15d59f1d4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java +++ b/Essentials/src/net/ess3/commands/Commandtpall.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java b/Essentials/src/net/ess3/commands/Commandtpdeny.java index 15d3f7728..e7744939b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java +++ b/Essentials/src/net/ess3/commands/Commandtpdeny.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commandtpdeny extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java index 1954b0874..856cab2d4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java +++ b/Essentials/src/net/ess3/commands/Commandtphere.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java index 006812e48..b7fdce113 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java +++ b/Essentials/src/net/ess3/commands/Commandtpo.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java index c108f56f8..734ba32a5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java +++ b/Essentials/src/net/ess3/commands/Commandtpohere.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.permissions.WorldPermissions; import lombok.Cleanup; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java index 80daf2b16..946bf9cbc 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java +++ b/Essentials/src/net/ess3/commands/Commandtppos.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java b/Essentials/src/net/ess3/commands/Commandtptoggle.java index 2c39271ac..0b525baa3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java +++ b/Essentials/src/net/ess3/commands/Commandtptoggle.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commandtptoggle extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java b/Essentials/src/net/ess3/commands/Commandtree.java index 79bbecd29..991e86380 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java +++ b/Essentials/src/net/ess3/commands/Commandtree.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.LocationUtil; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.TreeType; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java index 101e09691..c3c6f71a1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java +++ b/Essentials/src/net/ess3/commands/Commandunban.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java b/Essentials/src/net/ess3/commands/Commandunbanip.java index 14d2c8ae6..95c5f2e98 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java +++ b/Essentials/src/net/ess3/commands/Commandunbanip.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java index 632a8567a..74a25d638 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java +++ b/Essentials/src/net/ess3/commands/Commandunlimited.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.permissions.UnlimitedItemPermissions; +import static net.ess3.I18n._; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; +import net.ess3.permissions.Permissions; +import net.ess3.permissions.UnlimitedItemPermissions; import java.util.Locale; import java.util.Set; import lombok.Cleanup; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java b/Essentials/src/net/ess3/commands/Commandvanish.java index 9e8997a7c..16cab5a51 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java +++ b/Essentials/src/net/ess3/commands/Commandvanish.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; public class Commandvanish extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java index db146a107..a6383df43 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java +++ b/Essentials/src/net/ess3/commands/Commandwarp.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.api.IWarps; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.permissions.WarpPermissions; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; +import net.ess3.api.IUser; +import net.ess3.api.IWarps; +import net.ess3.permissions.Permissions; +import net.ess3.permissions.WarpPermissions; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java b/Essentials/src/net/ess3/commands/Commandweather.java index 2df5b1eac..eb4f2b707 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java +++ b/Essentials/src/net/ess3/commands/Commandweather.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.api.IUser; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java index 858e601f5..18924ac9a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/net/ess3/commands/Commandwhois.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.UserData; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.craftbukkit.SetExpFix; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData; +import net.ess3.utils.DateUtil; +import net.ess3.craftbukkit.SetExpFix; import java.util.Locale; import lombok.Cleanup; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java index 9e2c1b08d..d5e3bd58a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java +++ b/Essentials/src/net/ess3/commands/Commandworld.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.WorldPermissions; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IUser; +import net.ess3.permissions.WorldPermissions; import java.util.List; import org.bukkit.Location; import org.bukkit.World; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java index 0e1ec1dc1..211460cae 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java +++ b/Essentials/src/net/ess3/commands/Commandworth.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IUser; +import static net.ess3.I18n._; +import net.ess3.utils.Util; +import net.ess3.api.IUser; import java.util.Locale; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java index e3b25177a..73215060a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IEssentialsModule; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.AbstractSuperpermsPermission; +import static net.ess3.I18n._; +import net.ess3.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IEssentialsModule; +import net.ess3.api.IUser; +import net.ess3.permissions.AbstractSuperpermsPermission; import java.util.List; import java.util.logging.Logger; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java index f45a55a3f..ff4150c99 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java @@ -1,11 +1,8 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; + +import static net.ess3.I18n._; +import net.ess3.api.*; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.*; -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.IEssentialsCommand; -import com.earth2me.essentials.commands.NoChargeException; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; @@ -87,7 +84,7 @@ public class EssentialsCommandHandler implements ICommandHandler final ArrayList<StackTraceElement> toRemove = new ArrayList<StackTraceElement>(); for (final StackTraceElement e : elements) { - if (e.getClassName().equals("com.earth2me.essentials.Essentials")) + if (e.getClassName().equals("net.ess3.Essentials")) { toRemove.add(e); } diff --git a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java b/Essentials/src/net/ess3/commands/IEssentialsCommand.java index b4c1b40f8..34f1ba020 100644 --- a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/IEssentialsCommand.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IEssentialsModule; -import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.api.IUser; +import net.ess3.api.IEssentials; +import net.ess3.api.IEssentialsModule; +import net.ess3.api.IPermission; +import net.ess3.api.IUser; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/commands/NoChargeException.java b/Essentials/src/net/ess3/commands/NoChargeException.java index bb0088792..e3cd20131 100644 --- a/Essentials/src/com/earth2me/essentials/commands/NoChargeException.java +++ b/Essentials/src/net/ess3/commands/NoChargeException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; public class NoChargeException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java b/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java index 0c47b9893..38a2915c7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java +++ b/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.commands; +package net.ess3.commands; public class NotEnoughArgumentsException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java b/Essentials/src/net/ess3/commands/WarpNotFoundException.java index c2e9c5c44..eef5db914 100644 --- a/Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java +++ b/Essentials/src/net/ess3/commands/WarpNotFoundException.java @@ -1,5 +1,5 @@ -package com.earth2me.essentials.commands; -import static com.earth2me.essentials.I18n._; +package net.ess3.commands; +import static net.ess3.I18n._; public class WarpNotFoundException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java b/Essentials/src/net/ess3/craftbukkit/FakeInventory.java index 8456c956e..7db0a1a7b 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeInventory.java +++ b/Essentials/src/net/ess3/craftbukkit/FakeInventory.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.craftbukkit; +package net.ess3.craftbukkit; import java.util.HashMap; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java index fc9cbb74b..f816026b9 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java +++ b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.craftbukkit; +package net.ess3.craftbukkit; import java.util.HashMap; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java b/Essentials/src/net/ess3/craftbukkit/SetExpFix.java index b788fa7ee..17efe7514 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java +++ b/Essentials/src/net/ess3/craftbukkit/SetExpFix.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.craftbukkit; +package net.ess3.craftbukkit; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/economy/Economy.java b/Essentials/src/net/ess3/economy/Economy.java index 12bc9414c..4ba48a3d9 100644 --- a/Essentials/src/com/earth2me/essentials/economy/Economy.java +++ b/Essentials/src/net/ess3/economy/Economy.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.economy; +package net.ess3.economy; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.*; -import com.earth2me.essentials.permissions.Permissions; +import net.ess3.utils.Util; +import net.ess3.api.*; +import net.ess3.permissions.Permissions; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/economy/Money.java b/Essentials/src/net/ess3/economy/Money.java index ff081e609..20eea3544 100644 --- a/Essentials/src/com/earth2me/essentials/economy/Money.java +++ b/Essentials/src/net/ess3/economy/Money.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.economy; +package net.ess3.economy; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java b/Essentials/src/net/ess3/economy/MoneyHolder.java index 3ecf6b2d0..a17fdb01f 100644 --- a/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java +++ b/Essentials/src/net/ess3/economy/MoneyHolder.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.economy; +package net.ess3.economy; -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; diff --git a/Essentials/src/com/earth2me/essentials/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java index c9304d1bb..a5225a13a 100644 --- a/Essentials/src/com/earth2me/essentials/economy/Trade.java +++ b/Essentials/src/net/ess3/economy/Trade.java @@ -1,14 +1,14 @@ -package com.earth2me.essentials.economy; +package net.ess3.economy; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -import com.earth2me.essentials.craftbukkit.SetExpFix; -import com.earth2me.essentials.permissions.NoCommandCostPermissions; -import com.earth2me.essentials.permissions.Permissions; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; +import net.ess3.craftbukkit.SetExpFix; +import net.ess3.permissions.NoCommandCostPermissions; +import net.ess3.permissions.Permissions; import java.io.File; import java.io.FileWriter; import java.io.IOException; diff --git a/Essentials/src/com/earth2me/essentials/economy/Worth.java b/Essentials/src/net/ess3/economy/Worth.java index c8f6a39ae..91fa254b7 100644 --- a/Essentials/src/com/earth2me/essentials/economy/Worth.java +++ b/Essentials/src/net/ess3/economy/Worth.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.economy; +package net.ess3.economy; -import com.earth2me.essentials.storage.EnchantmentLevel; -import com.earth2me.essentials.storage.MapKeyType; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.EnchantmentLevel; +import net.ess3.storage.MapKeyType; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java b/Essentials/src/net/ess3/economy/WorthHolder.java index d514c9797..59074c77f 100644 --- a/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java +++ b/Essentials/src/net/ess3/economy/WorthHolder.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.economy; +package net.ess3.economy; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IWorth; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; -import com.earth2me.essentials.storage.EnchantmentLevel; +import net.ess3.api.IEssentials; +import net.ess3.api.IWorth; +import net.ess3.storage.AsyncStorageObjectHolder; +import net.ess3.storage.EnchantmentLevel; import java.io.File; import java.io.IOException; import java.util.HashMap; @@ -13,7 +13,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; -public class WorthHolder extends AsyncStorageObjectHolder<com.earth2me.essentials.economy.Worth> implements IWorth +public class WorthHolder extends AsyncStorageObjectHolder<net.ess3.economy.Worth> implements IWorth { @Override @@ -31,7 +31,7 @@ public class WorthHolder extends AsyncStorageObjectHolder<com.earth2me.essential public WorthHolder(final IEssentials ess) { - super(ess, com.earth2me.essentials.economy.Worth.class); + super(ess, net.ess3.economy.Worth.class); onReload(false); } diff --git a/Essentials/src/com/earth2me/essentials/economy/register/Method.java b/Essentials/src/net/ess3/economy/register/Method.java index 5866066eb..c01e46476 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/Method.java +++ b/Essentials/src/net/ess3/economy/register/Method.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.economy.register; +package net.ess3.economy.register; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/economy/register/Methods.java b/Essentials/src/net/ess3/economy/register/Methods.java index eb3138473..04208b4cb 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/Methods.java +++ b/Essentials/src/net/ess3/economy/register/Methods.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.economy.register; +package net.ess3.economy.register; import java.util.HashSet; import java.util.Set; @@ -45,14 +45,14 @@ public class Methods */ private static void _init() { - addMethod("iConomy", new com.earth2me.essentials.economy.register.methods.iCo6()); - addMethod("iConomy", new com.earth2me.essentials.economy.register.methods.iCo5()); - addMethod("iConomy", new com.earth2me.essentials.economy.register.methods.iCo4()); - addMethod("BOSEconomy", new com.earth2me.essentials.economy.register.methods.BOSE6()); - addMethod("BOSEconomy", new com.earth2me.essentials.economy.register.methods.BOSE7()); - addMethod("Currency", new com.earth2me.essentials.economy.register.methods.MCUR()); + addMethod("iConomy", new net.ess3.economy.register.methods.iCo6()); + addMethod("iConomy", new net.ess3.economy.register.methods.iCo5()); + addMethod("iConomy", new net.ess3.economy.register.methods.iCo4()); + addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE6()); + addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE7()); + addMethod("Currency", new net.ess3.economy.register.methods.MCUR()); Dependencies.add("MultiCurrency"); - addMethod("Vault", new com.earth2me.essentials.economy.register.methods.VaultEco()); + addMethod("Vault", new net.ess3.economy.register.methods.VaultEco()); } /** diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java index 688e68332..200e8573c 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE6.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.economy.register.methods; +package net.ess3.economy.register.methods; -import com.earth2me.essentials.economy.register.Method; +import net.ess3.economy.register.Method; import cosine.boseconomy.BOSEconomy; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java index 53dd43d87..f9092c350 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/methods/BOSE7.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.economy.register.methods; +package net.ess3.economy.register.methods; -import com.earth2me.essentials.economy.register.Method; +import net.ess3.economy.register.Method; import cosine.boseconomy.BOSEconomy; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java b/Essentials/src/net/ess3/economy/register/methods/MCUR.java index d2cb57a8d..77fed351b 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/methods/MCUR.java +++ b/Essentials/src/net/ess3/economy/register/methods/MCUR.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.economy.register.methods; +package net.ess3.economy.register.methods; -import com.earth2me.essentials.economy.register.Method; +import net.ess3.economy.register.Method; import me.ashtheking.currency.Currency; import me.ashtheking.currency.CurrencyList; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java index 43beb84f4..5281c5b2f 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/methods/VaultEco.java +++ b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.economy.register.methods; +package net.ess3.economy.register.methods; -import com.earth2me.essentials.economy.register.Method; +import net.ess3.economy.register.Method; import net.milkbowl.vault.Vault; import net.milkbowl.vault.economy.Economy; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java b/Essentials/src/net/ess3/economy/register/methods/iCo4.java index b033ba9cc..3972b2432 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo4.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo4.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.economy.register.methods; +package net.ess3.economy.register.methods; -import com.earth2me.essentials.economy.register.Method; +import net.ess3.economy.register.Method; import com.nijiko.coelho.iConomy.iConomy; import com.nijiko.coelho.iConomy.system.Account; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java b/Essentials/src/net/ess3/economy/register/methods/iCo5.java index 137772ebc..171abfc7c 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo5.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo5.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.economy.register.methods; +package net.ess3.economy.register.methods; -import com.earth2me.essentials.economy.register.Method; +import net.ess3.economy.register.Method; import com.iConomy.iConomy; import com.iConomy.system.Account; import com.iConomy.system.BankAccount; diff --git a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java b/Essentials/src/net/ess3/economy/register/methods/iCo6.java index ead4ebeb3..4944a91a9 100644 --- a/Essentials/src/com/earth2me/essentials/economy/register/methods/iCo6.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo6.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.economy.register.methods; +package net.ess3.economy.register.methods; -import com.earth2me.essentials.economy.register.Method; +import net.ess3.economy.register.Method; import com.iCo6.iConomy; import com.iCo6.system.Account; import com.iCo6.system.Accounts; diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java index 49fff3de3..e23702135 100644 --- a/Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.listener; +package net.ess3.listener; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import org.bukkit.GameMode; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java index 53055a265..828bb3925 100644 --- a/Essentials/src/com/earth2me/essentials/listener/EssentialsEntityListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java @@ -1,16 +1,15 @@ -package com.earth2me.essentials.listener; +package net.ess3.listener; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.UserData.TimestampType; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData.TimestampType; import java.util.List; import lombok.Cleanup; import org.bukkit.Material; import org.bukkit.entity.Ageable; -import org.bukkit.entity.Animals; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index d6f539f70..3baaa6898 100644 --- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -1,16 +1,16 @@ -package com.earth2me.essentials.listener; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.user.UserData.TimestampType; -import com.earth2me.essentials.utils.LocationUtil; -import com.earth2me.essentials.utils.textreader.IText; -import com.earth2me.essentials.utils.textreader.KeywordReplacer; -import com.earth2me.essentials.utils.textreader.TextInput; -import com.earth2me.essentials.utils.textreader.TextPager; +package net.ess3.listener; + +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.LocationUtil; +import net.ess3.utils.textreader.IText; +import net.ess3.utils.textreader.KeywordReplacer; +import net.ess3.utils.textreader.TextInput; +import net.ess3.utils.textreader.TextPager; import java.io.IOException; import java.util.Arrays; import java.util.Iterator; diff --git a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java index edb839aa2..2d5e7a9d4 100644 --- a/Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.listener; +package net.ess3.listener; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IReload; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.ranks.GMGroups; -import com.earth2me.essentials.ranks.VaultGroups; -import com.earth2me.essentials.economy.register.Methods; -import com.earth2me.essentials.settings.General; -import com.earth2me.essentials.ranks.RanksStorage; +import net.ess3.api.IEssentials; +import net.ess3.api.IReload; +import net.ess3.api.ISettings; +import net.ess3.ranks.GMGroups; +import net.ess3.ranks.VaultGroups; +import net.ess3.economy.register.Methods; +import net.ess3.settings.General; +import net.ess3.ranks.RanksStorage; import java.util.logging.Level; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java b/Essentials/src/net/ess3/listener/TntExplodeListener.java index 778469605..fc4609d05 100644 --- a/Essentials/src/com/earth2me/essentials/listener/TntExplodeListener.java +++ b/Essentials/src/net/ess3/listener/TntExplodeListener.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.listener; +package net.ess3.listener; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.api.IEssentials; import java.util.concurrent.atomic.AtomicBoolean; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; diff --git a/Essentials/src/com/earth2me/essentials/metrics/Metrics.java b/Essentials/src/net/ess3/metrics/Metrics.java index f361e4f50..415938dea 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/Metrics.java +++ b/Essentials/src/net/ess3/metrics/Metrics.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.metrics; +package net.ess3.metrics; /* * Copyright 2011 Tyler Blair. All rights reserved. diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java index 77af2b5da..1db463a46 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java +++ b/Essentials/src/net/ess3/metrics/MetricsListener.java @@ -1,10 +1,7 @@ -package com.earth2me.essentials.metrics; +package net.ess3.metrics; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import java.util.logging.Level; +import net.ess3.api.IEssentials; import org.bukkit.Server; -import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java b/Essentials/src/net/ess3/metrics/MetricsStarter.java index 82bab0047..46b1651aa 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java +++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java @@ -1,17 +1,17 @@ -package com.earth2me.essentials.metrics; - -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.economy.register.Method; -import com.earth2me.essentials.economy.register.methods.VaultEco; -import com.earth2me.essentials.metrics.Metrics.Graph; -import com.earth2me.essentials.metrics.Metrics.Plotter; +package net.ess3.metrics; + +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.economy.register.Method; +import net.ess3.economy.register.methods.VaultEco; +import net.ess3.metrics.Metrics.Graph; +import net.ess3.metrics.Metrics.Plotter; //import com.earth2me.essentials.register.payment.Method; //import com.earth2me.essentials.register.payment.methods.VaultEco; import com.nijikokun.bukkit.Permissions.Permissions; import java.util.Locale; import java.util.logging.Level; -import java.util.logging.Logger; + import lombok.Cleanup; diff --git a/Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java index 4819f5ced..ca6c33cfa 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/AbstractSuperpermsPermission.java +++ b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IPermission; +import net.ess3.utils.Util; +import net.ess3.api.IPermission; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/com/earth2me/essentials/permissions/BasePermission.java b/Essentials/src/net/ess3/permissions/BasePermission.java index 3c033913f..71b18c034 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/BasePermission.java +++ b/Essentials/src/net/ess3/permissions/BasePermission.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; public class BasePermission extends AbstractSuperpermsPermission { protected String permission; diff --git a/Essentials/src/com/earth2me/essentials/permissions/EnchantPermissions.java b/Essentials/src/net/ess3/permissions/EnchantPermissions.java index c31aa6f62..996477338 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/EnchantPermissions.java +++ b/Essentials/src/net/ess3/permissions/EnchantPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/GivePermissions.java b/Essentials/src/net/ess3/permissions/GivePermissions.java index 162ec46c0..231acb8b7 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/GivePermissions.java +++ b/Essentials/src/net/ess3/permissions/GivePermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/GroupsPermissions.java b/Essentials/src/net/ess3/permissions/GroupsPermissions.java index ed3ca92ff..330cb7fb8 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/GroupsPermissions.java +++ b/Essentials/src/net/ess3/permissions/GroupsPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/HelpPermissions.java b/Essentials/src/net/ess3/permissions/HelpPermissions.java index aae5e0ce7..3e7b251bd 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/HelpPermissions.java +++ b/Essentials/src/net/ess3/permissions/HelpPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/ItemPermissions.java b/Essentials/src/net/ess3/permissions/ItemPermissions.java index 980af104f..53ff48ae6 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/ItemPermissions.java +++ b/Essentials/src/net/ess3/permissions/ItemPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/KitPermissions.java b/Essentials/src/net/ess3/permissions/KitPermissions.java index b21e0712d..c01768fa6 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/KitPermissions.java +++ b/Essentials/src/net/ess3/permissions/KitPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/NoCommandCostPermissions.java b/Essentials/src/net/ess3/permissions/NoCommandCostPermissions.java index 77511e198..54cd18624 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/NoCommandCostPermissions.java +++ b/Essentials/src/net/ess3/permissions/NoCommandCostPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index 80437fed4..3d2ac9160 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -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/Essentials/src/com/earth2me/essentials/permissions/SpawnerPermissions.java b/Essentials/src/net/ess3/permissions/SpawnerPermissions.java index 17f8243cf..67674370a 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/SpawnerPermissions.java +++ b/Essentials/src/net/ess3/permissions/SpawnerPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/SpawnmobPermissions.java b/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java index fa1e26fa0..ce8441706 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/SpawnmobPermissions.java +++ b/Essentials/src/net/ess3/permissions/SpawnmobPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/UnlimitedItemPermissions.java b/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java index dbe7df95b..02d6ec9b0 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/UnlimitedItemPermissions.java +++ b/Essentials/src/net/ess3/permissions/UnlimitedItemPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/WarpPermissions.java b/Essentials/src/net/ess3/permissions/WarpPermissions.java index 7f08ad3a2..f8d146b61 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/WarpPermissions.java +++ b/Essentials/src/net/ess3/permissions/WarpPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/permissions/WorldPermissions.java b/Essentials/src/net/ess3/permissions/WorldPermissions.java index 303a7214d..d86e22546 100644 --- a/Essentials/src/com/earth2me/essentials/permissions/WorldPermissions.java +++ b/Essentials/src/net/ess3/permissions/WorldPermissions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.permissions; +package net.ess3.permissions; -import com.earth2me.essentials.api.IPermission; +import net.ess3.api.IPermission; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java index 512df1e0d..8c07555e3 100644 --- a/Essentials/src/com/earth2me/essentials/ranks/GMGroups.java +++ b/Essentials/src/net/ess3/ranks/GMGroups.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.ranks; +package net.ess3.ranks; -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 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 java.text.MessageFormat; import lombok.Cleanup; import org.anjocaido.groupmanager.GroupManager; diff --git a/Essentials/src/com/earth2me/essentials/ranks/RankOptions.java b/Essentials/src/net/ess3/ranks/RankOptions.java index 5fa011f9c..a8a8c3298 100644 --- a/Essentials/src/com/earth2me/essentials/ranks/RankOptions.java +++ b/Essentials/src/net/ess3/ranks/RankOptions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.ranks; +package net.ess3.ranks; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/ranks/Ranks.java b/Essentials/src/net/ess3/ranks/Ranks.java index cc11aff2a..a77f09846 100644 --- a/Essentials/src/com/earth2me/essentials/ranks/Ranks.java +++ b/Essentials/src/net/ess3/ranks/Ranks.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.ranks; +package net.ess3.ranks; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.LinkedHashMap; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java b/Essentials/src/net/ess3/ranks/RanksStorage.java index 7e3eac946..85d5743b5 100644 --- a/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java +++ b/Essentials/src/net/ess3/ranks/RanksStorage.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.ranks; +package net.ess3.ranks; -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.GroupsPermissions; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +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.GroupsPermissions; +import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java b/Essentials/src/net/ess3/ranks/VaultGroups.java index 36c9742cf..30f526686 100644 --- a/Essentials/src/com/earth2me/essentials/ranks/VaultGroups.java +++ b/Essentials/src/net/ess3/ranks/VaultGroups.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.ranks; +package net.ess3.ranks; -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 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 java.text.MessageFormat; import lombok.Cleanup; import net.milkbowl.vault.chat.Chat; diff --git a/Essentials/src/com/earth2me/essentials/settings/Backup.java b/Essentials/src/net/ess3/settings/Backup.java index f43af47c0..9b2ce28cf 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Backup.java +++ b/Essentials/src/net/ess3/settings/Backup.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/Chat.java b/Essentials/src/net/ess3/settings/Chat.java index bbd02ce8e..44bafc395 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Chat.java +++ b/Essentials/src/net/ess3/settings/Chat.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/Commands.java b/Essentials/src/net/ess3/settings/Commands.java index 1b738d4c9..899ba6b1d 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Commands.java +++ b/Essentials/src/net/ess3/settings/Commands.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.settings.commands.*; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.ListType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.settings.commands.*; +import net.ess3.storage.Comment; +import net.ess3.storage.ListType; +import net.ess3.storage.StorageObject; import java.util.ArrayList; import java.util.List; import lombok.Data; @@ -20,7 +20,7 @@ public class Commands implements StorageObject private Help help = new Help(); private Home home = new Home(); private Lightning lightning = new Lightning(); - private com.earth2me.essentials.settings.commands.List list = new com.earth2me.essentials.settings.commands.List(); + private net.ess3.settings.commands.List list = new net.ess3.settings.commands.List(); private Spawnmob spawnmob = new Spawnmob(); private Tpa tpa = new Tpa(); @ListType diff --git a/Essentials/src/com/earth2me/essentials/settings/Economy.java b/Essentials/src/net/ess3/settings/Economy.java index ea106f13f..d1eced963 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Economy.java +++ b/Essentials/src/net/ess3/settings/Economy.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.economy.Worth; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.economy.Worth; +import net.ess3.storage.Comment; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/General.java b/Essentials/src/net/ess3/settings/General.java index 9647d3bed..831f2c869 100644 --- a/Essentials/src/com/earth2me/essentials/settings/General.java +++ b/Essentials/src/net/ess3/settings/General.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/Jails.java b/Essentials/src/net/ess3/settings/Jails.java index 3adb4ec1e..a6e1f5c82 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Jails.java +++ b/Essentials/src/net/ess3/settings/Jails.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Location; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Location; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/Kit.java b/Essentials/src/net/ess3/settings/Kit.java index ea0631124..0ffff6759 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Kit.java +++ b/Essentials/src/net/ess3/settings/Kit.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.ListType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.ListType; +import net.ess3.storage.StorageObject; import java.util.ArrayList; import java.util.List; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/Kits.java b/Essentials/src/net/ess3/settings/Kits.java index f943c2bb9..7992b9867 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Kits.java +++ b/Essentials/src/net/ess3/settings/Kits.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/Settings.java b/Essentials/src/net/ess3/settings/Settings.java index 6e5ec9793..11705f493 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Settings.java +++ b/Essentials/src/net/ess3/settings/Settings.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java index 2554ba9e8..b0c0a9121 100644 --- a/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java +++ b/Essentials/src/net/ess3/settings/SettingsHolder.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/Essentials/src/com/earth2me/essentials/settings/Spawns.java b/Essentials/src/net/ess3/settings/Spawns.java index 451ef49b1..15ee73fe6 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Spawns.java +++ b/Essentials/src/net/ess3/settings/Spawns.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.Location; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.Location; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index 816262a8e..fd545705d 100644 --- a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -1,16 +1,16 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IEssentialsModule; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; -import com.earth2me.essentials.storage.Location.WorldNotLoadedException; -import com.earth2me.essentials.utils.textreader.IText; -import com.earth2me.essentials.utils.textreader.KeywordReplacer; -import com.earth2me.essentials.utils.textreader.SimpleTextInput; -import com.earth2me.essentials.utils.textreader.SimpleTextPager; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IEssentialsModule; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.storage.AsyncStorageObjectHolder; +import net.ess3.storage.Location.WorldNotLoadedException; +import net.ess3.utils.textreader.IText; +import net.ess3.utils.textreader.KeywordReplacer; +import net.ess3.utils.textreader.SimpleTextInput; +import net.ess3.utils.textreader.SimpleTextPager; import java.io.File; import java.util.HashMap; import java.util.Locale; @@ -62,9 +62,9 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE { if (getData().getSpawns() == null) { - getData().setSpawns(new HashMap<String, com.earth2me.essentials.storage.Location>()); + getData().setSpawns(new HashMap<String, net.ess3.storage.Location>()); } - getData().getSpawns().put(group.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.Location(loc)); + getData().getSpawns().put(group.toLowerCase(Locale.ENGLISH), new net.ess3.storage.Location(loc)); } finally { @@ -86,7 +86,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE { return getWorldSpawn(); } - final Map<String, com.earth2me.essentials.storage.Location> spawnMap = getData().getSpawns(); + final Map<String, net.ess3.storage.Location> spawnMap = getData().getSpawns(); String groupName = group.toLowerCase(Locale.ENGLISH); if (!spawnMap.containsKey(groupName)) { diff --git a/Essentials/src/com/earth2me/essentials/settings/Warp.java b/Essentials/src/net/ess3/settings/Warp.java index f9c506b58..7b5a2f597 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Warp.java +++ b/Essentials/src/net/ess3/settings/Warp.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Location; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Location; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java b/Essentials/src/net/ess3/settings/WarpHolder.java index a14db0339..eaef24b6d 100644 --- a/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java +++ b/Essentials/src/net/ess3/settings/WarpHolder.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IWarp; -import com.earth2me.essentials.api.InvalidNameException; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import net.ess3.api.IEssentials; +import net.ess3.api.IWarp; +import net.ess3.api.InvalidNameException; +import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.io.IOException; diff --git a/Essentials/src/com/earth2me/essentials/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java index 95228684b..4b667c25e 100644 --- a/Essentials/src/com/earth2me/essentials/settings/WorldOptions.java +++ b/Essentials/src/net/ess3/settings/WorldOptions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/Worlds.java b/Essentials/src/net/ess3/settings/Worlds.java index ed865d94b..0d9fdb754 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Worlds.java +++ b/Essentials/src/net/ess3/settings/Worlds.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.settings; +package net.ess3.settings; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Afk.java b/Essentials/src/net/ess3/settings/commands/Afk.java index f46e52d52..0b337e049 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/Afk.java +++ b/Essentials/src/net/ess3/settings/commands/Afk.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Back.java b/Essentials/src/net/ess3/settings/commands/Back.java index bd2afdd62..54a4aa246 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/Back.java +++ b/Essentials/src/net/ess3/settings/commands/Back.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/God.java b/Essentials/src/net/ess3/settings/commands/God.java index a6f5dbfc3..32ab65c97 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/God.java +++ b/Essentials/src/net/ess3/settings/commands/God.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Help.java b/Essentials/src/net/ess3/settings/commands/Help.java index 0b4787471..92d5774c7 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/Help.java +++ b/Essentials/src/net/ess3/settings/commands/Help.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Home.java b/Essentials/src/net/ess3/settings/commands/Home.java index b856c881b..f23af4646 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/Home.java +++ b/Essentials/src/net/ess3/settings/commands/Home.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Lightning.java b/Essentials/src/net/ess3/settings/commands/Lightning.java index e40e645da..ee0d2ba3e 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/Lightning.java +++ b/Essentials/src/net/ess3/settings/commands/Lightning.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/List.java b/Essentials/src/net/ess3/settings/commands/List.java index ca2c61d2d..6258123f8 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/List.java +++ b/Essentials/src/net/ess3/settings/commands/List.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Spawnmob.java b/Essentials/src/net/ess3/settings/commands/Spawnmob.java index 37d41c296..4f9a524f2 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/Spawnmob.java +++ b/Essentials/src/net/ess3/settings/commands/Spawnmob.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/commands/Tpa.java b/Essentials/src/net/ess3/settings/commands/Tpa.java index 88cbc9a6b..b11e71035 100644 --- a/Essentials/src/com/earth2me/essentials/settings/commands/Tpa.java +++ b/Essentials/src/net/ess3/settings/commands/Tpa.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.commands; +package net.ess3.settings.commands; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/geoip/Database.java b/Essentials/src/net/ess3/settings/geoip/Database.java index 2060e08e0..089477b25 100644 --- a/Essentials/src/com/earth2me/essentials/settings/geoip/Database.java +++ b/Essentials/src/net/ess3/settings/geoip/Database.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.settings.geoip; +package net.ess3.settings.geoip; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/geoip/GeoIP.java b/Essentials/src/net/ess3/settings/geoip/GeoIP.java index 5942b678f..cae4a4df0 100644 --- a/Essentials/src/com/earth2me/essentials/settings/geoip/GeoIP.java +++ b/Essentials/src/net/ess3/settings/geoip/GeoIP.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.settings.geoip; +package net.ess3.settings.geoip; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java index 446b6e138..b2c571f1a 100644 --- a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java +++ b/Essentials/src/net/ess3/settings/protect/Prevent.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.settings.protect; +package net.ess3.settings.protect; -import com.earth2me.essentials.storage.*; +import net.ess3.storage.*; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java b/Essentials/src/net/ess3/settings/protect/Protect.java index 70a137f90..ab5a061fd 100644 --- a/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java +++ b/Essentials/src/net/ess3/settings/protect/Protect.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.settings.protect; +package net.ess3.settings.protect; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.ListType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.ListType; +import net.ess3.storage.StorageObject; import java.util.HashSet; import java.util.Set; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/SignsAndRails.java b/Essentials/src/net/ess3/settings/protect/SignsAndRails.java index dae3897c2..aba39305d 100644 --- a/Essentials/src/com/earth2me/essentials/settings/protect/SignsAndRails.java +++ b/Essentials/src/net/ess3/settings/protect/SignsAndRails.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings.protect; +package net.ess3.settings.protect; -import com.earth2me.essentials.storage.Comment; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index 037fa4292..d87f421f2 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import com.earth2me.essentials.Essentials; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.Essentials; +import net.ess3.api.IEssentials; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index d3289310e..19f40cd68 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -1,13 +1,14 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import com.earth2me.essentials.Essentials; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.Essentials; +import net.ess3.api.IEssentials; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; + import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java index ea48dc269..9b7f25827 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import com.earth2me.essentials.api.IEssentials; +import net.ess3.api.IEssentials; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index 93412be56..aae975d27 100644 --- a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -1,11 +1,12 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import com.earth2me.essentials.Essentials; +import net.ess3.Essentials; import java.lang.reflect.Field; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; + import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/storage/Comment.java b/Essentials/src/net/ess3/storage/Comment.java index 8cb9d4d31..ed65e59ef 100644 --- a/Essentials/src/com/earth2me/essentials/storage/Comment.java +++ b/Essentials/src/net/ess3/storage/Comment.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.lang.annotation.*; diff --git a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java b/Essentials/src/net/ess3/storage/EnchantmentLevel.java index 2eb062ae8..ad583f17f 100644 --- a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java +++ b/Essentials/src/net/ess3/storage/EnchantmentLevel.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.util.Map.Entry; import org.bukkit.enchantments.Enchantment; diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectHolder.java b/Essentials/src/net/ess3/storage/IStorageObjectHolder.java index 0d582ece8..da5e24c49 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/IStorageObjectHolder.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import com.earth2me.essentials.api.IReload; +import net.ess3.api.IReload; public interface IStorageObjectHolder<T extends StorageObject> extends IReload diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java b/Essentials/src/net/ess3/storage/IStorageObjectMap.java index 788d80e65..5facaf200 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/IStorageObjectMap.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import com.earth2me.essentials.api.IReload; -import com.earth2me.essentials.api.InvalidNameException; +import net.ess3.api.IReload; +import net.ess3.api.InvalidNameException; import java.io.File; import java.util.Set; diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java b/Essentials/src/net/ess3/storage/IStorageReader.java index e92774809..1d3d26f33 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java +++ b/Essentials/src/net/ess3/storage/IStorageReader.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; public interface IStorageReader diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java b/Essentials/src/net/ess3/storage/IStorageWriter.java index 5b8498869..8cba4122b 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java +++ b/Essentials/src/net/ess3/storage/IStorageWriter.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; public interface IStorageWriter diff --git a/Essentials/src/com/earth2me/essentials/storage/ListType.java b/Essentials/src/net/ess3/storage/ListType.java index 9bf6e2e64..17dd134a9 100644 --- a/Essentials/src/com/earth2me/essentials/storage/ListType.java +++ b/Essentials/src/net/ess3/storage/ListType.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Essentials/src/com/earth2me/essentials/storage/Location.java b/Essentials/src/net/ess3/storage/Location.java index 6778027d7..06210504b 100644 --- a/Essentials/src/com/earth2me/essentials/storage/Location.java +++ b/Essentials/src/net/ess3/storage/Location.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.lang.ref.WeakReference; import java.util.UUID; diff --git a/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index 509783955..216e21f17 100644 --- a/Essentials/src/com/earth2me/essentials/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; diff --git a/Essentials/src/com/earth2me/essentials/storage/MapKeyType.java b/Essentials/src/net/ess3/storage/MapKeyType.java index aa162e51c..2da042f33 100644 --- a/Essentials/src/com/earth2me/essentials/storage/MapKeyType.java +++ b/Essentials/src/net/ess3/storage/MapKeyType.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Essentials/src/com/earth2me/essentials/storage/MapValueType.java b/Essentials/src/net/ess3/storage/MapValueType.java index 1b5fff978..5e0bee09b 100644 --- a/Essentials/src/com/earth2me/essentials/storage/MapValueType.java +++ b/Essentials/src/net/ess3/storage/MapValueType.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Essentials/src/com/earth2me/essentials/storage/ObjectLoadException.java b/Essentials/src/net/ess3/storage/ObjectLoadException.java index 8b804abc3..4ea962db2 100644 --- a/Essentials/src/com/earth2me/essentials/storage/ObjectLoadException.java +++ b/Essentials/src/net/ess3/storage/ObjectLoadException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; public class ObjectLoadException extends Exception diff --git a/Essentials/src/net/ess3/storage/StorageObject.java b/Essentials/src/net/ess3/storage/StorageObject.java new file mode 100644 index 000000000..3a632224d --- /dev/null +++ b/Essentials/src/net/ess3/storage/StorageObject.java @@ -0,0 +1,6 @@ +package net.ess3.storage; + + +public interface StorageObject +{ +} diff --git a/Essentials/src/com/earth2me/essentials/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java index d3d118483..d8bf49d9c 100644 --- a/Essentials/src/com/earth2me/essentials/storage/StorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.InvalidNameException; +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.InvalidNameException; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java b/Essentials/src/net/ess3/storage/YamlStorageReader.java index ee7aa45cd..957902ee6 100644 --- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java +++ b/Essentials/src/net/ess3/storage/YamlStorageReader.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.io.Reader; import java.lang.reflect.Field; diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java b/Essentials/src/net/ess3/storage/YamlStorageWriter.java index 6e641db69..66c9dc852 100644 --- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java +++ b/Essentials/src/net/ess3/storage/YamlStorageWriter.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package net.ess3.storage; import java.io.PrintWriter; import java.lang.reflect.Field; diff --git a/Essentials/src/com/earth2me/essentials/user/Ban.java b/Essentials/src/net/ess3/user/Ban.java index ba1c22333..3fd5d1192 100644 --- a/Essentials/src/com/earth2me/essentials/user/Ban.java +++ b/Essentials/src/net/ess3/user/Ban.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.user; +package net.ess3.user; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.StorageObject; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/user/CooldownException.java b/Essentials/src/net/ess3/user/CooldownException.java index b986a5552..6875e59cb 100644 --- a/Essentials/src/com/earth2me/essentials/user/CooldownException.java +++ b/Essentials/src/net/ess3/user/CooldownException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.user; +package net.ess3.user; public class CooldownException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/user/IOfflinePlayer.java b/Essentials/src/net/ess3/user/IOfflinePlayer.java index 18667c8ca..dc1ae0979 100644 --- a/Essentials/src/com/earth2me/essentials/user/IOfflinePlayer.java +++ b/Essentials/src/net/ess3/user/IOfflinePlayer.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.user; +package net.ess3.user; import org.bukkit.Location; import org.bukkit.permissions.Permission; diff --git a/Essentials/src/net/ess3/user/IOfflineUser.java b/Essentials/src/net/ess3/user/IOfflineUser.java new file mode 100644 index 000000000..60756957c --- /dev/null +++ b/Essentials/src/net/ess3/user/IOfflineUser.java @@ -0,0 +1,9 @@ +package net.ess3.user; + +import net.ess3.storage.IStorageObjectHolder; + + +public interface IOfflineUser extends IStorageObjectHolder<UserData>, IOfflinePlayer +{ + +} diff --git a/Essentials/src/com/earth2me/essentials/user/Inventory.java b/Essentials/src/net/ess3/user/Inventory.java index 16ba39937..621163e33 100644 --- a/Essentials/src/com/earth2me/essentials/user/Inventory.java +++ b/Essentials/src/net/ess3/user/Inventory.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.user; +package net.ess3.user; -import com.earth2me.essentials.storage.MapKeyType; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import net.ess3.storage.MapKeyType; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/net/ess3/user/User.java index bedfd44f2..54f16f1cf 100644 --- a/Essentials/src/com/earth2me/essentials/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -1,14 +1,14 @@ -package com.earth2me.essentials.user; - -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.Teleport; -import com.earth2me.essentials.api.*; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -import com.earth2me.essentials.economy.register.Method; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.Util; +package net.ess3.user; + +import net.ess3.Console; +import static net.ess3.I18n._; +import net.ess3.Teleport; +import net.ess3.api.*; +import net.ess3.craftbukkit.InventoryWorkaround; +import net.ess3.economy.register.Method; +import net.ess3.permissions.Permissions; +import net.ess3.utils.DateUtil; +import net.ess3.utils.Util; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; @@ -205,7 +205,7 @@ public class User extends UserBase implements IUser acquireWriteLock(); try { - getData().setLastLocation(new com.earth2me.essentials.storage.Location(getLocation())); + getData().setLastLocation(new net.ess3.storage.Location(getLocation())); } finally { diff --git a/Essentials/src/com/earth2me/essentials/user/UserBase.java b/Essentials/src/net/ess3/user/UserBase.java index 436a9c76f..73c151b00 100644 --- a/Essentials/src/com/earth2me/essentials/user/UserBase.java +++ b/Essentials/src/net/ess3/user/UserBase.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.user; - -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.api.InvalidNameException; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; -import com.earth2me.essentials.storage.Location.WorldNotLoadedException; +package net.ess3.user; + +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.api.InvalidNameException; +import net.ess3.permissions.Permissions; +import net.ess3.storage.AsyncStorageObjectHolder; +import net.ess3.storage.Location.WorldNotLoadedException; import java.io.File; import java.io.IOException; import java.util.*; @@ -245,13 +245,13 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem acquireWriteLock(); try { - Map<String, com.earth2me.essentials.storage.Location> homes = getData().getHomes(); + Map<String, net.ess3.storage.Location> homes = getData().getHomes(); if (homes == null) { - homes = new HashMap<String, com.earth2me.essentials.storage.Location>(); + homes = new HashMap<String, net.ess3.storage.Location>(); getData().setHomes(homes); } - homes.put(Util.sanitizeKey(name), new com.earth2me.essentials.storage.Location(loc)); + homes.put(Util.sanitizeKey(name), new net.ess3.storage.Location(loc)); } finally { @@ -415,7 +415,7 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem return null; } ArrayList<Location> worldHomes = new ArrayList<Location>(); - for (com.earth2me.essentials.storage.Location location : getData().getHomes().values()) + for (net.ess3.storage.Location location : getData().getHomes().values()) { if (location.getWorldName().equals(loc.getWorld().getName())) { diff --git a/Essentials/src/com/earth2me/essentials/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java index b181a5f24..702fecf03 100644 --- a/Essentials/src/com/earth2me/essentials/user/UserData.java +++ b/Essentials/src/net/ess3/user/UserData.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.user; +package net.ess3.user; -import com.earth2me.essentials.storage.*; +import net.ess3.storage.*; import java.util.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/Essentials/src/com/earth2me/essentials/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java index 96744da1d..a0e6aee44 100644 --- a/Essentials/src/com/earth2me/essentials/user/UserMap.java +++ b/Essentials/src/net/ess3/user/UserMap.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.user; +package net.ess3.user; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.api.IUserMap; -import com.earth2me.essentials.api.InvalidNameException; -import com.earth2me.essentials.storage.StorageObjectMap; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.api.IUserMap; +import net.ess3.api.InvalidNameException; +import net.ess3.storage.StorageObjectMap; import java.io.File; import java.util.Locale; import java.util.Set; diff --git a/Essentials/src/com/earth2me/essentials/utils/DateUtil.java b/Essentials/src/net/ess3/utils/DateUtil.java index 3f925e6b5..02916139c 100644 --- a/Essentials/src/com/earth2me/essentials/utils/DateUtil.java +++ b/Essentials/src/net/ess3/utils/DateUtil.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.utils; +package net.ess3.utils; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.regex.Matcher; diff --git a/Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java b/Essentials/src/net/ess3/utils/DescParseTickFormat.java index e553bc80c..bf7d95c23 100644 --- a/Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java +++ b/Essentials/src/net/ess3/utils/DescParseTickFormat.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.utils; +package net.ess3.utils; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import java.text.SimpleDateFormat; import java.util.*; diff --git a/Essentials/src/com/earth2me/essentials/utils/ExecuteTimer.java b/Essentials/src/net/ess3/utils/ExecuteTimer.java index 9c8d71992..2f0c7a5f6 100644 --- a/Essentials/src/com/earth2me/essentials/utils/ExecuteTimer.java +++ b/Essentials/src/net/ess3/utils/ExecuteTimer.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils; +package net.ess3.utils; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java index 49b256417..61cdcec6e 100644 --- a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java +++ b/Essentials/src/net/ess3/utils/LocationUtil.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.utils; +package net.ess3.utils; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import java.util.HashSet; import java.util.Set; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java index fbfed3f67..8121f8ff8 100644 --- a/Essentials/src/com/earth2me/essentials/utils/Util.java +++ b/Essentials/src/net/ess3/utils/Util.java @@ -1,27 +1,22 @@ -package com.earth2me.essentials.utils; +package net.ess3.utils; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.api.InvalidNameException; -import com.earth2me.essentials.utils.gnu.inet.encoding.Punycode; -import com.earth2me.essentials.utils.gnu.inet.encoding.PunycodeException; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.gnu.inet.encoding.Punycode; +import net.ess3.utils.gnu.inet.encoding.PunycodeException; import de.bananaco.bpermissions.imp.Permissions; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Collection; -import java.util.HashSet; import java.util.Locale; -import java.util.Set; import java.util.regex.Pattern; import lombok.Cleanup; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/Punycode.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java index fdca948f6..8d8aa3750 100644 --- a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/Punycode.java +++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils.gnu.inet.encoding; +package net.ess3.utils.gnu.inet.encoding; /** diff --git a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/PunycodeException.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java index 9db00d10d..1f9649813 100644 --- a/Essentials/src/com/earth2me/essentials/utils/gnu/inet/encoding/PunycodeException.java +++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils.gnu.inet.encoding; +package net.ess3.utils.gnu.inet.encoding; /** diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/ArrayListInput.java b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java index 5943387a5..4f3a915f2 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/ArrayListInput.java +++ b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; import java.util.ArrayList; import java.util.Collections; diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java index cb3be1be4..109cc3702 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.permissions.HelpPermissions; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.HelpPermissions; import java.io.IOException; import java.util.*; import java.util.logging.Level; diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/IText.java b/Essentials/src/net/ess3/utils/textreader/IText.java index c70554b28..89e5de19f 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/IText.java +++ b/Essentials/src/net/ess3/utils/textreader/IText.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; import java.util.List; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java index b9c67fa77..3ec331d7a 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; -import com.earth2me.essentials.utils.DescParseTickFormat; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; +import net.ess3.utils.DescParseTickFormat; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextInput.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java index 4a94126d3..8d392448e 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; import java.util.ArrayList; import java.util.Collections; diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextPager.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java index 3c9e9cb55..ea70010b6 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/SimpleTextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java index 570feaa36..20fecc255 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; -import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.api.InvalidNameException; +import net.ess3.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.api.InvalidNameException; import java.io.*; import java.lang.ref.SoftReference; import java.util.*; diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java index cac760441..18b662be5 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/TextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java @@ -1,10 +1,11 @@ -package com.earth2me.essentials.utils.textreader; +package net.ess3.utils.textreader; -import com.earth2me.essentials.I18n; -import static com.earth2me.essentials.I18n._; +import net.ess3.I18n; +import static net.ess3.I18n._; import java.util.List; import java.util.Locale; import java.util.Map; + import org.bukkit.command.CommandSender; diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 0f203b705..76d930a5c 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: Essentials-3 -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/net/ess3/EconomyTest.java index 44d388c3b..978f35fc6 100644 --- a/Essentials/test/com/earth2me/essentials/EconomyTest.java +++ b/Essentials/test/net/ess3/EconomyTest.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials; +package net.ess3; -import com.earth2me.essentials.api.NoLoanPermittedException; -import com.earth2me.essentials.api.UserDoesNotExistException; -import com.earth2me.essentials.user.User; +import net.ess3.api.NoLoanPermittedException; +import net.ess3.api.UserDoesNotExistException; +import net.ess3.user.User; import java.io.IOException; import junit.framework.TestCase; import org.bukkit.World.Environment; diff --git a/Essentials/test/com/earth2me/essentials/FakeOfflinePlayer.java b/Essentials/test/net/ess3/FakeOfflinePlayer.java index 01dd470ca..de1f9064e 100644 --- a/Essentials/test/com/earth2me/essentials/FakeOfflinePlayer.java +++ b/Essentials/test/net/ess3/FakeOfflinePlayer.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package net.ess3; import java.util.Map; import org.bukkit.Bukkit; diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/net/ess3/FakeServer.java index 552c0c419..26437ddc0 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/net/ess3/FakeServer.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package net.ess3; import com.avaje.ebean.config.ServerConfig; import java.io.File; diff --git a/Essentials/test/com/earth2me/essentials/FakeWorld.java b/Essentials/test/net/ess3/FakeWorld.java index c389a3f37..fb617d98b 100644 --- a/Essentials/test/com/earth2me/essentials/FakeWorld.java +++ b/Essentials/test/net/ess3/FakeWorld.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package net.ess3; import java.io.File; import java.util.Collection; diff --git a/Essentials/test/com/earth2me/essentials/StorageTest.java b/Essentials/test/net/ess3/StorageTest.java index 5a5e12250..429844e76 100644 --- a/Essentials/test/com/earth2me/essentials/StorageTest.java +++ b/Essentials/test/net/ess3/StorageTest.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials; +package net.ess3; -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; @@ -90,16 +90,16 @@ public class StorageTest extends TestCase 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.Location(new Location(world, j, j, j))); + userdata.getHomes().put("home", new net.ess3.storage.Location(new Location(world, j, j, j))); } ext.mark("change home 10000 times"); final ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -117,11 +117,11 @@ public class StorageTest extends TestCase 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/net/ess3/UserTest.java index 6cffcb4f3..e834e0175 100644 --- a/Essentials/test/com/earth2me/essentials/UserTest.java +++ b/Essentials/test/net/ess3/UserTest.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials; +package net.ess3; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.user.User; +import net.ess3.api.IUser; +import net.ess3.user.User; import java.io.IOException; import junit.framework.TestCase; import org.bukkit.World.Environment; diff --git a/Essentials/test/com/earth2me/essentials/UtilTest.java b/Essentials/test/net/ess3/UtilTest.java index 94cd2877d..6ab863fc2 100644 --- a/Essentials/test/com/earth2me/essentials/UtilTest.java +++ b/Essentials/test/net/ess3/UtilTest.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials; +package net.ess3; -import com.earth2me.essentials.api.InvalidNameException; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.Util; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.DateUtil; +import net.ess3.utils.Util; import java.io.IOException; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/Essentials2Compat/src/com/earth2me/essentials/api/Economy.java b/Essentials2Compat/src/com/earth2me/essentials/Economy.java index 663c451c6..bf1c9a61d 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/api/Economy.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Economy.java @@ -1,6 +1,9 @@ -package com.earth2me.essentials.api; +package com.earth2me.essentials; -import com.earth2me.essentials.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.NoLoanPermittedException; +import net.ess3.api.UserDoesNotExistException; +import net.ess3.utils.Util; /** @@ -19,7 +22,7 @@ public final class Economy * * @param name Name of the user * @return balance - * @throws UserDoesNotExistException + * @throws net.ess3.api.UserDoesNotExistException */ public static double getMoney(String name) throws UserDoesNotExistException { @@ -36,7 +39,7 @@ public final class Economy * @param name Name of the user * @param balance The balance you want to set * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance + * @throws net.ess3.api.NoLoanPermittedException If the user is not allowed to have a negative balance */ public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException { diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java index 0dc36e262..cbc51eddd 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 com.google.common.io.Files; import java.io.*; import java.nio.ByteBuffer; diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java index d912caf7e..cbc6f5982 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.Location; -import com.earth2me.essentials.storage.YamlStorageWriter; +import net.ess3.economy.WorthHolder; +import net.ess3.Warps; +import net.ess3.storage.ManagedFile; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.settings.Spawns; +import net.ess3.storage.Location; +import net.ess3.storage.YamlStorageWriter; import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; @@ -658,7 +659,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 5610b82a4..bc721f650 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/net/ess3/chat/ChatPermissions.java index 43142915f..888b85f9d 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java +++ b/EssentialsChat/src/net/ess3/chat/ChatPermissions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.chat; +package net.ess3.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/net/ess3/chat/ChatStore.java index f01ada07b..4d696fb36 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java +++ b/EssentialsChat/src/net/ess3/chat/ChatStore.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.chat; +package net.ess3.chat; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class ChatStore diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java index 1ff0d6f41..4c922c45f 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.chat; +package net.ess3.chat; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerHighest; -import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerLowest; -import com.earth2me.essentials.chat.listenerlevel.EssentialsChatPlayerListenerNormal; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerHighest; +import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerLowest; +import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerNormal; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; @@ -22,7 +22,7 @@ public class EssentialsChat extends JavaPlugin public void onEnable() { final PluginManager pluginManager = getServer().getPluginManager(); - final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials3"); + final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials-3"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { LOGGER.log(Level.WARNING, _("versionMismatchAll")); diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java index fcd9d7e01..ae8fce4a1 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java @@ -1,14 +1,14 @@ -package com.earth2me.essentials.chat; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -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.economy.Trade; -import com.earth2me.essentials.permissions.Permissions; -import com.earth2me.essentials.utils.Util; +package net.ess3.chat; + +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IRanks; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; import java.util.Locale; import java.util.Map; import java.util.logging.Logger; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEvent.java index 4ca1a4496..e0ce6602d 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEvent.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.chat; +package net.ess3.chat; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java index db596b15f..29bd7e8e8 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.chat; +package net.ess3.chat; -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 org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java index 576c93e6f..21f3a188e 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java @@ -1,8 +1,9 @@ -package com.earth2me.essentials.chat.listenerlevel; +package net.ess3.chat.listenerlevel; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.chat.ChatStore; -import com.earth2me.essentials.chat.EssentialsChatPlayer; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; import java.util.Map; import org.bukkit.Server; import org.bukkit.event.EventHandler; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java index 3fcff995c..eb75e3680 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java @@ -1,10 +1,12 @@ -package com.earth2me.essentials.chat.listenerlevel; +package net.ess3.chat.listenerlevel; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.chat.ChatStore; -import com.earth2me.essentials.chat.EssentialsChatPlayer; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; import java.util.Map; + +import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java index c456b700d..2e3b44549 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.chat.listenerlevel; +package net.ess3.chat.listenerlevel; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.chat.ChatStore; -import com.earth2me.essentials.chat.EssentialsChatPlayer; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; import java.util.Map; import org.bukkit.Server; import org.bukkit.event.EventHandler; diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml index 0d54428e3..6e314cbbb 100644 --- a/EssentialsChat/src/plugin.yml +++ b/EssentialsChat/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsChat -main: com.earth2me.essentials.chat.EssentialsChat +main: net.ess3.chat.EssentialsChat # 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/EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java index 183c591ab..068a1ba45 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/ConfigHolder.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.geoip; +package net.ess3.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/net/ess3/geoip/EssentialsGeoIP.java index 43b4959da..9767f213b 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIP.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.geoip; +package net.ess3.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; @@ -13,7 +13,7 @@ public class EssentialsGeoIP extends JavaPlugin public void onEnable() { final PluginManager pm = getServer().getPluginManager(); - final IEssentials ess = (IEssentials)pm.getPlugin("Essentials3"); + final IEssentials ess = (IEssentials)pm.getPlugin("Essentials-3"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { getLogger().log(Level.WARNING, _("versionMismatchAll")); diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java index 158457155..a6bbeffec 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.geoip; +package net.ess3.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/EssentialsGeoIP/src/plugin.yml b/EssentialsGeoIP/src/plugin.yml index bcc2aa313..709e6d92b 100644 --- a/EssentialsGeoIP/src/plugin.yml +++ b/EssentialsGeoIP/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsGeoIP -main: com.earth2me.essentials.geoip.EssentialsGeoIP +main: net.ess3.geoip.EssentialsGeoIP # 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/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java deleted file mode 100644 index feeeb19df..000000000 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.earth2me.essentials.protect; - - -/*public enum ProtectConfig -{ - datatype("protect.datatype", "sqlite"), - mysqlDB("protect.mysqlDb", "jdbc:mysql://localhost:3306/minecraft"), - dbUsername("protect.username", "root"), - dbPassword("protect.password", ""), - memstore("protect.memstore", false), - disable_contactdmg("protect.disable.contactdmg", false), - disable_lavadmg("protect.disable.lavadmg", false), - disable_build("protect.disable.build", true), - disable_use("protect.disable.use", true), - disable_pvp("protect.disable.pvp", false), - disable_projectiles("protect.disable.projectiles", false), - disable_fall("protect.disable.fall", false), - disable_suffocate("protect.disable.suffocate", false), - disable_firedmg("protect.disable.firedmg", false), - disable_lightning("protect.disable.lightning", false), - disable_drown("protect.disable.drown", false), - disable_weather_storm("protect.disable.weather.storm", false), - disable_weather_lightning("protect.disable.weather.lightning", false), - disable_weather_thunder("protect.disable.weather.thunder", false), - prevent_fire_spread("protect.prevent.fire-spread", true), - prevent_flint_fire("protect.prevent.flint-fire", false), - prevent_lava_fire_spread("protect.prevent.lava-fire-spread", true), - prevent_lightning_fire_spread("protect.prevent.lightning-fire-spread", true), - prevent_water_flow("protect.prevent.water-flow", false), - prevent_lava_flow("protect.prevent.lava-flow", false), - prevent_water_bucket_flow("protect.prevent.water-bucket-flow", false), - prevent_portal_creation("protect.prevent.portal-creation", false), - prevent_block_on_rail("protect.protect.prevent-block-on-rails", false), - prevent_tnt_explosion("protect.prevent.tnt-explosion", false), - prevent_tnt_playerdmg("protect.prevent.tnt-playerdamage", false), - prevent_fireball_explosion("protect.prevent.fireball-explosion", false), - prevent_fireball_fire("protect.prevent.fireball-fire", false), - prevent_fireball_playerdmg("protect.prevent.fireball-playerdamage", false), - prevent_creeper_explosion("protect.prevent.creeper-explosion", true), - prevent_creeper_playerdmg("protect.prevent.creeper-playerdamage", false), - prevent_creeper_blockdmg("protect.prevent.creeper-blockdamage", false), - prevent_enderman_pickup("protect.prevent.enderman-pickup", false), - prevent_villager_death("protect.prevent.villager-death", false), - prevent_enderdragon_blockdmg("protect.prevent.enderdragon-blockdamage", true), - prevent_entitytarget("protect.prevent.entitytarget", false), - protect_rails("protect.protect.rails", true), - protect_below_rails("protect.protect.block-below", true), - protect_signs("protect.protect.signs", true), - protect_against_signs("protect.protect.block-below", true), - enderdragon_fakeexplosions("protect.enderdragon-fakeexplosions", false), - alert_on_placement("protect.alert.on-placement"), - alert_on_use("protect.alert.on-use"), - alert_on_break("protect.alert.on-break"), - blacklist_placement("protect.blacklist.placement"), - blacklist_usage("protect.blacklist.usage"), - blacklist_break("protect.blacklist.break"), - blacklist_piston("protect.blacklist.piston"); - private final String configName; - private final String defValueString; - private final boolean defValueBoolean; - private final boolean isList; - private final boolean isString; - - private ProtectConfig(final String configName) - { - this(configName, null, false, true, false); - } - - private ProtectConfig(final String configName, final String defValueString) - { - this(configName, defValueString, false, false, true); - } - - private ProtectConfig(final String configName, final boolean defValueBoolean) - { - this(configName, null, defValueBoolean, false, false); - } - - private ProtectConfig(final String configName, final String defValueString, final boolean defValueBoolean, final boolean isList, final boolean isString) - { - this.configName = configName; - this.defValueString = defValueString; - this.defValueBoolean = defValueBoolean; - this.isList = isList; - this.isString = isString; - } - - /** - * @return the configName - *//* - public String getConfigName() - { - return configName; - } - - /** - * @return the default value String - *//* - public String getDefaultValueString() - { - return defValueString; - } - - /** - * @return the default value boolean - *//* - public boolean getDefaultValueBoolean() - { - return defValueBoolean; - } - - public boolean isString() - { - return isString; - } - - public boolean isList() - { - return isList; - } -}*/ diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java b/EssentialsProtect/src/net/ess3/protect/BlockBreakPermissions.java index 05a376a03..1a07588e8 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockBreakPermissions.java +++ b/EssentialsProtect/src/net/ess3/protect/BlockBreakPermissions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.permissions.AbstractSuperpermsPermission; +import net.ess3.api.IPermission; +import net.ess3.permissions.AbstractSuperpermsPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java b/EssentialsProtect/src/net/ess3/protect/BlockPlacePermissions.java index e7a4c29c5..87e771e73 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/BlockPlacePermissions.java +++ b/EssentialsProtect/src/net/ess3/protect/BlockPlacePermissions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.permissions.AbstractSuperpermsPermission; +import net.ess3.api.IPermission; +import net.ess3.permissions.AbstractSuperpermsPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java b/EssentialsProtect/src/net/ess3/protect/EmergencyListener.java index 5f9253c55..2d70ee698 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EmergencyListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java index ceb425e6a..c3fcfe441 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IReload; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.protect.data.ProtectedBlockMySQL; -import com.earth2me.essentials.protect.data.ProtectedBlockSQLite; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IReload; +import net.ess3.api.IUser; +import net.ess3.protect.data.ProtectedBlockMySQL; +import net.ess3.protect.data.ProtectedBlockSQLite; import java.beans.PropertyVetoException; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java index fa3fff70d..9f1e58e10 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java @@ -1,10 +1,11 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import com.earth2me.essentials.protect.data.IProtectedBlock; +import net.ess3.protect.data.IProtectedBlock; import java.util.logging.Filter; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; + import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; @@ -40,7 +41,7 @@ public class EssentialsProtect extends JavaPlugin implements IProtect public void onEnable() { final PluginManager pm = this.getServer().getPluginManager(); - final Plugin essPlugin = pm.getPlugin("Essentials3"); + final Plugin essPlugin = pm.getPlugin("Essentials-3"); if (essPlugin == null || !essPlugin.isEnabled()) { enableEmergencyMode(pm); diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java index 89dcc71cb..ecfee8e20 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java @@ -1,9 +1,10 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.protect.data.IProtectedBlock; +import static net.ess3.I18n._; +import net.ess3.protect.data.IProtectedBlock; import java.util.ArrayList; import java.util.List; + import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java index 8966b5336..67df5c8c5 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectPlayerListener.java index 9b870d383..64e4a529b 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectPlayerListener.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import static com.earth2me.essentials.I18n._; +import static net.ess3.I18n._; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java index babebac71..6f08bdd13 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java b/EssentialsProtect/src/net/ess3/protect/IProtect.java index d25661bf8..df2a454a0 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java +++ b/EssentialsProtect/src/net/ess3/protect/IProtect.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import com.earth2me.essentials.protect.data.IProtectedBlock; +import net.ess3.protect.data.IProtectedBlock; import org.bukkit.plugin.Plugin; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java b/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java index c4cfd617d..d9ecf9bc0 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ItemUsePermissions.java +++ b/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.permissions.AbstractSuperpermsPermission; +import net.ess3.api.IPermission; +import net.ess3.permissions.AbstractSuperpermsPermission; import java.util.EnumMap; import java.util.Locale; import java.util.Map; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java index edd9a1d40..37042618b 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/Permissions.java +++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import com.earth2me.essentials.api.IPermission; -import com.earth2me.essentials.utils.Util; +import net.ess3.api.IPermission; +import net.ess3.utils.Util; import java.util.Locale; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java index 626f82dd5..145a5e97e 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java +++ b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.protect; +package net.ess3.protect; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.settings.protect.Protect; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import net.ess3.api.IEssentials; +import net.ess3.settings.protect.Protect; +import net.ess3.storage.AsyncStorageObjectHolder; import java.io.File; import java.io.IOException; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java b/EssentialsProtect/src/net/ess3/protect/data/IProtectedBlock.java index 755baface..a27adfb3c 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java +++ b/EssentialsProtect/src/net/ess3/protect/data/IProtectedBlock.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect.data; +package net.ess3.protect.data; import java.util.List; import org.bukkit.block.Block; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java b/EssentialsProtect/src/net/ess3/protect/data/OwnedBlock.java index dc28feae8..cac1826e9 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java +++ b/EssentialsProtect/src/net/ess3/protect/data/OwnedBlock.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect.data; +package net.ess3.protect.data; public class OwnedBlock diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockJDBC.java index 53d5de945..70475c6f5 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java +++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockJDBC.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect.data; +package net.ess3.protect.data; import com.mchange.v2.c3p0.ComboPooledDataSource; import java.beans.PropertyVetoException; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMemory.java index 7b38d54eb..10c825154 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java +++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMemory.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect.data; +package net.ess3.protect.data; import java.util.*; import java.util.Map.Entry; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMySQL.java index 39070c30c..9fd17d0a7 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java +++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockMySQL.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect.data; +package net.ess3.protect.data; import java.beans.PropertyVetoException; import java.sql.Connection; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockSQLite.java index 464c620fe..65dbac213 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java +++ b/EssentialsProtect/src/net/ess3/protect/data/ProtectedBlockSQLite.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect.data; +package net.ess3.protect.data; import java.beans.PropertyVetoException; import java.sql.Connection; diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml index b11803595..1510a4fa1 100644 --- a/EssentialsProtect/src/plugin.yml +++ b/EssentialsProtect/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsProtect -main: com.earth2me.essentials.protect.EssentialsProtect +main: net.ess3.protect.EssentialsProtect # Note to developers: This next line cannot change, or the automatic versioning system will break. version: ${build.number} website: http://tiny.cc/EssentialsWiki diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 8f8a4814a..272f14252 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/EssentialsSignsPlugin.java index 97146439e..d2f615d52 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.signs; +package net.ess3.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; @@ -18,7 +18,7 @@ public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin public void onEnable() { final PluginManager pluginManager = getServer().getPluginManager(); - final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials3"); + final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials-3"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { LOGGER.log(Level.WARNING, _("versionMismatchAll")); diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/ISignsPlugin.java index 2847ef87e..9a6d14a61 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/ISignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/ISignsPlugin.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import com.earth2me.essentials.api.IEssentialsModule; +import net.ess3.api.IEssentialsModule; public interface ISignsPlugin extends IEssentialsModule diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java b/EssentialsSigns/src/net/ess3/signs/SignBalance.java index cb8e568aa..35a1648ae 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBalance.java +++ b/EssentialsSigns/src/net/ess3/signs/SignBalance.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.Util; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.utils.Util; public class SignBalance extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/SignBlockListener.java index 80e603394..31cdfc970 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/EssentialsSigns/src/net/ess3/signs/SignBlockListener.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.ISettings; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.Util; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.utils.Util; 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/net/ess3/signs/SignBuy.java index dcb0ec857..ff08cdbc1 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/net/ess3/signs/SignBuy.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class SignBuy extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java b/EssentialsSigns/src/net/ess3/signs/SignDisposal.java index 056c79e67..01775e18c 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignDisposal.java +++ b/EssentialsSigns/src/net/ess3/signs/SignDisposal.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/SignEnchant.java index 222a04909..6004d9f38 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java +++ b/EssentialsSigns/src/net/ess3/signs/SignEnchant.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.bukkit.Enchantments; -import com.earth2me.essentials.economy.Trade; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.bukkit.Enchantments; +import net.ess3.economy.Trade; 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/net/ess3/signs/SignEntityListener.java index 789f9ba1f..1c316478d 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java +++ b/EssentialsSigns/src/net/ess3/signs/SignEntityListener.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/SignException.java b/EssentialsSigns/src/net/ess3/signs/SignException.java index 9c9ab44a2..7ca73e4e5 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignException.java +++ b/EssentialsSigns/src/net/ess3/signs/SignException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; public class SignException extends Exception diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java b/EssentialsSigns/src/net/ess3/signs/SignFree.java index b5fc54e40..2cf049346 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java +++ b/EssentialsSigns/src/net/ess3/signs/SignFree.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -import com.earth2me.essentials.economy.Trade; +import static net.ess3.I18n._; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; +import net.ess3.economy.Trade; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java b/EssentialsSigns/src/net/ess3/signs/SignGameMode.java index d9fdd2872..a8ef5a881 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java +++ b/EssentialsSigns/src/net/ess3/signs/SignGameMode.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; import java.util.Locale; import org.bukkit.GameMode; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java b/EssentialsSigns/src/net/ess3/signs/SignHeal.java index 2da09e521..787e7b166 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java +++ b/EssentialsSigns/src/net/ess3/signs/SignHeal.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class SignHeal extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java b/EssentialsSigns/src/net/ess3/signs/SignKit.java index 9ddce494f..9c478ccad 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java +++ b/EssentialsSigns/src/net/ess3/signs/SignKit.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/SignMail.java index 7845c86a6..6acf14bb1 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignMail.java +++ b/EssentialsSigns/src/net/ess3/signs/SignMail.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/SignPlayerListener.java index 9d597820f..eabf5423b 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java +++ b/EssentialsSigns/src/net/ess3/signs/SignPlayerListener.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/SignProtection.java index 3921ffc5e..e87002fd4 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java +++ b/EssentialsSigns/src/net/ess3/signs/SignProtection.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.signs; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.utils.Util; +package net.ess3.signs; + +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.utils.Util; 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/net/ess3/signs/SignSell.java index ced0e01fa..9a48e4948 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java +++ b/EssentialsSigns/src/net/ess3/signs/SignSell.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class SignSell extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/net/ess3/signs/SignSpawnmob.java index e581c8516..47961a96e 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/net/ess3/signs/SignSpawnmob.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.commands.Commandspawnmob; -import com.earth2me.essentials.economy.Trade; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.commands.Commandspawnmob; +import net.ess3.economy.Trade; public class SignSpawnmob extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java b/EssentialsSigns/src/net/ess3/signs/SignTime.java index d09b88d70..8ef98a4d5 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java +++ b/EssentialsSigns/src/net/ess3/signs/SignTime.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class SignTime extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/SignTrade.java index 0dcb58c95..c3e78e226 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java +++ b/EssentialsSigns/src/net/ess3/signs/SignTrade.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/SignWarp.java index 12deb86de..b6dc95d0f 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java +++ b/EssentialsSigns/src/net/ess3/signs/SignWarp.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; -import com.earth2me.essentials.permissions.WarpPermissions; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +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/net/ess3/signs/SignWeather.java index 70b5d0079..94217aeec 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java +++ b/EssentialsSigns/src/net/ess3/signs/SignWeather.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.economy.Trade; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class SignWeather extends EssentialsSign diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/Signs.java b/EssentialsSigns/src/net/ess3/signs/Signs.java index e29d45ad4..af4111dac 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/Signs.java +++ b/EssentialsSigns/src/net/ess3/signs/Signs.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.signs; +package net.ess3.signs; public enum Signs diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java b/EssentialsSigns/src/net/ess3/signs/SignsConfig.java index c9b4ccc83..70b606962 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfig.java +++ b/EssentialsSigns/src/net/ess3/signs/SignsConfig.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/SignsConfigHolder.java index 4ebbb1260..395d0194a 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsConfigHolder.java +++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/net/ess3/signs/SignsPermissions.java index eb8025f5b..21c736b7d 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignsPermissions.java +++ b/EssentialsSigns/src/net/ess3/signs/SignsPermissions.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.signs; +package net.ess3.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/EssentialsSigns/src/plugin.yml b/EssentialsSigns/src/plugin.yml index ef71c54ef..a58338c86 100644 --- a/EssentialsSigns/src/plugin.yml +++ b/EssentialsSigns/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsSigns -main: com.earth2me.essentials.signs.EssentialsSignsPlugin +main: net.ess3.signs.EssentialsSignsPlugin # 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/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/Task.java b/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/Task.java deleted file mode 100644 index 3f1d572ed..000000000 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/Task.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.earth2me.essentials.update.tasks; - - -public interface Task -{ - void start(); -} diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java index d2cbb8a64..7a927d4db 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java +++ b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import org.bukkit.plugin.Plugin; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java index 7dd46451a..0d433ecc0 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java +++ b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.update; +package net.ess3.update; -import com.earth2me.essentials.update.chat.*; +import net.ess3.update.chat.*; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java index 0a3143a72..33875423a 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.util.logging.Level; import org.bukkit.Bukkit; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java b/EssentialsUpdate/src/net/ess3/update/GetFile.java index 06b414e93..9636e3bd1 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java +++ b/EssentialsUpdate/src/net/ess3/update/GetFile.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.io.*; import java.math.BigInteger; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/ModuleInfo.java b/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java index 722fca3e1..993575cbf 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/ModuleInfo.java +++ b/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.net.MalformedURLException; import java.net.URL; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/PastieUpload.java b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java index 489c2163d..9fba2351d 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/PastieUpload.java +++ b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.io.IOException; import java.net.MalformedURLException; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/PostToUrl.java b/EssentialsUpdate/src/net/ess3/update/PostToUrl.java index c8978961b..28fc13c55 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/PostToUrl.java +++ b/EssentialsUpdate/src/net/ess3/update/PostToUrl.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.io.BufferedReader; import java.io.IOException; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java index 1f69ebde1..98a9983e8 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.io.File; import java.util.Map; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java index 0659f7dbb..cdab65600 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.io.BufferedInputStream; import java.io.File; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java index 3a8139840..f96cdd18f 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.update; +package net.ess3.update; -import com.earth2me.essentials.update.states.InstallationFinishedEvent; -import com.earth2me.essentials.update.states.StateMachine; -import com.earth2me.essentials.update.tasks.SelfUpdate; +import net.ess3.update.states.InstallationFinishedEvent; +import net.ess3.update.states.StateMachine; +import net.ess3.update.tasks.SelfUpdate; import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java b/EssentialsUpdate/src/net/ess3/update/Version.java index a82f49abf..84f62b6c8 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java +++ b/EssentialsUpdate/src/net/ess3/update/Version.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java b/EssentialsUpdate/src/net/ess3/update/VersionInfo.java index c06aa2e64..afbe87de8 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java +++ b/EssentialsUpdate/src/net/ess3/update/VersionInfo.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update; +package net.ess3.update; import java.util.Collections; import java.util.HashMap; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java index 7c99d28f6..2e6d44f20 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java @@ -1,8 +1,10 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; -import com.earth2me.essentials.update.PastieUpload; +import net.ess3.update.PastieUpload; import java.io.*; import java.nio.charset.Charset; + +import net.ess3.update.PastieUpload; import org.bukkit.plugin.Plugin; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/Command.java b/EssentialsUpdate/src/net/ess3/update/chat/Command.java index ad4c75e43..1e7e94e1c 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/Command.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/Command.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import org.bukkit.entity.Player; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/ConfigCommand.java index 78563a950..913294b01 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/ConfigCommand.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import java.io.BufferedReader; import java.io.IOException; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ErrorsCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java index 41aa551c4..6e3c29924 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ErrorsCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import java.io.BufferedReader; import java.io.IOException; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/HelpCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/HelpCommand.java index a6f76cece..1e82953f0 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/HelpCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/HelpCommand.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import org.bukkit.entity.Player; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/IrcBot.java b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java index c2cc209e6..10ce9ad8a 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/IrcBot.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import java.io.IOException; import java.util.logging.Level; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ListCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/ListCommand.java index 9aa932efa..218b6631b 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ListCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/ListCommand.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import org.bukkit.entity.Player; import org.jibble.pircbot.User; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/StartupCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java index f244d6e3a..978da60c2 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/StartupCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import java.io.BufferedReader; import java.io.IOException; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java b/EssentialsUpdate/src/net/ess3/update/chat/UsernameUtil.java index 2fd9a38b6..e9dfdf728 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/UsernameUtil.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.chat; +package net.ess3.update.chat; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java index 9d3279439..5d4e03a2c 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java @@ -1,6 +1,7 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; -import com.earth2me.essentials.update.AbstractWorkListener; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.AbstractWorkListener; import org.bukkit.entity.Player; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractYesNoState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java index 67baf6bb6..3ee7d0ee2 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractYesNoState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; public abstract class AbstractYesNoState extends AbstractState diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AdvancedMode.java b/EssentialsUpdate/src/net/ess3/update/states/AdvancedMode.java index 88d9efc4a..8ddf06eeb 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AdvancedMode.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AdvancedMode.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; import org.bukkit.entity.Player; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java index 10a4f33c5..42fdc8ca2 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java +++ b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; -import com.earth2me.essentials.update.UpdateCheck; -import com.earth2me.essentials.update.VersionInfo; +import net.ess3.update.UpdateCheck; +import net.ess3.update.VersionInfo; import java.util.List; import org.bukkit.entity.Player; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChat.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java index 7253f0d80..a62735f5e 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChat.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; -import com.earth2me.essentials.update.AbstractWorkListener; -import com.earth2me.essentials.update.tasks.InstallModule; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChatSettings.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChatSettings.java index bb53bc86b..db3202ab3 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChatSettings.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChatSettings.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; import org.bukkit.entity.Player; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsGeoIP.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java index 6924a5445..cd1865b42 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsGeoIP.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java @@ -1,7 +1,8 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; -import com.earth2me.essentials.update.AbstractWorkListener; -import com.earth2me.essentials.update.tasks.InstallModule; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; +import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsProtect.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java index 925d28315..bb3a841a7 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsProtect.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java @@ -1,7 +1,8 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; -import com.earth2me.essentials.update.AbstractWorkListener; -import com.earth2me.essentials.update.tasks.InstallModule; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; +import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java b/EssentialsUpdate/src/net/ess3/update/states/InstallationFinishedEvent.java index 4c3fd8f0a..5c38db7ee 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java +++ b/EssentialsUpdate/src/net/ess3/update/states/InstallationFinishedEvent.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java index 6ce926f92..b66ca4c58 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java @@ -1,8 +1,10 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; -import com.earth2me.essentials.update.AbstractWorkListener; -import com.earth2me.essentials.update.UpdateCheck; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.UpdateCheck; import java.util.Iterator; + +import net.ess3.update.UpdateCheck; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java b/EssentialsUpdate/src/net/ess3/update/states/StateMap.java index cca4223d6..397ef7c81 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMap.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; import java.util.LinkedHashMap; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java index 6b48f90be..c7bd5127a 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java +++ b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java @@ -1,6 +1,7 @@ -package com.earth2me.essentials.update.states; +package net.ess3.update.states; -import com.earth2me.essentials.update.UpdateCheck; +import net.ess3.update.UpdateCheck; +import net.ess3.update.UpdateCheck; import org.bukkit.entity.Player; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java index 778f5172f..1f7742026 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java @@ -1,12 +1,16 @@ -package com.earth2me.essentials.update.tasks; +package net.ess3.update.tasks; -import com.earth2me.essentials.update.AbstractWorkListener; -import com.earth2me.essentials.update.GetFile; -import com.earth2me.essentials.update.ModuleInfo; -import com.earth2me.essentials.update.VersionInfo; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.GetFile; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.GetFile; +import net.ess3.update.ModuleInfo; +import net.ess3.update.VersionInfo; import java.io.File; import java.net.URL; import java.util.logging.Level; + +import net.ess3.update.VersionInfo; import org.bukkit.Bukkit; diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java index 3baf86be7..bc0d65b5e 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java @@ -1,6 +1,7 @@ -package com.earth2me.essentials.update.tasks; +package net.ess3.update.tasks; -import com.earth2me.essentials.update.AbstractWorkListener; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/Task.java b/EssentialsUpdate/src/net/ess3/update/tasks/Task.java new file mode 100644 index 000000000..0dc421446 --- /dev/null +++ b/EssentialsUpdate/src/net/ess3/update/tasks/Task.java @@ -0,0 +1,7 @@ +package net.ess3.update.tasks; + + +public interface Task +{ + void start(); +} diff --git a/EssentialsUpdate/src/plugin.yml b/EssentialsUpdate/src/plugin.yml index 4e7700711..c2811ad63 100644 --- a/EssentialsUpdate/src/plugin.yml +++ b/EssentialsUpdate/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsUpdate -main: com.earth2me.essentials.update.EssentialsUpdate +main: net.ess3.update.EssentialsUpdate # Note to developers: This next line cannot change, or the automatic versioning system will break. version: ${build.number} description: This plugin allows to install or update all Essentials plugins diff --git a/EssentialsUpdate/test/com/earth2me/essentials/update/UploadTest.java b/EssentialsUpdate/test/com/ess3/update/UploadTest.java index a51f03bd7..4b26e644a 100644 --- a/EssentialsUpdate/test/com/earth2me/essentials/update/UploadTest.java +++ b/EssentialsUpdate/test/com/ess3/update/UploadTest.java @@ -1,9 +1,10 @@ -package com.earth2me.essentials.update; +package com.ess3.update; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; import junit.framework.TestCase; +import net.ess3.update.PastieUpload; import org.junit.Test; diff --git a/EssentialsUpdate/test/com/earth2me/essentials/update/VersionTest.java b/EssentialsUpdate/test/com/ess3/update/VersionTest.java index d77e53542..af35dc2dd 100644 --- a/EssentialsUpdate/test/com/earth2me/essentials/update/VersionTest.java +++ b/EssentialsUpdate/test/com/ess3/update/VersionTest.java @@ -1,8 +1,9 @@ -package com.earth2me.essentials.update; +package com.ess3.update; -import com.earth2me.essentials.update.Version.Type; +import net.ess3.update.Version.Type; import java.util.TreeSet; import junit.framework.TestCase; +import net.ess3.update.Version; import org.junit.Test; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandsetxmpp.java index 4fe9283df..57bee3b58 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandsetxmpp.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.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/net/ess3/xmpp/Commandxmpp.java index 23bd34170..854a91d96 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; -import com.earth2me.essentials.Console; -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; +import net.ess3.Console; +import net.ess3.commands.EssentialsCommand; +import net.ess3.commands.NotEnoughArgumentsException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java index 0a82d31dd..0c59910f4 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; -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/net/ess3/xmpp/EssentialsXMPP.java index 8514d5046..74ab09fd5 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; -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 com.earth2me.essentials.commands.EssentialsCommandHandler; +import static net.ess3.I18n._; +import net.ess3.api.ICommandHandler; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.commands.EssentialsCommandHandler; import java.util.List; import java.util.Locale; import java.util.logging.Level; @@ -36,7 +36,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP instance = this; final PluginManager pluginManager = getServer().getPluginManager(); - ess = (IEssentials)pluginManager.getPlugin("Essentials3"); + ess = (IEssentials)pluginManager.getPlugin("Essentials-3"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { LOGGER.log(Level.WARNING, _("versionMismatchAll")); @@ -56,7 +56,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP ess.addReloadListener(users); ess.addReloadListener(xmpp); - commandHandler = new EssentialsCommandHandler(EssentialsXMPP.class.getClassLoader(), "com.earth2me.essentials.xmpp.Command", "essentials.", ess); + commandHandler = new EssentialsCommandHandler(EssentialsXMPP.class.getClassLoader(), "net.ess3.xmpp.Command", "essentials.", ess); } @Override diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java index b6daf8114..4880aead7 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.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/net/ess3/xmpp/IEssentialsXMPP.java index 83851d055..373a7879d 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.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/net/ess3/xmpp/UserManager.java index 0f17e8660..a2018c006 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.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/net/ess3/xmpp/XMPPManager.java index c1b1b347f..ff49bc931 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.xmpp; +package net.ess3.xmpp; -import com.earth2me.essentials.api.IReload; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.utils.Util; +import net.ess3.api.IReload; +import net.ess3.api.IUser; +import net.ess3.utils.Util; import java.io.File; import java.util.*; import java.util.logging.Handler; diff --git a/EssentialsXMPP/src/plugin.yml b/EssentialsXMPP/src/plugin.yml index 7109284b7..49f6abd98 100644 --- a/EssentialsXMPP/src/plugin.yml +++ b/EssentialsXMPP/src/plugin.yml @@ -1,13 +1,13 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsXMPP -main: com.earth2me.essentials.xmpp.EssentialsXMPP +main: net.ess3.xmpp.EssentialsXMPP # Note to developers: This next line cannot change, or the automatic versioning system will break. version: ${build.number} website: http://tiny.cc/EssentialsWiki description: Provides xmpp communication. authors: - snowleo -depend: [Essentials3] +depend: [Essentials-3] commands: setxmpp: description: set your xmpp address |