diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 34a420c18..94cfc6ac9 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - net.ess3 + org.mcess EssentialsParent 2.x-SNAPSHOT @@ -87,7 +87,7 @@ ${project.basedir}/../lib/iCo6.jar - net.ess3 + org.mcess GroupManager ${project.version} system diff --git a/Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java b/Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java deleted file mode 100644 index fd51c04e8..000000000 --- a/Essentials/src/com/earth2me/essentials/api/UserDoesNotExistException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.earth2me.essentials.api; - -import static com.earth2me.essentials.I18n.tl; - - -public class UserDoesNotExistException extends Exception -{ - public UserDoesNotExistException(String name) - { - super(tl("userDoesNotExist", name)); - } -} diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java deleted file mode 100644 index a22bd4870..000000000 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.SetExpFix; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.NumberUtil; -import java.util.Locale; -import org.bukkit.Server; - - -public class Commandwhois extends EssentialsCommand -{ - public Commandwhois() - { - super("whois"); - } - - @Override - public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception - { - if (args.length < 1) - { - throw new NotEnoughArgumentsException(); - } - - User user = getPlayer(server, sender, args, 0); - - sender.sendMessage(tl("whoisTop", user.getName())); - user.setDisplayNick(); - sender.sendMessage(tl("whoisNick", user.getDisplayName())); - sender.sendMessage(tl("whoisHealth", user.getBase().getHealth())); - sender.sendMessage(tl("whoisHunger", user.getBase().getFoodLevel(), user.getBase().getSaturation())); - sender.sendMessage(tl("whoisExp", SetExpFix.getTotalExperience(user.getBase()), user.getBase().getLevel())); - sender.sendMessage(tl("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); - if (!ess.getSettings().isEcoDisabled()) - { - sender.sendMessage(tl("whoisMoney", NumberUtil.displayCurrency(user.getMoney(), ess))); - } - sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); - final String location = user.getGeoLocation(); - if (location != null - && (sender.isPlayer() ? ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show") : true)) - { - sender.sendMessage(tl("whoisGeoLocation", location)); - } - sender.sendMessage(tl("whoisGamemode", tl(user.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)))); - sender.sendMessage(tl("whoisGod", (user.isGodModeEnabled() ? tl("true") : tl("false")))); - sender.sendMessage(tl("whoisOp", (user.getBase().isOp() ? tl("true") : tl("false")))); - sender.sendMessage(tl("whoisFly", user.getBase().getAllowFlight() ? tl("true") : tl("false"), user.getBase().isFlying() ? tl("flying") : tl("notFlying"))); - sender.sendMessage(tl("whoisAFK", (user.isAfk() ? tl("true") : tl("false")))); - sender.sendMessage(tl("whoisJail", (user.isJailed() - ? user.getJailTimeout() > 0 - ? DateUtil.formatDateDiff(user.getJailTimeout()) - : tl("true") - : tl("false")))); - sender.sendMessage(tl("whoisMuted", (user.isMuted() - ? user.getMuteTimeout() > 0 - ? DateUtil.formatDateDiff(user.getMuteTimeout()) - : tl("true") - : tl("false")))); - - } -} diff --git a/Essentials/src/com/earth2me/essentials/commands/PlayerNotFoundException.java b/Essentials/src/com/earth2me/essentials/commands/PlayerNotFoundException.java deleted file mode 100644 index 1f5a00fbd..000000000 --- a/Essentials/src/com/earth2me/essentials/commands/PlayerNotFoundException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.earth2me.essentials.commands; - -import static com.earth2me.essentials.I18n.tl; - -public class PlayerNotFoundException extends NoSuchFieldException -{ - public PlayerNotFoundException() - { - super(tl("playerNotFound")); - } -} 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/net/ess3/api/Economy.java b/Essentials/src/net/ess3/api/Economy.java index 283ef3722..97be20f45 100644 --- a/Essentials/src/net/ess3/api/Economy.java +++ b/Essentials/src/net/ess3/api/Economy.java @@ -1,7 +1,7 @@ package net.ess3.api; -public class Economy extends com.earth2me.essentials.api.Economy +public class Economy extends org.mcess.essentials.api.Economy { } diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index be5671176..9a0c766bd 100644 --- a/Essentials/src/net/ess3/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -1,6 +1,6 @@ package net.ess3.api; -public interface IEssentials extends com.earth2me.essentials.IEssentials +public interface IEssentials extends org.mcess.essentials.IEssentials { } diff --git a/Essentials/src/net/ess3/api/II18n.java b/Essentials/src/net/ess3/api/II18n.java index 5bbe0e702..18dc0439f 100644 --- a/Essentials/src/net/ess3/api/II18n.java +++ b/Essentials/src/net/ess3/api/II18n.java @@ -1,7 +1,7 @@ package net.ess3.api; -public interface II18n extends com.earth2me.essentials.api.II18n +public interface II18n extends org.mcess.essentials.api.II18n { } diff --git a/Essentials/src/net/ess3/api/IItemDb.java b/Essentials/src/net/ess3/api/IItemDb.java index eb9afb3c5..8b8c0a908 100644 --- a/Essentials/src/net/ess3/api/IItemDb.java +++ b/Essentials/src/net/ess3/api/IItemDb.java @@ -1,7 +1,7 @@ package net.ess3.api; -public interface IItemDb extends com.earth2me.essentials.api.IItemDb +public interface IItemDb extends org.mcess.essentials.api.IItemDb { } diff --git a/Essentials/src/net/ess3/api/IJails.java b/Essentials/src/net/ess3/api/IJails.java index d36e4f76b..e7063d8c3 100644 --- a/Essentials/src/net/ess3/api/IJails.java +++ b/Essentials/src/net/ess3/api/IJails.java @@ -1,7 +1,7 @@ package net.ess3.api; -public interface IJails extends com.earth2me.essentials.api.IJails +public interface IJails extends org.mcess.essentials.api.IJails { } diff --git a/Essentials/src/net/ess3/api/IReload.java b/Essentials/src/net/ess3/api/IReload.java index b706342e2..426f8b27e 100644 --- a/Essentials/src/net/ess3/api/IReload.java +++ b/Essentials/src/net/ess3/api/IReload.java @@ -1,7 +1,7 @@ package net.ess3.api; -public interface IReload extends com.earth2me.essentials.api.IReload +public interface IReload extends org.mcess.essentials.api.IReload { } diff --git a/Essentials/src/net/ess3/api/ISettings.java b/Essentials/src/net/ess3/api/ISettings.java index 256cf1635..6acb31629 100644 --- a/Essentials/src/net/ess3/api/ISettings.java +++ b/Essentials/src/net/ess3/api/ISettings.java @@ -1,7 +1,7 @@ package net.ess3.api; -public interface ISettings extends com.earth2me.essentials.ISettings +public interface ISettings extends org.mcess.essentials.ISettings { } diff --git a/Essentials/src/net/ess3/api/ITeleport.java b/Essentials/src/net/ess3/api/ITeleport.java index 967b38ba3..80563f638 100644 --- a/Essentials/src/net/ess3/api/ITeleport.java +++ b/Essentials/src/net/ess3/api/ITeleport.java @@ -1,7 +1,7 @@ package net.ess3.api; -public interface ITeleport extends com.earth2me.essentials.api.ITeleport +public interface ITeleport extends org.mcess.essentials.api.ITeleport { } diff --git a/Essentials/src/net/ess3/api/IUser.java b/Essentials/src/net/ess3/api/IUser.java index b68c6e5cf..1413c1455 100644 --- a/Essentials/src/net/ess3/api/IUser.java +++ b/Essentials/src/net/ess3/api/IUser.java @@ -2,7 +2,7 @@ package net.ess3.api; -public interface IUser extends com.earth2me.essentials.IUser +public interface IUser extends org.mcess.essentials.IUser { } diff --git a/Essentials/src/net/ess3/api/IWarps.java b/Essentials/src/net/ess3/api/IWarps.java index c71ef7d7f..889932fa9 100644 --- a/Essentials/src/net/ess3/api/IWarps.java +++ b/Essentials/src/net/ess3/api/IWarps.java @@ -1,7 +1,7 @@ package net.ess3.api; -public interface IWarps extends com.earth2me.essentials.api.IWarps +public interface IWarps extends org.mcess.essentials.api.IWarps { } diff --git a/Essentials/src/net/ess3/api/InvalidWorldException.java b/Essentials/src/net/ess3/api/InvalidWorldException.java index 210b07762..4fbeba9aa 100644 --- a/Essentials/src/net/ess3/api/InvalidWorldException.java +++ b/Essentials/src/net/ess3/api/InvalidWorldException.java @@ -1,6 +1,6 @@ package net.ess3.api; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; public class InvalidWorldException extends Exception diff --git a/Essentials/src/net/ess3/api/MaxMoneyException.java b/Essentials/src/net/ess3/api/MaxMoneyException.java index bdc78aad2..ed08afc4b 100644 --- a/Essentials/src/net/ess3/api/MaxMoneyException.java +++ b/Essentials/src/net/ess3/api/MaxMoneyException.java @@ -1,6 +1,6 @@ package net.ess3.api; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; public class MaxMoneyException extends Exception diff --git a/Essentials/src/net/ess3/api/NoLoanPermittedException.java b/Essentials/src/net/ess3/api/NoLoanPermittedException.java index ed9cd8ca9..70c9d19da 100644 --- a/Essentials/src/net/ess3/api/NoLoanPermittedException.java +++ b/Essentials/src/net/ess3/api/NoLoanPermittedException.java @@ -1,6 +1,6 @@ package net.ess3.api; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; public class NoLoanPermittedException extends Exception diff --git a/Essentials/src/net/ess3/api/UserDoesNotExistException.java b/Essentials/src/net/ess3/api/UserDoesNotExistException.java index 9be186a5a..f207f5c73 100644 --- a/Essentials/src/net/ess3/api/UserDoesNotExistException.java +++ b/Essentials/src/net/ess3/api/UserDoesNotExistException.java @@ -1,6 +1,6 @@ package net.ess3.api; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; public class UserDoesNotExistException extends Exception diff --git a/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java b/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java index 1071a9f6d..36da9b6cb 100644 --- a/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java +++ b/Essentials/src/net/ess3/api/events/LocalChatSpyEvent.java @@ -1,6 +1,6 @@ package net.ess3.api.events; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; import java.util.IllegalFormatException; import java.util.Set; import org.bukkit.entity.Player; diff --git a/Essentials/src/net/ess3/api/events/SignBreakEvent.java b/Essentials/src/net/ess3/api/events/SignBreakEvent.java index 9c3e69d7e..fb85a9444 100644 --- a/Essentials/src/net/ess3/api/events/SignBreakEvent.java +++ b/Essentials/src/net/ess3/api/events/SignBreakEvent.java @@ -1,6 +1,6 @@ package net.ess3.api.events; -import com.earth2me.essentials.signs.EssentialsSign; +import org.mcess.essentials.signs.EssentialsSign; import net.ess3.api.IUser; diff --git a/Essentials/src/net/ess3/api/events/SignCreateEvent.java b/Essentials/src/net/ess3/api/events/SignCreateEvent.java index ac0520119..915d651fd 100644 --- a/Essentials/src/net/ess3/api/events/SignCreateEvent.java +++ b/Essentials/src/net/ess3/api/events/SignCreateEvent.java @@ -1,6 +1,6 @@ package net.ess3.api.events; -import com.earth2me.essentials.signs.EssentialsSign; +import org.mcess.essentials.signs.EssentialsSign; import net.ess3.api.IUser; diff --git a/Essentials/src/net/ess3/api/events/SignEvent.java b/Essentials/src/net/ess3/api/events/SignEvent.java index 01689db19..09cb1da37 100644 --- a/Essentials/src/net/ess3/api/events/SignEvent.java +++ b/Essentials/src/net/ess3/api/events/SignEvent.java @@ -1,7 +1,7 @@ package net.ess3.api.events; -import com.earth2me.essentials.signs.EssentialsSign; -import com.earth2me.essentials.signs.EssentialsSign.ISign; +import org.mcess.essentials.signs.EssentialsSign; +import org.mcess.essentials.signs.EssentialsSign.ISign; import net.ess3.api.IUser; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/Essentials/src/net/ess3/api/events/SignInteractEvent.java b/Essentials/src/net/ess3/api/events/SignInteractEvent.java index f67f68a0e..178932335 100644 --- a/Essentials/src/net/ess3/api/events/SignInteractEvent.java +++ b/Essentials/src/net/ess3/api/events/SignInteractEvent.java @@ -1,6 +1,6 @@ package net.ess3.api.events; -import com.earth2me.essentials.signs.EssentialsSign; +import org.mcess.essentials.signs.EssentialsSign; import net.ess3.api.IUser; diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/org/mcess/essentials/AlternativeCommandsHandler.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java rename to Essentials/src/org/mcess/essentials/AlternativeCommandsHandler.java index 3016ffe59..9dae7a17b 100644 --- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java +++ b/Essentials/src/org/mcess/essentials/AlternativeCommandsHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import java.util.*; import java.util.logging.Level; @@ -31,7 +31,7 @@ public class AlternativeCommandsHandler public final void addPlugin(final Plugin plugin) { - if (plugin.getDescription().getMain().contains("com.earth2me.essentials")) + if (plugin.getDescription().getMain().contains("org.mcess.essentials")) { return; } diff --git a/Essentials/src/com/earth2me/essentials/ChargeException.java b/Essentials/src/org/mcess/essentials/ChargeException.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/ChargeException.java rename to Essentials/src/org/mcess/essentials/ChargeException.java index 2fa4c7289..dcb77cd5f 100644 --- a/Essentials/src/com/earth2me/essentials/ChargeException.java +++ b/Essentials/src/org/mcess/essentials/ChargeException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; public class ChargeException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/CommandSource.java b/Essentials/src/org/mcess/essentials/CommandSource.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/CommandSource.java rename to Essentials/src/org/mcess/essentials/CommandSource.java index 689431a37..c952d4598 100644 --- a/Essentials/src/com/earth2me/essentials/CommandSource.java +++ b/Essentials/src/org/mcess/essentials/CommandSource.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/Console.java b/Essentials/src/org/mcess/essentials/Console.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/Console.java rename to Essentials/src/org/mcess/essentials/Console.java index 3954bbb0f..993712978 100644 --- a/Essentials/src/com/earth2me/essentials/Console.java +++ b/Essentials/src/org/mcess/essentials/Console.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/Essentials/src/com/earth2me/essentials/Enchantments.java b/Essentials/src/org/mcess/essentials/Enchantments.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/Enchantments.java rename to Essentials/src/org/mcess/essentials/Enchantments.java index de987ba0f..60d750734 100644 --- a/Essentials/src/com/earth2me/essentials/Enchantments.java +++ b/Essentials/src/org/mcess/essentials/Enchantments.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.NumberUtil; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/org/mcess/essentials/Essentials.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/Essentials.java rename to Essentials/src/org/mcess/essentials/Essentials.java index 1c5598217..86ae19d98 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/org/mcess/essentials/Essentials.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -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 com.earth2me.essentials.commands.QuietAbortException; -import com.earth2me.essentials.metrics.Metrics; -import com.earth2me.essentials.metrics.MetricsListener; -import com.earth2me.essentials.metrics.MetricsStarter; -import com.earth2me.essentials.perm.PermissionsHandler; -import com.earth2me.essentials.register.payment.Methods; -import com.earth2me.essentials.signs.SignBlockListener; -import com.earth2me.essentials.signs.SignEntityListener; -import com.earth2me.essentials.signs.SignPlayerListener; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.SimpleTextInput; -import com.earth2me.essentials.utils.DateUtil; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.commands.EssentialsCommand; +import org.mcess.essentials.commands.IEssentialsCommand; +import org.mcess.essentials.commands.NoChargeException; +import org.mcess.essentials.commands.NotEnoughArgumentsException; +import org.mcess.essentials.commands.QuietAbortException; +import org.mcess.essentials.metrics.Metrics; +import org.mcess.essentials.metrics.MetricsListener; +import org.mcess.essentials.metrics.MetricsStarter; +import org.mcess.essentials.perm.PermissionsHandler; +import org.mcess.essentials.register.payment.Methods; +import org.mcess.essentials.signs.SignBlockListener; +import org.mcess.essentials.signs.SignEntityListener; +import org.mcess.essentials.signs.SignPlayerListener; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.SimpleTextInput; +import org.mcess.essentials.utils.DateUtil; import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; @@ -114,7 +114,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials public Essentials(final Server server) { - super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials", "", "com.earth2me.essentials.Essentials"), null, null); + super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials", "", "Essentials"), null, null); } @Override @@ -393,7 +393,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials @Override public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] 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(), "org.mcess.essentials.commands.Command", "essentials.", null); } @Override diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/org/mcess/essentials/EssentialsBlockListener.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java rename to Essentials/src/org/mcess/essentials/EssentialsBlockListener.java index 8a7550639..b3eeabc15 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java +++ b/Essentials/src/org/mcess/essentials/EssentialsBlockListener.java @@ -1,9 +1,8 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.utils.LocationUtil; +import org.mcess.essentials.utils.LocationUtil; import java.util.Locale; import net.ess3.api.IEssentials; -import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.block.CreatureSpawner; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/org/mcess/essentials/EssentialsConf.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/EssentialsConf.java rename to Essentials/src/org/mcess/essentials/EssentialsConf.java index 0352007e8..d0f5b368d 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/org/mcess/essentials/EssentialsConf.java @@ -1,6 +1,5 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; import com.google.common.io.Files; import java.io.*; import java.math.BigDecimal; @@ -59,7 +58,7 @@ public class EssentialsConf extends YamlConfiguration { if (!configFile.getParentFile().mkdirs()) { - LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString())); + LOGGER.log(Level.SEVERE, I18n.tl("failedToCreateConfig", configFile.toString())); } } // This will delete files where the first character is 0. In most cases they are broken. @@ -110,7 +109,7 @@ public class EssentialsConf extends YamlConfiguration } else if (templateName != null) { - LOGGER.log(Level.INFO, tl("creatingConfigFromTemplate", configFile.toString())); + LOGGER.log(Level.INFO, I18n.tl("creatingConfigFromTemplate", configFile.toString())); createFromTemplate(); } else @@ -219,7 +218,7 @@ public class EssentialsConf extends YamlConfiguration istr = resourceClass.getResourceAsStream(templateName); if (istr == null) { - LOGGER.log(Level.SEVERE, tl("couldNotFindTemplate", templateName)); + LOGGER.log(Level.SEVERE, I18n.tl("couldNotFindTemplate", templateName)); return; } ostr = new FileOutputStream(configFile); @@ -234,7 +233,7 @@ public class EssentialsConf extends YamlConfiguration } catch (IOException ex) { - LOGGER.log(Level.SEVERE, tl("failedToWriteConfig", configFile.toString()), ex); + LOGGER.log(Level.SEVERE, I18n.tl("failedToWriteConfig", configFile.toString()), ex); } finally { @@ -258,7 +257,7 @@ public class EssentialsConf extends YamlConfiguration } catch (IOException ex) { - LOGGER.log(Level.SEVERE, tl("failedToCloseConfig", configFile.toString()), ex); + LOGGER.log(Level.SEVERE, I18n.tl("failedToCloseConfig", configFile.toString()), ex); } } } @@ -398,16 +397,16 @@ public class EssentialsConf extends YamlConfiguration { try { - LOGGER.log(Level.INFO, tl("creatingEmptyConfig", configFile.toString())); + LOGGER.log(Level.INFO, I18n.tl("creatingEmptyConfig", configFile.toString())); if (!configFile.createNewFile()) { - LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString())); + LOGGER.log(Level.SEVERE, I18n.tl("failedToCreateConfig", configFile.toString())); return; } } catch (IOException ex) { - LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()), ex); + LOGGER.log(Level.SEVERE, I18n.tl("failedToCreateConfig", configFile.toString()), ex); return; } } diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/org/mcess/essentials/EssentialsEntityListener.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java rename to Essentials/src/org/mcess/essentials/EssentialsEntityListener.java index 5e3bbb1d0..2b417f648 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/org/mcess/essentials/EssentialsEntityListener.java @@ -1,6 +1,5 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -152,7 +151,7 @@ public class EssentialsEntityListener implements Listener if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back")) { user.setLastLocation(); - user.sendMessage(tl("backAfterDeath")); + user.sendMessage(I18n.tl("backAfterDeath")); } if (!ess.getSettings().areDeathMessagesEnabled()) { diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/org/mcess/essentials/EssentialsPlayerListener.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java rename to Essentials/src/org/mcess/essentials/EssentialsPlayerListener.java index 51e6ef007..817bd2121 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/org/mcess/essentials/EssentialsPlayerListener.java @@ -1,11 +1,10 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.TextInput; -import com.earth2me.essentials.textreader.TextPager; -import com.earth2me.essentials.utils.LocationUtil; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.TextInput; +import org.mcess.essentials.textreader.TextPager; +import org.mcess.essentials.utils.LocationUtil; import java.io.IOException; import java.util.Iterator; import java.util.List; @@ -29,7 +28,6 @@ import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; -import org.bukkit.inventory.ItemStack; public class EssentialsPlayerListener implements Listener @@ -62,8 +60,8 @@ public class EssentialsPlayerListener implements Listener if (user.isMuted()) { event.setCancelled(true); - user.sendMessage(tl("voiceSilenced")); - LOGGER.info(tl("mutedUserSpeaks", user.getName())); + user.sendMessage(I18n.tl("voiceSilenced")); + LOGGER.info(I18n.tl("mutedUserSpeaks", user.getName())); } try { @@ -324,11 +322,11 @@ public class EssentialsPlayerListener implements Listener final List mail = user.getMails(); if (mail.isEmpty()) { - user.sendMessage(tl("noNewMail")); + user.sendMessage(I18n.tl("noNewMail")); } else { - user.sendMessage(tl("youHaveNewMail", mail.size())); + user.sendMessage(I18n.tl("youHaveNewMail", mail.size())); } } @@ -339,7 +337,7 @@ public class EssentialsPlayerListener implements Listener { user.getBase().setAllowFlight(true); user.getBase().setFlying(true); - user.getBase().sendMessage(tl("flyMode", tl("enabled"), user.getDisplayName())); + user.getBase().sendMessage(I18n.tl("flyMode", I18n.tl("enabled"), user.getDisplayName())); } } @@ -383,7 +381,7 @@ public class EssentialsPlayerListener implements Listener event.allow(); return; } - event.disallow(Result.KICK_FULL, tl("serverFull")); + event.disallow(Result.KICK_FULL, I18n.tl("serverFull")); break; default: break; @@ -477,12 +475,12 @@ public class EssentialsPlayerListener implements Listener updateCompass(user); if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw()) { - user.sendMessage(tl("noGodWorldWarning")); + user.sendMessage(I18n.tl("noGodWorldWarning")); } if (!user.getWorld().getName().equals(newWorld)) { - user.sendMessage(tl("currentWorld", newWorld)); + user.sendMessage(I18n.tl("currentWorld", newWorld)); } if (user.isVanished()) { @@ -502,7 +500,7 @@ public class EssentialsPlayerListener implements Listener if (player.isAuthorized("essentials.sethome.bed")) { player.getBase().setBedSpawnLocation(event.getClickedBlock().getLocation()); - player.sendMessage(tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ())); + player.sendMessage(I18n.tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ())); } } break; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java b/Essentials/src/org/mcess/essentials/EssentialsPluginListener.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java rename to Essentials/src/org/mcess/essentials/EssentialsPluginListener.java index e917d2ec3..d12552643 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java +++ b/Essentials/src/org/mcess/essentials/EssentialsPluginListener.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.perm.PermissionsHandler; -import com.earth2me.essentials.register.payment.Methods; +import org.mcess.essentials.perm.PermissionsHandler; +import org.mcess.essentials.register.payment.Methods; import java.util.logging.Level; import net.ess3.api.IEssentials; import org.bukkit.event.EventHandler; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java b/Essentials/src/org/mcess/essentials/EssentialsTimer.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/EssentialsTimer.java rename to Essentials/src/org/mcess/essentials/EssentialsTimer.java index 8f75445e2..f48d2af23 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java +++ b/Essentials/src/org/mcess/essentials/EssentialsTimer.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import java.util.HashSet; import java.util.Iterator; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/org/mcess/essentials/EssentialsUpgrade.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java rename to Essentials/src/org/mcess/essentials/EssentialsUpgrade.java index 1782362c3..55bac89e1 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials/src/org/mcess/essentials/EssentialsUpgrade.java @@ -1,11 +1,10 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.craftbukkit.BanLookup; -import com.earth2me.essentials.craftbukkit.FakeWorld; -import com.earth2me.essentials.settings.Spawns; -import com.earth2me.essentials.storage.YamlStorageWriter; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.craftbukkit.BanLookup; +import org.mcess.essentials.craftbukkit.FakeWorld; +import org.mcess.essentials.settings.Spawns; +import org.mcess.essentials.storage.YamlStorageWriter; +import org.mcess.essentials.utils.StringUtil; import com.google.common.base.Charsets; import java.io.*; import java.math.BigInteger; @@ -19,6 +18,7 @@ import org.bukkit.BanList; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; +import org.mcess.essentials.settings.Jails; public class EssentialsUpgrade @@ -78,7 +78,7 @@ public class EssentialsUpgrade } catch (IOException e) { - LOGGER.log(Level.SEVERE, tl("upgradingFilesError"), e); + LOGGER.log(Level.SEVERE, I18n.tl("upgradingFilesError"), e); } } @@ -128,11 +128,11 @@ public class EssentialsUpgrade { if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup")))) { - throw new Exception(tl("configFileMoveError")); + throw new Exception(I18n.tl("configFileMoveError")); } if (!tempFile.renameTo(file)) { - throw new Exception(tl("configFileRenameError")); + throw new Exception(I18n.tl("configFileRenameError")); } } else @@ -296,17 +296,17 @@ public class EssentialsUpgrade final File newFile = new File(listOfFile.getParentFile(), sanitizedFilename); if (!listOfFile.renameTo(tmpFile)) { - LOGGER.log(Level.WARNING, tl("userdataMoveError", filename, sanitizedFilename)); + LOGGER.log(Level.WARNING, I18n.tl("userdataMoveError", filename, sanitizedFilename)); continue; } if (newFile.exists()) { - LOGGER.log(Level.WARNING, tl("duplicatedUserdata", filename, sanitizedFilename)); + LOGGER.log(Level.WARNING, I18n.tl("duplicatedUserdata", filename, sanitizedFilename)); continue; } if (!tmpFile.renameTo(newFile)) { - LOGGER.log(Level.WARNING, tl("userdataMoveBackError", sanitizedFilename, sanitizedFilename)); + LOGGER.log(Level.WARNING, I18n.tl("userdataMoveBackError", sanitizedFilename, sanitizedFilename)); } } doneFile.setProperty("sanitizeAllUserFilenames", true); @@ -416,7 +416,7 @@ public class EssentialsUpgrade } if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old"))) { - throw new Exception(tl("fileRenameError", "spawn.yml")); + throw new Exception(I18n.tl("fileRenameError", "spawn.yml")); } PrintWriter writer = new PrintWriter(configFile); try @@ -454,7 +454,7 @@ public class EssentialsUpgrade config.load(); if (!config.hasProperty("jails")) { - final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails(); + final org.mcess.essentials.settings.Jails jails = new Jails(); Set keys = config.getKeys(false); for (String jailName : keys) { @@ -463,7 +463,7 @@ public class EssentialsUpgrade } if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old"))) { - throw new Exception(tl("fileRenameError", "jail.yml")); + throw new Exception(I18n.tl("fileRenameError", "jail.yml")); } PrintWriter writer = new PrintWriter(configFile); try diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUserConf.java b/Essentials/src/org/mcess/essentials/EssentialsUserConf.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/EssentialsUserConf.java rename to Essentials/src/org/mcess/essentials/EssentialsUserConf.java index cbfba46b1..d3a08d474 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsUserConf.java +++ b/Essentials/src/org/mcess/essentials/EssentialsUserConf.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import com.google.common.base.Charsets; import com.google.common.io.Files; diff --git a/Essentials/src/com/earth2me/essentials/ExecuteTimer.java b/Essentials/src/org/mcess/essentials/ExecuteTimer.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/ExecuteTimer.java rename to Essentials/src/org/mcess/essentials/ExecuteTimer.java index f9da468b5..7b01c9172 100644 --- a/Essentials/src/com/earth2me/essentials/ExecuteTimer.java +++ b/Essentials/src/org/mcess/essentials/ExecuteTimer.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/org/mcess/essentials/I18n.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/I18n.java rename to Essentials/src/org/mcess/essentials/I18n.java index 478b6b5d1..100d6cb59 100644 --- a/Essentials/src/com/earth2me/essentials/I18n.java +++ b/Essentials/src/org/mcess/essentials/I18n.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import java.io.File; import java.io.FileInputStream; @@ -12,7 +12,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; import net.ess3.api.IEssentials; -import org.bukkit.Bukkit; public class I18n implements net.ess3.api.II18n diff --git a/Essentials/src/com/earth2me/essentials/IConf.java b/Essentials/src/org/mcess/essentials/IConf.java similarity index 63% rename from Essentials/src/com/earth2me/essentials/IConf.java rename to Essentials/src/org/mcess/essentials/IConf.java index 600c7ed48..2b67fe90c 100644 --- a/Essentials/src/com/earth2me/essentials/IConf.java +++ b/Essentials/src/org/mcess/essentials/IConf.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; public interface IConf { diff --git a/Essentials/src/com/earth2me/essentials/IEssentials.java b/Essentials/src/org/mcess/essentials/IEssentials.java similarity index 86% rename from Essentials/src/com/earth2me/essentials/IEssentials.java rename to Essentials/src/org/mcess/essentials/IEssentials.java index 352c8314b..2d75d8c6a 100644 --- a/Essentials/src/com/earth2me/essentials/IEssentials.java +++ b/Essentials/src/org/mcess/essentials/IEssentials.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.api.IItemDb; -import com.earth2me.essentials.api.IJails; -import com.earth2me.essentials.api.IWarps; -import com.earth2me.essentials.metrics.Metrics; -import com.earth2me.essentials.perm.PermissionsHandler; -import com.earth2me.essentials.register.payment.Methods; +import org.mcess.essentials.api.IItemDb; +import org.mcess.essentials.api.IJails; +import org.mcess.essentials.api.IWarps; +import org.mcess.essentials.metrics.Metrics; +import org.mcess.essentials.perm.PermissionsHandler; +import org.mcess.essentials.register.payment.Methods; import java.util.Collection; import java.util.List; import java.util.UUID; diff --git a/Essentials/src/com/earth2me/essentials/IEssentialsModule.java b/Essentials/src/org/mcess/essentials/IEssentialsModule.java similarity index 55% rename from Essentials/src/com/earth2me/essentials/IEssentialsModule.java rename to Essentials/src/org/mcess/essentials/IEssentialsModule.java index 69a1a494c..de2656c66 100644 --- a/Essentials/src/com/earth2me/essentials/IEssentialsModule.java +++ b/Essentials/src/org/mcess/essentials/IEssentialsModule.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; public interface IEssentialsModule diff --git a/Essentials/src/com/earth2me/essentials/IReplyTo.java b/Essentials/src/org/mcess/essentials/IReplyTo.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/IReplyTo.java rename to Essentials/src/org/mcess/essentials/IReplyTo.java index ee8e80b4c..b99e93cc2 100644 --- a/Essentials/src/com/earth2me/essentials/IReplyTo.java +++ b/Essentials/src/org/mcess/essentials/IReplyTo.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; public interface IReplyTo { diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/org/mcess/essentials/ISettings.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/ISettings.java rename to Essentials/src/org/mcess/essentials/ISettings.java index 7999c3dcb..961879498 100644 --- a/Essentials/src/com/earth2me/essentials/ISettings.java +++ b/Essentials/src/org/mcess/essentials/ISettings.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.commands.IEssentialsCommand; -import com.earth2me.essentials.signs.EssentialsSign; -import com.earth2me.essentials.textreader.IText; +import org.mcess.essentials.commands.IEssentialsCommand; +import org.mcess.essentials.signs.EssentialsSign; +import org.mcess.essentials.textreader.IText; import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/ITarget.java b/Essentials/src/org/mcess/essentials/ITarget.java similarity index 73% rename from Essentials/src/com/earth2me/essentials/ITarget.java rename to Essentials/src/org/mcess/essentials/ITarget.java index 87b867c13..05088d795 100644 --- a/Essentials/src/com/earth2me/essentials/ITarget.java +++ b/Essentials/src/org/mcess/essentials/ITarget.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/IUser.java b/Essentials/src/org/mcess/essentials/IUser.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/IUser.java rename to Essentials/src/org/mcess/essentials/IUser.java index 43e729e31..3c7ee9318 100644 --- a/Essentials/src/com/earth2me/essentials/IUser.java +++ b/Essentials/src/org/mcess/essentials/IUser.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.commands.IEssentialsCommand; +import org.mcess.essentials.commands.IEssentialsCommand; import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/ItemDb.java b/Essentials/src/org/mcess/essentials/ItemDb.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/ItemDb.java rename to Essentials/src/org/mcess/essentials/ItemDb.java index 6d0b1725a..71b5e6a61 100644 --- a/Essentials/src/com/earth2me/essentials/ItemDb.java +++ b/Essentials/src/org/mcess/essentials/ItemDb.java @@ -1,8 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.StringUtil; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -143,20 +142,20 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb } catch (Throwable throwable) { - throw new Exception(tl("unknownItemName", itemname), throwable); + throw new Exception(I18n.tl("unknownItemName", itemname), throwable); } } } if (itemid < 1) { - throw new Exception(tl("unknownItemName", itemname)); + throw new Exception(I18n.tl("unknownItemName", itemname)); } final Material mat = Material.getMaterial(itemid); if (mat == null) { - throw new Exception(tl("unknownItemId", itemid)); + throw new Exception(I18n.tl("unknownItemId", itemid)); } final ItemStack retval = new ItemStack(mat); retval.setAmount(mat.getMaxStackSize()); @@ -206,7 +205,7 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb if (is.isEmpty() || is.get(0).getType() == Material.AIR) { - throw new Exception(tl("itemSellAir")); + throw new Exception(I18n.tl("itemSellAir")); } return is; diff --git a/Essentials/src/com/earth2me/essentials/Jails.java b/Essentials/src/org/mcess/essentials/Jails.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/Jails.java rename to Essentials/src/org/mcess/essentials/Jails.java index afbb7673a..d9ecccf7d 100644 --- a/Essentials/src/com/earth2me/essentials/Jails.java +++ b/Essentials/src/org/mcess/essentials/Jails.java @@ -1,7 +1,6 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import org.mcess.essentials.storage.AsyncStorageObjectHolder; import java.io.File; import java.util.*; import java.util.logging.Level; @@ -29,14 +28,14 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.PluginManager; -public class Jails extends AsyncStorageObjectHolder implements net.ess3.api.IJails +public class Jails extends AsyncStorageObjectHolder implements net.ess3.api.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, org.mcess.essentials.settings.Jails.class); reloadConfig(); } @@ -93,12 +92,12 @@ public class Jails extends AsyncStorageObjectHolder 0) { - cost = tl("kitCost", NumberUtil.displayCurrency(costPrice, ess)); + cost = I18n.tl("kitCost", NumberUtil.displayCurrency(costPrice, ess)); } Kit kit = new Kit(kitItem, ess); if (kit.getNextUse(user) != 0) { - name = tl("kitDelay", name); + name = I18n.tl("kitDelay", name); } list.append(" ").append(name).append(cost); @@ -75,7 +72,7 @@ public class Kit } catch (Exception ex) { - throw new Exception(tl("kitError"), ex); + throw new Exception(I18n.tl("kitError"), ex); } } @@ -89,7 +86,7 @@ public class Kit { if (!user.isAuthorized("essentials.kits." + kitName)) { - throw new Exception(tl("noKitPermission", "essentials.kits." + kitName)); + throw new Exception(I18n.tl("noKitPermission", "essentials.kits." + kitName)); } } @@ -103,12 +100,12 @@ public class Kit } else if (nextUse < 0L) { - user.sendMessage(tl("kitOnce")); + user.sendMessage(I18n.tl("kitOnce")); throw new NoChargeException(); } else { - user.sendMessage(tl("kitTimed", DateUtil.formatDateDiff(nextUse))); + user.sendMessage(I18n.tl("kitTimed", DateUtil.formatDateDiff(nextUse))); throw new NoChargeException(); } } @@ -146,7 +143,7 @@ public class Kit } catch (Exception e) { - throw new Exception(tl("kitError2")); + throw new Exception(I18n.tl("kitError2")); } // When was the last kit used? @@ -184,7 +181,7 @@ public class Kit { if (kit == null) { - throw new Exception(tl("kitNotFound")); + throw new Exception(I18n.tl("kitNotFound")); } try { @@ -208,7 +205,7 @@ public class Kit catch (Exception e) { ess.getLogger().log(Level.WARNING, "Error parsing kit " + kitName + ": " + e.getMessage()); - throw new Exception(tl("kitError2"), e); + throw new Exception(I18n.tl("kitError2"), e); } } @@ -232,7 +229,7 @@ public class Kit { BigDecimal value = new BigDecimal(kitItem.substring(ess.getSettings().getCurrencySymbol().length()).trim()); Trade t = new Trade(value, ess); - t.pay(user, OverflowType.DROP); + t.pay(user, Trade.OverflowType.DROP); continue; } @@ -280,14 +277,14 @@ public class Kit user.getBase().updateInventory(); if (spew) { - user.sendMessage(tl("kitInvFull")); + user.sendMessage(I18n.tl("kitInvFull")); } } catch (Exception e) { user.getBase().updateInventory(); ess.getLogger().log(Level.WARNING, e.getMessage()); - throw new Exception(tl("kitError2"), e); + throw new Exception(I18n.tl("kitError2"), e); } } } diff --git a/Essentials/src/com/earth2me/essentials/LocationTarget.java b/Essentials/src/org/mcess/essentials/LocationTarget.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/LocationTarget.java rename to Essentials/src/org/mcess/essentials/LocationTarget.java index 1641373af..48e127d0a 100644 --- a/Essentials/src/com/earth2me/essentials/LocationTarget.java +++ b/Essentials/src/org/mcess/essentials/LocationTarget.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/ManagedFile.java b/Essentials/src/org/mcess/essentials/ManagedFile.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/ManagedFile.java rename to Essentials/src/org/mcess/essentials/ManagedFile.java index 3fa46d5c3..a292018d1 100644 --- a/Essentials/src/com/earth2me/essentials/ManagedFile.java +++ b/Essentials/src/org/mcess/essentials/ManagedFile.java @@ -1,6 +1,5 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; @@ -47,7 +46,7 @@ public class ManagedFile } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex); + Bukkit.getLogger().log(Level.SEVERE, I18n.tl("itemsCsvNotLoaded"), ex); } } } diff --git a/Essentials/src/com/earth2me/essentials/MetaItemStack.java b/Essentials/src/org/mcess/essentials/MetaItemStack.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/MetaItemStack.java rename to Essentials/src/org/mcess/essentials/MetaItemStack.java index c39028627..9c2ff049a 100644 --- a/Essentials/src/com/earth2me/essentials/MetaItemStack.java +++ b/Essentials/src/org/mcess/essentials/MetaItemStack.java @@ -1,11 +1,10 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.textreader.BookInput; -import com.earth2me.essentials.textreader.BookPager; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.utils.FormatUtil; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.textreader.BookInput; +import org.mcess.essentials.textreader.BookPager; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.NumberUtil; import java.util.*; import java.util.regex.Pattern; @@ -143,7 +142,7 @@ public class MetaItemStack } catch (NoSuchMethodError nsme) { - throw new Exception(tl("noMetaJson"), nsme); + throw new Exception(I18n.tl("noMetaJson"), nsme); } catch (Throwable throwable) { @@ -160,14 +159,14 @@ public class MetaItemStack { if (!hasMetaPermission(sender, "firework", true, true, ess)) { - throw new Exception(tl("noMetaFirework")); + throw new Exception(I18n.tl("noMetaFirework")); } FireworkEffect effect = builder.build(); FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); fmeta.addEffect(effect); if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess)) { - throw new Exception(tl("multipleCharges")); + throw new Exception(I18n.tl("multipleCharges")); } stack.setItemMeta(fmeta); } @@ -211,7 +210,7 @@ public class MetaItemStack } else { - throw new Exception(tl("onlyPlayerSkulls")); + throw new Exception(I18n.tl("onlyPlayerSkulls")); } } else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK @@ -272,7 +271,7 @@ public class MetaItemStack } else { - throw new Exception(tl("leatherSyntax")); + throw new Exception(I18n.tl("leatherSyntax")); } } else @@ -298,14 +297,14 @@ public class MetaItemStack { if (!hasMetaPermission(sender, "firework", true, true, ess)) { - throw new Exception(tl("noMetaFirework")); + throw new Exception(I18n.tl("noMetaFirework")); } FireworkEffect effect = builder.build(); FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); fmeta.addEffect(effect); if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess)) { - throw new Exception(tl("multipleCharges")); + throw new Exception(I18n.tl("multipleCharges")); } stack.setItemMeta(fmeta); builder = FireworkEffect.builder(); @@ -322,7 +321,7 @@ public class MetaItemStack } else { - throw new Exception(tl("invalidFireworkFormat", split[1], split[0])); + throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0])); } } builder.withColor(primaryColors); @@ -337,7 +336,7 @@ public class MetaItemStack } else { - throw new Exception(tl("invalidFireworkFormat", split[1], split[0])); + throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0])); } if (finalEffect != null) { @@ -356,7 +355,7 @@ public class MetaItemStack } else { - throw new Exception(tl("invalidFireworkFormat", split[1], split[0])); + throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0])); } } if (!fadeColors.isEmpty()) @@ -379,7 +378,7 @@ public class MetaItemStack } else { - throw new Exception(tl("invalidFireworkFormat", split[1], split[0])); + throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0])); } } } @@ -408,12 +407,12 @@ public class MetaItemStack } else { - throw new Exception(tl("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH))); + throw new Exception(I18n.tl("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH))); } } else { - throw new Exception(tl("invalidPotionMeta", split[1])); + throw new Exception(I18n.tl("invalidPotionMeta", split[1])); } } else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p"))) @@ -429,7 +428,7 @@ public class MetaItemStack } else { - throw new Exception(tl("invalidPotionMeta", split[1])); + throw new Exception(I18n.tl("invalidPotionMeta", split[1])); } } else if (split[0].equalsIgnoreCase("duration") || (allowShortName && split[0].equalsIgnoreCase("d"))) @@ -441,7 +440,7 @@ public class MetaItemStack } else { - throw new Exception(tl("invalidPotionMeta", split[1])); + throw new Exception(I18n.tl("invalidPotionMeta", split[1])); } } @@ -451,7 +450,7 @@ public class MetaItemStack pEffect = pEffectType.createEffect(duration, power); if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "potions.multiple", true, false, ess)) { - throw new Exception(tl("multiplePotionEffects")); + throw new Exception(I18n.tl("multiplePotionEffects")); } pmeta.addCustomEffect(pEffect, true); stack.setItemMeta(pmeta); @@ -492,7 +491,7 @@ public class MetaItemStack { if (enchantment == null) { - throw new Exception(tl("enchantmentNotFound")); + throw new Exception(I18n.tl("enchantmentNotFound")); } try { @@ -546,7 +545,7 @@ public class MetaItemStack if (!hasMetaPermission(user, "enchantments." + enchantmentName, true, false)) { - throw new Exception(tl("enchantmentPerm", enchantmentName)); + throw new Exception(I18n.tl("enchantmentPerm", enchantmentName)); } return enchantment; } @@ -571,7 +570,7 @@ public class MetaItemStack } else { - throw new Exception(tl("noMetaPerm", metaPerm)); + throw new Exception(I18n.tl("noMetaPerm", metaPerm)); } } } diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/org/mcess/essentials/Mob.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/Mob.java rename to Essentials/src/org/mcess/essentials/Mob.java index 712f5cc0f..1c9dd2eb8 100644 --- a/Essentials/src/com/earth2me/essentials/Mob.java +++ b/Essentials/src/org/mcess/essentials/Mob.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/Essentials/src/com/earth2me/essentials/MobData.java b/Essentials/src/org/mcess/essentials/MobData.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/MobData.java rename to Essentials/src/org/mcess/essentials/MobData.java index 790cc631b..35f768a07 100644 --- a/Essentials/src/com/earth2me/essentials/MobData.java +++ b/Essentials/src/org/mcess/essentials/MobData.java @@ -1,7 +1,6 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.utils.StringUtil; import java.util.*; import java.util.logging.Logger; import org.bukkit.DyeColor; @@ -286,7 +285,7 @@ public enum MobData } catch (Exception e) { - throw new Exception(tl("sheepMalformedColor"), e); + throw new Exception(I18n.tl("sheepMalformedColor"), e); } } else if (this.value.equals(Data.EXP)) @@ -298,7 +297,7 @@ public enum MobData } catch (NumberFormatException e) { - throw new Exception(tl("invalidNumber"), e); + throw new Exception(I18n.tl("invalidNumber"), e); } } else if (this.value.equals(Data.SIZE)) @@ -310,7 +309,7 @@ public enum MobData } catch (NumberFormatException e) { - throw new Exception(tl("slimeMalformedSize"), e); + throw new Exception(I18n.tl("slimeMalformedSize"), e); } } else if (this.value instanceof Horse.Color) diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/org/mcess/essentials/OfflinePlayer.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/OfflinePlayer.java rename to Essentials/src/org/mcess/essentials/OfflinePlayer.java index 2fda39778..7bd8a4bf4 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/org/mcess/essentials/OfflinePlayer.java @@ -1,6 +1,5 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; import java.net.InetSocketAddress; import java.util.*; import org.bukkit.*; @@ -187,25 +186,25 @@ public class OfflinePlayer implements Player @Override public int getRemainingAir() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setRemainingAir(int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getMaximumAir() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setMaximumAir(int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override @@ -217,73 +216,73 @@ public class OfflinePlayer implements Player @Override public void setSneaking(boolean bln) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void updateInventory() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void chat(String string) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public double getEyeHeight() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public double getEyeHeight(boolean bln) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public List getLineOfSight(HashSet hs, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public Block getTargetBlock(HashSet hs, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public List getLastTwoTargetBlocks(HashSet hs, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getFireTicks() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getMaxFireTicks() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setFireTicks(int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void remove() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override @@ -294,168 +293,168 @@ public class OfflinePlayer implements Player public Vector getMomentum() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } public void setMomentum(Vector vector) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setVelocity(Vector vector) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public Vector getVelocity() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void damage(double d) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void damage(double d, Entity entity) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public Location getEyeLocation() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void sendRawMessage(String string) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public Location getCompassTarget() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getMaximumNoDamageTicks() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setMaximumNoDamageTicks(int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public double getLastDamage() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setLastDamage(double d) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getNoDamageTicks() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setNoDamageTicks(int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean teleport(Location lctn) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean teleport(Entity entity) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public Entity getPassenger() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean setPassenger(Entity entity) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean isEmpty() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean eject() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void saveData() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void loadData() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean isSleeping() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getSleepTicks() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public List getNearbyEntities(double d, double d1, double d2) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean isDead() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public float getFallDistance() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override @@ -466,175 +465,175 @@ public class OfflinePlayer implements Player @Override public void setSleepingIgnored(boolean bln) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean isSleepingIgnored() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void awardAchievement(Achievement a) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void removeAchievement(Achievement achievement) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public boolean hasAchievement(Achievement achievement) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void incrementStatistic(Statistic ststc) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void decrementStatistic(Statistic statistic) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void incrementStatistic(Statistic ststc, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void decrementStatistic(Statistic statistic, int i) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setStatistic(Statistic statistic, int i) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getStatistic(Statistic statistic) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void incrementStatistic(Statistic ststc, Material mtrl) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void incrementStatistic(Statistic ststc, Material mtrl, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void decrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void incrementStatistic(Statistic statistic, EntityType entityType, int i) throws IllegalArgumentException { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void decrementStatistic(Statistic statistic, EntityType entityType, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setStatistic(Statistic statistic, EntityType entityType, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void playNote(Location lctn, byte b, byte b1) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void sendBlockChange(Location lctn, Material mtrl, byte b) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void sendBlockChange(Location lctn, int i, byte b) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void setLastDamageCause(EntityDamageEvent ede) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public EntityDamageEvent getLastDamageCause() { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override public void playEffect(Location lctn, Effect effect, int i) { - throw new UnsupportedOperationException(tl("notSupportedYet")); + throw new UnsupportedOperationException(I18n.tl("notSupportedYet")); } @Override diff --git a/Essentials/src/com/earth2me/essentials/PlayerExtension.java b/Essentials/src/org/mcess/essentials/PlayerExtension.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/PlayerExtension.java rename to Essentials/src/org/mcess/essentials/PlayerExtension.java index e724de0e5..01db7f3ae 100644 --- a/Essentials/src/com/earth2me/essentials/PlayerExtension.java +++ b/Essentials/src/org/mcess/essentials/PlayerExtension.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import org.bukkit.Location; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/PlayerList.java b/Essentials/src/org/mcess/essentials/PlayerList.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/PlayerList.java rename to Essentials/src/org/mcess/essentials/PlayerList.java index fb8a1f0bc..b53188e35 100644 --- a/Essentials/src/com/earth2me/essentials/PlayerList.java +++ b/Essentials/src/org/mcess/essentials/PlayerList.java @@ -1,7 +1,6 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.FormatUtil; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -10,7 +9,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import org.bukkit.Server; -import org.bukkit.entity.Player; public class PlayerList @@ -30,11 +28,11 @@ public class PlayerList needComma = true; if (user.isAfk()) { - groupString.append(tl("listAfkTag")); + groupString.append(I18n.tl("listAfkTag")); } if (user.isHidden()) { - groupString.append(tl("listHiddenTag")); + groupString.append(I18n.tl("listHiddenTag")); } user.setDisplayNick(); groupString.append(user.getDisplayName()); @@ -63,11 +61,11 @@ public class PlayerList String online; if (hiddenCount > 0) { - online = tl("listAmountHidden", ess.getOnlinePlayers().size() - playerHidden, hiddenCount, server.getMaxPlayers()); + online = I18n.tl("listAmountHidden", ess.getOnlinePlayers().size() - playerHidden, hiddenCount, server.getMaxPlayers()); } else { - online = tl("listAmount", ess.getOnlinePlayers().size() - playerHidden, server.getMaxPlayers()); + online = I18n.tl("listAmount", ess.getOnlinePlayers().size() - playerHidden, server.getMaxPlayers()); } return online; } @@ -137,7 +135,7 @@ public class PlayerList } if (users == null || users.isEmpty()) { - throw new Exception(tl("groupDoesNotExist")); + throw new Exception(I18n.tl("groupDoesNotExist")); } final StringBuilder displayGroupName = new StringBuilder(); displayGroupName.append(Character.toTitleCase(groupName.charAt(0))); @@ -149,7 +147,7 @@ public class PlayerList public static String outputFormat(final String group, final String message) { final StringBuilder outputString = new StringBuilder(); - outputString.append(tl("listGroupTag", FormatUtil.replaceFormat(group))); + outputString.append(I18n.tl("listGroupTag", FormatUtil.replaceFormat(group))); outputString.append(message); return outputString.toString(); } diff --git a/Essentials/src/com/earth2me/essentials/PlayerTarget.java b/Essentials/src/org/mcess/essentials/PlayerTarget.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/PlayerTarget.java rename to Essentials/src/org/mcess/essentials/PlayerTarget.java index 6fd714ca1..a65264b34 100644 --- a/Essentials/src/com/earth2me/essentials/PlayerTarget.java +++ b/Essentials/src/org/mcess/essentials/PlayerTarget.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/Potions.java b/Essentials/src/org/mcess/essentials/Potions.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/Potions.java rename to Essentials/src/org/mcess/essentials/Potions.java index 616225814..3c5bc21f7 100644 --- a/Essentials/src/com/earth2me/essentials/Potions.java +++ b/Essentials/src/org/mcess/essentials/Potions.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.NumberUtil; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/org/mcess/essentials/Settings.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/Settings.java rename to Essentials/src/org/mcess/essentials/Settings.java index b5a190017..85d4bdda2 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/org/mcess/essentials/Settings.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.commands.IEssentialsCommand; -import com.earth2me.essentials.signs.EssentialsSign; -import com.earth2me.essentials.signs.Signs; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.SimpleTextInput; -import com.earth2me.essentials.utils.FormatUtil; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.commands.IEssentialsCommand; +import org.mcess.essentials.signs.EssentialsSign; +import org.mcess.essentials.signs.Signs; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.SimpleTextInput; +import org.mcess.essentials.utils.FormatUtil; import java.io.File; import java.math.BigDecimal; import java.util.*; @@ -14,7 +14,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.ess3.api.IEssentials; import org.bukkit.ChatColor; -import org.bukkit.command.PluginCommand; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.MemoryConfiguration; import org.bukkit.event.EventPriority; diff --git a/Essentials/src/com/earth2me/essentials/SpawnMob.java b/Essentials/src/org/mcess/essentials/SpawnMob.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/SpawnMob.java rename to Essentials/src/org/mcess/essentials/SpawnMob.java index a191528dd..1bb4d6625 100644 --- a/Essentials/src/com/earth2me/essentials/SpawnMob.java +++ b/Essentials/src/org/mcess/essentials/SpawnMob.java @@ -1,9 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Mob.MobException; -import com.earth2me.essentials.utils.LocationUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.utils.LocationUtil; +import org.mcess.essentials.utils.StringUtil; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -34,7 +32,7 @@ public class SpawnMob } if (availableList.isEmpty()) { - availableList.add(tl("none")); + availableList.add(I18n.tl("none")); } return StringUtil.joinList(availableList); } @@ -88,7 +86,7 @@ public class SpawnMob final Block block = LocationUtil.getTarget(user.getBase()).getBlock(); if (block == null) { - throw new Exception(tl("unableToSpawnMob")); + throw new Exception(I18n.tl("unableToSpawnMob")); } spawnmob(ess, server, user.getSource(), user, block.getLocation(), parts, data, mobCount); } @@ -125,7 +123,7 @@ public class SpawnMob if (mobCount > effectiveLimit) { mobCount = effectiveLimit; - sender.sendMessage(tl("mobSpawnLimit")); + sender.sendMessage(I18n.tl("mobSpawnLimit")); } Mob mob = Mob.fromName(parts.get(0)); // Get the first mob @@ -135,19 +133,19 @@ public class SpawnMob { spawnMob(ess, server, sender, target, sloc, parts, data); } - sender.sendMessage(mobCount * parts.size() + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + tl("spawned")); + sender.sendMessage(mobCount * parts.size() + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + I18n.tl("spawned")); } - catch (MobException e1) + catch (Mob.MobException e1) { - throw new Exception(tl("unableToSpawnMob"), e1); + throw new Exception(I18n.tl("unableToSpawnMob"), e1); } catch (NumberFormatException e2) { - throw new Exception(tl("numberRequired"), e2); + throw new Exception(I18n.tl("numberRequired"), e2); } catch (NullPointerException np) { - throw new Exception(tl("soloMob"), np); + throw new Exception(I18n.tl("soloMob"), np); } } @@ -194,17 +192,17 @@ public class SpawnMob { if (mob == null) { - throw new Exception(tl("invalidMob")); + throw new Exception(I18n.tl("invalidMob")); } if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH))) { - throw new Exception(tl("disabledToSpawnMob")); + throw new Exception(I18n.tl("disabledToSpawnMob")); } if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase(Locale.ENGLISH))) { - throw new Exception(tl("noPermToSpawnMob")); + throw new Exception(I18n.tl("noPermToSpawnMob")); } } @@ -214,7 +212,7 @@ public class SpawnMob if (data.isEmpty()) { - sender.sendMessage(tl("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned)))); + sender.sendMessage(I18n.tl("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned)))); } if (spawned instanceof Zombie) diff --git a/Essentials/src/com/earth2me/essentials/TNTExplodeListener.java b/Essentials/src/org/mcess/essentials/TNTExplodeListener.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/TNTExplodeListener.java rename to Essentials/src/org/mcess/essentials/TNTExplodeListener.java index 2318347c8..e0211d6a2 100644 --- a/Essentials/src/com/earth2me/essentials/TNTExplodeListener.java +++ b/Essentials/src/org/mcess/essentials/TNTExplodeListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import net.ess3.api.IEssentials; import org.bukkit.entity.LivingEntity; diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/org/mcess/essentials/Teleport.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/Teleport.java rename to Essentials/src/org/mcess/essentials/Teleport.java index 4858ad423..7bba11069 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/org/mcess/essentials/Teleport.java @@ -1,8 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.LocationUtil; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.LocationUtil; import java.math.BigDecimal; import java.util.Calendar; import java.util.GregorianCalendar; @@ -54,7 +53,7 @@ public class Teleport implements net.ess3.api.ITeleport time.setTimeInMillis(lastTime); time.add(Calendar.SECOND, (int)cooldown); time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0)); - throw new Exception(tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis()))); + throw new Exception(I18n.tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis()))); } } // if justCheck is set, don't update lastTeleport; we're just checking @@ -69,7 +68,7 @@ public class Teleport implements net.ess3.api.ITeleport Calendar c = new GregorianCalendar(); c.add(Calendar.SECOND, (int)delay); c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0)); - user.sendMessage(tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis()))); + user.sendMessage(I18n.tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis()))); } //The now function is used when you want to skip tp delay when teleporting someone to a location or player. @@ -93,7 +92,7 @@ public class Teleport implements net.ess3.api.ITeleport } final ITarget target = new PlayerTarget(entity); now(teleportOwner, target, cause); - teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); + teleportOwner.sendMessage(I18n.tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); } protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception @@ -114,7 +113,7 @@ public class Teleport implements net.ess3.api.ITeleport } else { - throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + throw new Exception(I18n.tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } } else @@ -147,7 +146,7 @@ public class Teleport implements net.ess3.api.ITeleport public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception { ITarget target = new PlayerTarget(entity); - teleportOwner.sendMessage(tl("teleportToPlayer", entity.getDisplayName())); + teleportOwner.sendMessage(I18n.tl("teleportToPlayer", entity.getDisplayName())); teleport(teleportOwner, target, chargeFor, cause); } @@ -164,8 +163,8 @@ public class Teleport implements net.ess3.api.ITeleport { ITarget target = new PlayerTarget(entity); teleport(teleportee, target, chargeFor, cause); - teleportee.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); - teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); + teleportee.sendMessage(I18n.tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); + teleportOwner.sendMessage(I18n.tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); } private void teleport(IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception @@ -255,10 +254,10 @@ public class Teleport implements net.ess3.api.ITeleport public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception { Location loc = ess.getWarps().getWarp(warp); - teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + teleportee.sendMessage(I18n.tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); if (!teleportee.equals(teleportOwner)) { - teleportOwner.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + teleportOwner.sendMessage(I18n.tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } teleport(teleportee, new LocationTarget(loc), chargeFor, cause); } @@ -268,7 +267,7 @@ public class Teleport implements net.ess3.api.ITeleport public void back(Trade chargeFor) throws Exception { final Location loc = teleportOwner.getLastLocation(); - teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + teleportOwner.sendMessage(I18n.tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); teleport(teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND); } diff --git a/Essentials/src/com/earth2me/essentials/TimedTeleport.java b/Essentials/src/org/mcess/essentials/TimedTeleport.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/TimedTeleport.java rename to Essentials/src/org/mcess/essentials/TimedTeleport.java index e426c1cec..923602715 100644 --- a/Essentials/src/com/earth2me/essentials/TimedTeleport.java +++ b/Essentials/src/org/mcess/essentials/TimedTeleport.java @@ -1,6 +1,5 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; import java.util.UUID; import net.ess3.api.IEssentials; import net.ess3.api.IUser; @@ -105,16 +104,16 @@ public class TimedTeleport implements Runnable } catch (Exception ex) { - teleportOwner.sendMessage(tl("cooldownWithMessage", ex.getMessage())); + teleportOwner.sendMessage(I18n.tl("cooldownWithMessage", ex.getMessage())); if (teleportOwner != teleportUser) { - teleportUser.sendMessage(tl("cooldownWithMessage", ex.getMessage())); + teleportUser.sendMessage(I18n.tl("cooldownWithMessage", ex.getMessage())); } } try { cancelTimer(false); - teleportUser.sendMessage(tl("teleportationCommencing")); + teleportUser.sendMessage(I18n.tl("teleportationCommencing")); try { @@ -162,10 +161,10 @@ public class TimedTeleport implements Runnable ess.getServer().getScheduler().cancelTask(timer_task); if (notifyUser) { - teleportOwner.sendMessage(tl("pendingTeleportCancelled")); + teleportOwner.sendMessage(I18n.tl("pendingTeleportCancelled")); if (timer_teleportee != null && !timer_teleportee.equals(teleportOwner.getBase().getUniqueId())) { - ess.getUser(timer_teleportee).sendMessage(tl("pendingTeleportCancelled")); + ess.getUser(timer_teleportee).sendMessage(I18n.tl("pendingTeleportCancelled")); } } } diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/org/mcess/essentials/Trade.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/Trade.java rename to Essentials/src/org/mcess/essentials/Trade.java index c5298a4b1..6a4bc6b0b 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/org/mcess/essentials/Trade.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -import com.earth2me.essentials.craftbukkit.SetExpFix; -import com.earth2me.essentials.utils.NumberUtil; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.craftbukkit.InventoryWorkaround; +import org.mcess.essentials.craftbukkit.SetExpFix; +import org.mcess.essentials.utils.NumberUtil; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -58,7 +58,7 @@ public class Trade } @Deprecated - public Trade(final double money, final com.earth2me.essentials.IEssentials ess) + public Trade(final double money, final org.mcess.essentials.IEssentials ess) { this(null, null, BigDecimal.valueOf(money), null, null, (IEssentials)ess); } diff --git a/Essentials/src/com/earth2me/essentials/UUIDMap.java b/Essentials/src/org/mcess/essentials/UUIDMap.java similarity index 99% rename from Essentials/src/com/earth2me/essentials/UUIDMap.java rename to Essentials/src/org/mcess/essentials/UUIDMap.java index e77a9149d..5ce38f395 100644 --- a/Essentials/src/com/earth2me/essentials/UUIDMap.java +++ b/Essentials/src/org/mcess/essentials/UUIDMap.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import com.google.common.io.Files; import java.io.BufferedReader; diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/org/mcess/essentials/User.java similarity index 92% rename from Essentials/src/com/earth2me/essentials/User.java rename to Essentials/src/org/mcess/essentials/User.java index 41a32e529..cb2c6f4e4 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/org/mcess/essentials/User.java @@ -1,12 +1,11 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.commands.IEssentialsCommand; -import com.earth2me.essentials.register.payment.Method; -import com.earth2me.essentials.register.payment.Methods; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.FormatUtil; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.commands.IEssentialsCommand; +import org.mcess.essentials.register.payment.Method; +import org.mcess.essentials.register.payment.Methods; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import java.util.Calendar; import java.util.GregorianCalendar; @@ -129,7 +128,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0)); if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass")) { - throw new Exception(tl("timeBeforeHeal", DateUtil.formatDateDiff(cooldownTime.getTimeInMillis()))); + throw new Exception(I18n.tl("timeBeforeHeal", DateUtil.formatDateDiff(cooldownTime.getTimeInMillis()))); } } setLastHealTimestamp(now.getTimeInMillis()); @@ -149,10 +148,10 @@ public class User extends UserData implements Comparable, IReplyTo, net.es return; } setMoney(getMoney().add(value)); - sendMessage(tl("addedToAccount", NumberUtil.displayCurrency(value, ess))); + sendMessage(I18n.tl("addedToAccount", NumberUtil.displayCurrency(value, ess))); if (initiator != null) { - initiator.sendMessage(tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess))); + initiator.sendMessage(I18n.tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess))); } } @@ -167,12 +166,12 @@ public class User extends UserData implements Comparable, IReplyTo, net.es { setMoney(getMoney().subtract(value)); reciever.setMoney(reciever.getMoney().add(value)); - sendMessage(tl("moneySentTo", NumberUtil.displayCurrency(value, ess), reciever.getDisplayName())); - reciever.sendMessage(tl("moneyRecievedFrom", NumberUtil.displayCurrency(value, ess), getDisplayName())); + sendMessage(I18n.tl("moneySentTo", NumberUtil.displayCurrency(value, ess), reciever.getDisplayName())); + reciever.sendMessage(I18n.tl("moneyRecievedFrom", NumberUtil.displayCurrency(value, ess), getDisplayName())); } else { - throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(value, ess))); + throw new ChargeException(I18n.tl("notEnoughMoney", NumberUtil.displayCurrency(value, ess))); } } @@ -197,10 +196,10 @@ public class User extends UserData implements Comparable, IReplyTo, net.es { ess.getLogger().log(Level.WARNING, "Invalid call to takeMoney, total balance can't be more than the max-money limit.", ex); } - sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(value, ess))); + sendMessage(I18n.tl("takenFromAccount", NumberUtil.displayCurrency(value, ess))); if (initiator != null) { - initiator.sendMessage(tl("takenFromOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess))); + initiator.sendMessage(I18n.tl("takenFromOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess))); } } @@ -560,7 +559,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es { setJailTimeout(0); setJailed(false); - sendMessage(tl("haveBeenReleased")); + sendMessage(I18n.tl("haveBeenReleased")); setJail(null); try { @@ -587,7 +586,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted()) { setMuteTimeout(0); - sendMessage(tl("canTalkAgain")); + sendMessage(I18n.tl("canTalkAgain")); setMuted(false); return true; } @@ -602,7 +601,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es if (broadcast && !isHidden()) { setDisplayNick(); - final String msg = tl("userIsNotAway", getDisplayName()); + final String msg = I18n.tl("userIsNotAway", getDisplayName()); if (!msg.isEmpty()) { ess.broadcastMessage(this, msg); @@ -618,7 +617,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis() && !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt")) { - final String kickReason = tl("autoAfkKickReason", autoafkkick / 60.0); + final String kickReason = I18n.tl("autoAfkKickReason", autoafkkick / 60.0); lastActivity = 0; this.getBase().kickPlayer(kickReason); @@ -627,7 +626,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es { if (user.isAuthorized("essentials.kick.notify")) { - user.sendMessage(tl("playerKicked", Console.NAME, getName(), kickReason)); + user.sendMessage(I18n.tl("playerKicked", Console.NAME, getName(), kickReason)); } } } @@ -638,7 +637,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es if (!isHidden()) { setDisplayNick(); - final String msg = tl("userIsAway", getDisplayName()); + final String msg = I18n.tl("userIsAway", getDisplayName()); if (!msg.isEmpty()) { ess.broadcastMessage(this, msg); diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/org/mcess/essentials/UserData.java similarity index 99% rename from Essentials/src/com/earth2me/essentials/UserData.java rename to Essentials/src/org/mcess/essentials/UserData.java index 6aaf7d756..30e5b772e 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/org/mcess/essentials/UserData.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.StringUtil; import java.io.File; import java.math.BigDecimal; import java.util.*; diff --git a/Essentials/src/com/earth2me/essentials/UserMap.java b/Essentials/src/org/mcess/essentials/UserMap.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/UserMap.java rename to Essentials/src/org/mcess/essentials/UserMap.java index a53731599..4afb6b57b 100644 --- a/Essentials/src/com/earth2me/essentials/UserMap.java +++ b/Essentials/src/org/mcess/essentials/UserMap.java @@ -1,12 +1,9 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.utils.StringUtil; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; -import com.google.common.cache.RemovalCause; -import com.google.common.cache.RemovalListener; -import com.google.common.cache.RemovalNotification; import com.google.common.util.concurrent.UncheckedExecutionException; import java.io.File; import java.util.ArrayList; diff --git a/Essentials/src/com/earth2me/essentials/Warps.java b/Essentials/src/org/mcess/essentials/Warps.java similarity index 89% rename from Essentials/src/com/earth2me/essentials/Warps.java rename to Essentials/src/org/mcess/essentials/Warps.java index 3e0f93a55..504d12619 100644 --- a/Essentials/src/com/earth2me/essentials/Warps.java +++ b/Essentials/src/org/mcess/essentials/Warps.java @@ -1,8 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.commands.WarpNotFoundException; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.commands.WarpNotFoundException; +import org.mcess.essentials.utils.StringUtil; import java.io.File; import java.io.IOException; import java.util.*; @@ -71,7 +70,7 @@ public class Warps implements IConf, net.ess3.api.IWarps File confFile = new File(warpsFolder, filename + ".yml"); if (confFile.exists()) { - throw new Exception(tl("similarWarpExist")); + throw new Exception(I18n.tl("similarWarpExist")); } conf = new EssentialsConf(confFile); warpPoints.put(new StringIgnoreCase(name), conf); @@ -84,7 +83,7 @@ public class Warps implements IConf, net.ess3.api.IWarps } catch (IOException ex) { - throw new IOException(tl("invalidWarpName")); + throw new IOException(I18n.tl("invalidWarpName")); } } @@ -94,11 +93,11 @@ public class Warps implements IConf, net.ess3.api.IWarps EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name)); if (conf == null) { - throw new Exception(tl("warpNotExist")); + throw new Exception(I18n.tl("warpNotExist")); } if (!conf.getFile().delete()) { - throw new Exception(tl("warpDeleteError")); + throw new Exception(I18n.tl("warpDeleteError")); } warpPoints.remove(new StringIgnoreCase(name)); } @@ -127,7 +126,7 @@ public class Warps implements IConf, net.ess3.api.IWarps } catch (Exception ex) { - logger.log(Level.WARNING, tl("loadWarpError", filename), ex); + logger.log(Level.WARNING, I18n.tl("loadWarpError", filename), ex); } } } diff --git a/Essentials/src/com/earth2me/essentials/Worth.java b/Essentials/src/org/mcess/essentials/Worth.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/Worth.java rename to Essentials/src/org/mcess/essentials/Worth.java index 91394a35a..ef97d1790 100644 --- a/Essentials/src/com/earth2me/essentials/Worth.java +++ b/Essentials/src/org/mcess/essentials/Worth.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.commands.NotEnoughArgumentsException; import java.io.File; import java.math.BigDecimal; import java.util.Locale; -import java.util.logging.Logger; + import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/api/Economy.java b/Essentials/src/org/mcess/essentials/api/Economy.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/api/Economy.java rename to Essentials/src/org/mcess/essentials/api/Economy.java index 35c733ae0..370ab78f2 100644 --- a/Essentials/src/com/earth2me/essentials/api/Economy.java +++ b/Essentials/src/org/mcess/essentials/api/Economy.java @@ -1,22 +1,19 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; -import com.earth2me.essentials.EssentialsConf; -import com.earth2me.essentials.EssentialsUserConf; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import static com.earth2me.essentials.api.Economy.add; -import static com.earth2me.essentials.api.Economy.divide; -import static com.earth2me.essentials.api.Economy.format; -import static com.earth2me.essentials.api.Economy.getMoneyExact; -import static com.earth2me.essentials.api.Economy.hasEnough; -import static com.earth2me.essentials.api.Economy.hasLess; -import static com.earth2me.essentials.api.Economy.hasMore; -import static com.earth2me.essentials.api.Economy.multiply; -import static com.earth2me.essentials.api.Economy.setMoney; -import static com.earth2me.essentials.api.Economy.substract; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.EssentialsUserConf; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import static org.mcess.essentials.api.Economy.add; +import static org.mcess.essentials.api.Economy.divide; +import static org.mcess.essentials.api.Economy.format; +import static org.mcess.essentials.api.Economy.hasEnough; +import static org.mcess.essentials.api.Economy.hasLess; +import static org.mcess.essentials.api.Economy.hasMore; +import static org.mcess.essentials.api.Economy.multiply; +import static org.mcess.essentials.api.Economy.setMoney; + +import org.mcess.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.StringUtil; import com.google.common.base.Charsets; import java.io.File; import java.math.BigDecimal; diff --git a/Essentials/src/com/earth2me/essentials/api/II18n.java b/Essentials/src/org/mcess/essentials/api/II18n.java similarity index 84% rename from Essentials/src/com/earth2me/essentials/api/II18n.java rename to Essentials/src/org/mcess/essentials/api/II18n.java index 6845ba8d1..df9c3c014 100644 --- a/Essentials/src/com/earth2me/essentials/api/II18n.java +++ b/Essentials/src/org/mcess/essentials/api/II18n.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/api/IItemDb.java b/Essentials/src/org/mcess/essentials/api/IItemDb.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/api/IItemDb.java rename to Essentials/src/org/mcess/essentials/api/IItemDb.java index a1da6dd8e..b35c65638 100644 --- a/Essentials/src/com/earth2me/essentials/api/IItemDb.java +++ b/Essentials/src/org/mcess/essentials/api/IItemDb.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import java.util.List; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/api/IJails.java b/Essentials/src/org/mcess/essentials/api/IJails.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/api/IJails.java rename to Essentials/src/org/mcess/essentials/api/IJails.java index ea45ea73a..9ec2c1cbf 100644 --- a/Essentials/src/com/earth2me/essentials/api/IJails.java +++ b/Essentials/src/org/mcess/essentials/api/IJails.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; import java.util.Collection; import net.ess3.api.IUser; diff --git a/Essentials/src/com/earth2me/essentials/api/IReload.java b/Essentials/src/org/mcess/essentials/api/IReload.java similarity index 56% rename from Essentials/src/com/earth2me/essentials/api/IReload.java rename to Essentials/src/org/mcess/essentials/api/IReload.java index 75403b55c..d214dc52b 100644 --- a/Essentials/src/com/earth2me/essentials/api/IReload.java +++ b/Essentials/src/org/mcess/essentials/api/IReload.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; public interface IReload diff --git a/Essentials/src/com/earth2me/essentials/api/ITeleport.java b/Essentials/src/org/mcess/essentials/api/ITeleport.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/api/ITeleport.java rename to Essentials/src/org/mcess/essentials/api/ITeleport.java index a14f4a5e1..fd57e77d2 100644 --- a/Essentials/src/com/earth2me/essentials/api/ITeleport.java +++ b/Essentials/src/org/mcess/essentials/api/ITeleport.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; -import com.earth2me.essentials.Trade; +import org.mcess.essentials.Trade; import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/api/IWarps.java b/Essentials/src/org/mcess/essentials/api/IWarps.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/api/IWarps.java rename to Essentials/src/org/mcess/essentials/api/IWarps.java index 705822d8e..4ab367140 100644 --- a/Essentials/src/com/earth2me/essentials/api/IWarps.java +++ b/Essentials/src/org/mcess/essentials/api/IWarps.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; -import com.earth2me.essentials.IConf; -import com.earth2me.essentials.commands.WarpNotFoundException; +import org.mcess.essentials.IConf; +import org.mcess.essentials.commands.WarpNotFoundException; import java.io.File; import java.util.Collection; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java b/Essentials/src/org/mcess/essentials/api/InvalidNameException.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/api/InvalidNameException.java rename to Essentials/src/org/mcess/essentials/api/InvalidNameException.java index b62a74ce3..e34b22865 100644 --- a/Essentials/src/com/earth2me/essentials/api/InvalidNameException.java +++ b/Essentials/src/org/mcess/essentials/api/InvalidNameException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; public class InvalidNameException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/api/InvalidWorldException.java b/Essentials/src/org/mcess/essentials/api/InvalidWorldException.java similarity index 74% rename from Essentials/src/com/earth2me/essentials/api/InvalidWorldException.java rename to Essentials/src/org/mcess/essentials/api/InvalidWorldException.java index e5b87464c..22a96dad3 100644 --- a/Essentials/src/com/earth2me/essentials/api/InvalidWorldException.java +++ b/Essentials/src/org/mcess/essentials/api/InvalidWorldException.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; public class InvalidWorldException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java b/Essentials/src/org/mcess/essentials/api/NoLoanPermittedException.java similarity index 71% rename from Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java rename to Essentials/src/org/mcess/essentials/api/NoLoanPermittedException.java index 234369f3d..a18e4b12f 100644 --- a/Essentials/src/com/earth2me/essentials/api/NoLoanPermittedException.java +++ b/Essentials/src/org/mcess/essentials/api/NoLoanPermittedException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.api; +package org.mcess.essentials.api; public class NoLoanPermittedException extends net.ess3.api.NoLoanPermittedException diff --git a/Essentials/src/org/mcess/essentials/api/UserDoesNotExistException.java b/Essentials/src/org/mcess/essentials/api/UserDoesNotExistException.java new file mode 100644 index 000000000..149cc710b --- /dev/null +++ b/Essentials/src/org/mcess/essentials/api/UserDoesNotExistException.java @@ -0,0 +1,12 @@ +package org.mcess.essentials.api; + +import org.mcess.essentials.I18n; + + +public class UserDoesNotExistException extends Exception +{ + public UserDoesNotExistException(String name) + { + super(I18n.tl("userDoesNotExist", name)); + } +} diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/org/mcess/essentials/commands/Commandafk.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/commands/Commandafk.java rename to Essentials/src/org/mcess/essentials/commands/Commandafk.java index 0052677b5..89896e12d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandafk.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandafk extends EssentialsCommand @@ -50,7 +50,7 @@ public class Commandafk extends EssentialsCommand //user.sendMessage(_("markedAsNotAway")); if (!user.isHidden()) { - msg = tl("userIsNotAway", user.getDisplayName()); + msg = I18n.tl("userIsNotAway", user.getDisplayName()); } user.updateActivity(false); } @@ -59,7 +59,7 @@ public class Commandafk extends EssentialsCommand //user.sendMessage(_("markedAsAway")); if (!user.isHidden()) { - msg = tl("userIsAway", user.getDisplayName()); + msg = I18n.tl("userIsAway", user.getDisplayName()); } } if (!msg.isEmpty()) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java b/Essentials/src/org/mcess/essentials/commands/Commandantioch.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/commands/Commandantioch.java rename to Essentials/src/org/mcess/essentials/commands/Commandantioch.java index c9b7e54ed..cc09f5da3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandantioch.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.LocationUtil; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.entity.TNTPrimed; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/org/mcess/essentials/commands/Commandback.java similarity index 68% rename from Essentials/src/com/earth2me/essentials/commands/Commandback.java rename to Essentials/src/org/mcess/essentials/commands/Commandback.java index 5db82d048..c2fdfc119 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandback.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandback extends EssentialsCommand @@ -18,12 +18,12 @@ public class Commandback extends EssentialsCommand { if (user.getLastLocation() == null) { - throw new Exception(tl("noLocationFound")); + throw new Exception(I18n.tl("noLocationFound")); } if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName())); } final Trade charge = new Trade(this.getName(), ess); charge.isAffordableFor(user); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/org/mcess/essentials/commands/Commandbalance.java similarity index 61% rename from Essentials/src/com/earth2me/essentials/commands/Commandbalance.java rename to Essentials/src/org/mcess/essentials/commands/Commandbalance.java index 5015c3574..495159555 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandbalance.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandbalance extends EssentialsCommand @@ -24,7 +24,7 @@ public class Commandbalance extends EssentialsCommand } User target = getPlayer(server, args, 0, true, true); - sender.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess))); + sender.sendMessage(I18n.tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess))); } @Override @@ -34,12 +34,12 @@ public class Commandbalance extends EssentialsCommand { final User target = getPlayer(server, args, 0, true, true); final BigDecimal bal = target.getMoney(); - user.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(bal, ess))); + user.sendMessage(I18n.tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(bal, ess))); } else if (args.length < 2) { final BigDecimal bal = user.getMoney(); - user.sendMessage(tl("balance", NumberUtil.displayCurrency(bal, ess))); + user.sendMessage(I18n.tl("balance", NumberUtil.displayCurrency(bal, ess))); } else { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/org/mcess/essentials/commands/Commandbalancetop.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java rename to Essentials/src/org/mcess/essentials/commands/Commandbalancetop.java index 41f78ad11..370228eea 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandbalancetop.java @@ -1,17 +1,17 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.textreader.SimpleTextInput; -import com.earth2me.essentials.textreader.TextPager; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.textreader.SimpleTextInput; +import org.mcess.essentials.textreader.TextPager; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import java.text.DateFormat; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandbalancetop extends EssentialsCommand @@ -58,7 +58,7 @@ public class Commandbalancetop extends EssentialsCommand } if (ess.getUserMap().getUniqueUsers() > MINUSERS) { - sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers())); + sender.sendMessage(I18n.tl("orderBalances", ess.getUserMap().getUniqueUsers())); } } finally @@ -71,7 +71,7 @@ public class Commandbalancetop extends EssentialsCommand { if (ess.getUserMap().getUniqueUsers() > MINUSERS) { - sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers())); + sender.sendMessage(I18n.tl("orderBalances", ess.getUserMap().getUniqueUsers())); } ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force)); } @@ -83,7 +83,7 @@ public class Commandbalancetop extends EssentialsCommand final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(cacheage); final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - sender.sendMessage(tl("balanceTop", format.format(cal.getTime()))); + sender.sendMessage(I18n.tl("balanceTop", format.format(cal.getTime()))); new TextPager(cache).showPage(Integer.toString(page), null, "balancetop", sender); } @@ -143,7 +143,7 @@ public class Commandbalancetop extends EssentialsCommand } }); - cache.getLines().add(tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess))); + cache.getLines().add(I18n.tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess))); int pos = 1; for (Map.Entry entry : sortedEntries) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/org/mcess/essentials/commands/Commandban.java similarity index 62% rename from Essentials/src/com/earth2me/essentials/commands/Commandban.java rename to Essentials/src/org/mcess/essentials/commands/Commandban.java index 7a594c8d2..726752969 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandban.java @@ -1,15 +1,14 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.OfflinePlayer; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.OfflinePlayer; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.logging.Level; import org.bukkit.BanList; -import org.bukkit.Bukkit; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandban extends EssentialsCommand @@ -41,14 +40,14 @@ public class Commandban extends EssentialsCommand { if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline")) { - throw new Exception(tl("banExemptOffline")); + throw new Exception(I18n.tl("banExemptOffline")); } } else { if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer()) { - throw new Exception(tl("banExempt")); + throw new Exception(I18n.tl("banExempt")); } } @@ -60,21 +59,21 @@ public class Commandban extends EssentialsCommand } else { - banReason = tl("defaultBanReason"); + banReason = I18n.tl("defaultBanReason"); } ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, null, senderName); - String banDisplay = tl("banFormat", banReason, senderName); + String banDisplay = I18n.tl("banFormat", banReason, senderName); user.getBase().kickPlayer(banDisplay); - server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banDisplay)); + server.getLogger().log(Level.INFO, I18n.tl("playerBanned", senderName, user.getName(), banDisplay)); if (nomatch) { - sender.sendMessage(tl("userUnknown", user.getName())); + sender.sendMessage(I18n.tl("userUnknown", user.getName())); } - ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason)); + ess.broadcastMessage("essentials.ban.notify", I18n.tl("playerBanned", senderName, user.getName(), banReason)); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java b/Essentials/src/org/mcess/essentials/commands/Commandbanip.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/commands/Commandbanip.java rename to Essentials/src/org/mcess/essentials/commands/Commandbanip.java index f538ba4ae..a5b816791 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandbanip.java @@ -1,13 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.logging.Level; import org.bukkit.BanList; -import org.bukkit.Bukkit; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbook.java b/Essentials/src/org/mcess/essentials/commands/Commandbook.java similarity index 78% rename from Essentials/src/com/earth2me/essentials/commands/Commandbook.java rename to Essentials/src/org/mcess/essentials/commands/Commandbook.java index 9b602c357..ce0deba44 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbook.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandbook.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; +import org.mcess.essentials.I18n; public class Commandbook extends EssentialsCommand @@ -31,11 +31,11 @@ public class Commandbook extends EssentialsCommand { bmeta.setAuthor(args[1]); item.setItemMeta(bmeta); - user.sendMessage(tl("bookAuthorSet", getFinalArg(args, 1))); + user.sendMessage(I18n.tl("bookAuthorSet", getFinalArg(args, 1))); } else { - throw new Exception(tl("denyChangeAuthor")); + throw new Exception(I18n.tl("denyChangeAuthor")); } } else if (args.length > 1 && args[0].equalsIgnoreCase("title")) @@ -44,11 +44,11 @@ public class Commandbook extends EssentialsCommand { bmeta.setTitle(args[1]); item.setItemMeta(bmeta); - user.sendMessage(tl("bookTitleSet", getFinalArg(args, 1))); + user.sendMessage(I18n.tl("bookTitleSet", getFinalArg(args, 1))); } else { - throw new Exception(tl("denyChangeTitle")); + throw new Exception(I18n.tl("denyChangeTitle")); } } else @@ -58,11 +58,11 @@ public class Commandbook extends EssentialsCommand ItemStack newItem = new ItemStack(Material.BOOK_AND_QUILL, item.getAmount()); newItem.setItemMeta(bmeta); user.getBase().setItemInHand(newItem); - user.sendMessage(tl("editBookContents")); + user.sendMessage(I18n.tl("editBookContents")); } else { - throw new Exception(tl("denyBookEdit")); + throw new Exception(I18n.tl("denyBookEdit")); } } } @@ -76,11 +76,11 @@ public class Commandbook extends EssentialsCommand ItemStack newItem = new ItemStack(Material.WRITTEN_BOOK, item.getAmount()); newItem.setItemMeta(bmeta); user.getBase().setItemInHand(newItem); - user.sendMessage(tl("bookLocked")); + user.sendMessage(I18n.tl("bookLocked")); } else { - throw new Exception(tl("holdBook")); + throw new Exception(I18n.tl("holdBook")); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java b/Essentials/src/org/mcess/essentials/commands/Commandbreak.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/commands/Commandbreak.java rename to Essentials/src/org/mcess/essentials/commands/Commandbreak.java index f4b4a6764..c32c6b5b7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbreak.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandbreak.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.block.Block; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java b/Essentials/src/org/mcess/essentials/commands/Commandbroadcast.java similarity index 67% rename from Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java rename to Essentials/src/org/mcess/essentials/commands/Commandbroadcast.java index 2b692b78b..a86a718a6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandbroadcast.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandbroadcast extends EssentialsCommand @@ -33,6 +33,6 @@ public class Commandbroadcast extends EssentialsCommand throw new NotEnoughArgumentsException(); } - ess.broadcastMessage(tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name)); + ess.broadcastMessage(I18n.tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name)); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java b/Essentials/src/org/mcess/essentials/commands/Commandburn.java similarity index 68% rename from Essentials/src/com/earth2me/essentials/commands/Commandburn.java rename to Essentials/src/org/mcess/essentials/commands/Commandburn.java index e9665a745..c562bcdca 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandburn.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandburn.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandburn extends EssentialsCommand @@ -28,6 +28,6 @@ public class Commandburn extends EssentialsCommand User user = getPlayer(server, sender, args, 0); user.getBase().setFireTicks(Integer.parseInt(args[1]) * 20); - sender.sendMessage(tl("burnMsg", user.getDisplayName(), Integer.parseInt(args[1]))); + sender.sendMessage(I18n.tl("burnMsg", user.getDisplayName(), Integer.parseInt(args[1]))); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/org/mcess/essentials/commands/Commandclearinventory.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java rename to Essentials/src/org/mcess/essentials/commands/Commandclearinventory.java index 311cb3e13..d9214293b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandclearinventory.java @@ -1,15 +1,15 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import java.util.ArrayList; import java.util.Collection; import java.util.Locale; import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; public class Commandclearinventory extends EssentialsCommand @@ -45,7 +45,7 @@ public class Commandclearinventory extends EssentialsCommand if (allowAll && args.length > 0 && args[0].contentEquals("*")) { - sender.sendMessage(tl("inventoryClearingFromAll")); + sender.sendMessage(I18n.tl("inventoryClearingFromAll")); offset = 1; players = ess.getOnlinePlayers(); } @@ -102,7 +102,7 @@ public class Commandclearinventory extends EssentialsCommand { if (showExtended) { - sender.sendMessage(tl("inventoryClearingAllItems", player.getDisplayName())); + sender.sendMessage(I18n.tl("inventoryClearingAllItems", player.getDisplayName())); } player.getInventory().clear(); } @@ -110,7 +110,7 @@ public class Commandclearinventory extends EssentialsCommand { if (showExtended) { - sender.sendMessage(tl("inventoryClearingAllArmor", player.getDisplayName())); + sender.sendMessage(I18n.tl("inventoryClearingAllArmor", player.getDisplayName())); } player.getInventory().clear(); player.getInventory().setArmorContents(null); @@ -122,7 +122,7 @@ public class Commandclearinventory extends EssentialsCommand ItemStack stack = new ItemStack(type); if (showExtended) { - sender.sendMessage(tl("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); + sender.sendMessage(I18n.tl("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); } player.getInventory().clear(type, data); } @@ -133,7 +133,7 @@ public class Commandclearinventory extends EssentialsCommand final int removedAmount = (BASE_AMOUNT - removedStack.getAmount()); if (removedAmount > 0 || showExtended) { - sender.sendMessage(tl("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); + sender.sendMessage(I18n.tl("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); } } else @@ -145,14 +145,14 @@ public class Commandclearinventory extends EssentialsCommand ItemStack stack = new ItemStack(type, amount, data); if (player.getInventory().containsAtLeast(stack, amount)) { - sender.sendMessage(tl("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); + sender.sendMessage(I18n.tl("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); player.getInventory().removeItem(stack); } else { if (showExtended) { - sender.sendMessage(tl("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH))); + sender.sendMessage(I18n.tl("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH))); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java b/Essentials/src/org/mcess/essentials/commands/Commandcompass.java similarity index 81% rename from Essentials/src/com/earth2me/essentials/commands/Commandcompass.java rename to Essentials/src/org/mcess/essentials/commands/Commandcompass.java index 53dce03d1..1eefc61f2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandcompass.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandcompass.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandcompass extends EssentialsCommand @@ -53,6 +53,6 @@ public class Commandcompass extends EssentialsCommand { dir = "N"; } - user.sendMessage(tl("compassBearing", dir, bearing)); + user.sendMessage(I18n.tl("compassBearing", dir, bearing)); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcondense.java b/Essentials/src/org/mcess/essentials/commands/Commandcondense.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/commands/Commandcondense.java rename to Essentials/src/org/mcess/essentials/commands/Commandcondense.java index fd0408890..29d6bf3e8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandcondense.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandcondense.java @@ -1,19 +1,17 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; import java.util.*; import org.bukkit.Material; import org.bukkit.Server; -import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapelessRecipe; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.Trade.OverflowType; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.MaxMoneyException; +import org.mcess.essentials.I18n; public class Commandcondense extends EssentialsCommand @@ -59,11 +57,11 @@ public class Commandcondense extends EssentialsCommand if (didConvert) { - user.sendMessage(tl("itemsConverted")); + user.sendMessage(I18n.tl("itemsConverted")); } else { - user.sendMessage(tl("itemsNotConverted")); + user.sendMessage(I18n.tl("itemsNotConverted")); throw new NoChargeException(); } } @@ -113,7 +111,7 @@ public class Commandcondense extends EssentialsCommand final Trade remove = new Trade(input, ess); final Trade add = new Trade(result, ess); remove.charge(user); - add.pay(user, OverflowType.DROP); + add.pay(user, Trade.OverflowType.DROP); return true; } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java b/Essentials/src/org/mcess/essentials/commands/Commandcustomtext.java similarity index 72% rename from Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java rename to Essentials/src/org/mcess/essentials/commands/Commandcustomtext.java index 8f08e3ce0..9005f9910 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandcustomtext.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.TextInput; -import com.earth2me.essentials.textreader.TextPager; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.TextInput; +import org.mcess.essentials.textreader.TextPager; +import org.mcess.essentials.utils.NumberUtil; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java b/Essentials/src/org/mcess/essentials/commands/Commanddelhome.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java rename to Essentials/src/org/mcess/essentials/commands/Commanddelhome.java index 8459700a5..42d918482 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java +++ b/Essentials/src/org/mcess/essentials/commands/Commanddelhome.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import java.util.Locale; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java b/Essentials/src/org/mcess/essentials/commands/Commanddeljail.java similarity index 77% rename from Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java rename to Essentials/src/org/mcess/essentials/commands/Commanddeljail.java index 7b5937a09..ff5353227 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java +++ b/Essentials/src/org/mcess/essentials/commands/Commanddeljail.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java b/Essentials/src/org/mcess/essentials/commands/Commanddelwarp.java similarity index 77% rename from Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java rename to Essentials/src/org/mcess/essentials/commands/Commanddelwarp.java index 4fbf5f91c..be853e4c9 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java +++ b/Essentials/src/org/mcess/essentials/commands/Commanddelwarp.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java b/Essentials/src/org/mcess/essentials/commands/Commanddepth.java similarity index 60% rename from Essentials/src/com/earth2me/essentials/commands/Commanddepth.java rename to Essentials/src/org/mcess/essentials/commands/Commanddepth.java index b7d56b6a1..79d59535e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanddepth.java +++ b/Essentials/src/org/mcess/essentials/commands/Commanddepth.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commanddepth extends EssentialsCommand @@ -18,15 +18,15 @@ public class Commanddepth extends EssentialsCommand final int depth = user.getLocation().getBlockY() - 63; if (depth > 0) { - user.sendMessage(tl("depthAboveSea", depth)); + user.sendMessage(I18n.tl("depthAboveSea", depth)); } else if (depth < 0) { - user.sendMessage(tl("depthBelowSea", (-depth))); + user.sendMessage(I18n.tl("depthBelowSea", (-depth))); } else { - user.sendMessage(tl("depth")); + user.sendMessage(I18n.tl("depth")); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java b/Essentials/src/org/mcess/essentials/commands/Commandeco.java similarity index 76% rename from Essentials/src/com/earth2me/essentials/commands/Commandeco.java rename to Essentials/src/org/mcess/essentials/commands/Commandeco.java index f589dcfed..15db3425e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandeco.java @@ -1,14 +1,14 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import java.util.Locale; import net.ess3.api.MaxMoneyException; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandeco extends EssentialsLoopCommand @@ -47,11 +47,11 @@ public class Commandeco extends EssentialsLoopCommand { if (args[1].contentEquals("**")) { - server.broadcastMessage(tl("resetBalAll", NumberUtil.displayCurrency(amount, ess))); + server.broadcastMessage(I18n.tl("resetBalAll", NumberUtil.displayCurrency(amount, ess))); } else if (args[1].contentEquals("*")) { - server.broadcastMessage(tl("resetBal", NumberUtil.displayCurrency(amount, ess))); + server.broadcastMessage(I18n.tl("resetBal", NumberUtil.displayCurrency(amount, ess))); } } } @@ -94,11 +94,11 @@ public class Commandeco extends EssentialsLoopCommand { // Take shouldn't be able to throw a max money exception } - player.sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(player.getMoney(), ess))); + player.sendMessage(I18n.tl("takenFromAccount", NumberUtil.displayCurrency(player.getMoney(), ess))); } else { - throw new ChargeException(tl("insufficientFunds")); + throw new ChargeException(I18n.tl("insufficientFunds")); } } @@ -109,10 +109,10 @@ public class Commandeco extends EssentialsLoopCommand boolean underMinimum = (amount.compareTo(minBalance) < 0); boolean aboveMax = (amount.compareTo(maxBalance) > 0); player.setMoney(underMinimum ? minBalance : aboveMax ? maxBalance : amount); - player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess))); + player.sendMessage(I18n.tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess))); if (sender != null) { - sender.sendMessage(tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess))); + sender.sendMessage(I18n.tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess))); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/org/mcess/essentials/commands/Commandenchant.java similarity index 77% rename from Essentials/src/com/earth2me/essentials/commands/Commandenchant.java rename to Essentials/src/org/mcess/essentials/commands/Commandenchant.java index feb04e97b..3c59a5771 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandenchant.java @@ -1,10 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.Enchantments; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.MetaItemStack; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.Enchantments; +import org.mcess.essentials.MetaItemStack; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -13,6 +12,7 @@ import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; public class Commandenchant extends EssentialsCommand @@ -29,7 +29,7 @@ public class Commandenchant extends EssentialsCommand final ItemStack stack = user.getBase().getItemInHand(); if (stack == null || stack.getType() == Material.AIR) { - throw new Exception(tl("nothingInHand")); + throw new Exception(I18n.tl("nothingInHand")); } if (args.length == 0) { @@ -43,7 +43,7 @@ public class Commandenchant extends EssentialsCommand //enchantmentslist.add(enchantmentName); } } - throw new NotEnoughArgumentsException(tl("enchantments", StringUtil.joinList(enchantmentslist.toArray()))); + throw new NotEnoughArgumentsException(I18n.tl("enchantments", StringUtil.joinList(enchantmentslist.toArray()))); } int level = -1; @@ -70,11 +70,11 @@ public class Commandenchant extends EssentialsCommand final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); if (level == 0) { - user.sendMessage(tl("enchantmentRemoved", enchantmentName.replace('_', ' '))); + user.sendMessage(I18n.tl("enchantmentRemoved", enchantmentName.replace('_', ' '))); } else { - user.sendMessage(tl("enchantmentApplied", enchantmentName.replace('_', ' '))); + user.sendMessage(I18n.tl("enchantmentApplied", enchantmentName.replace('_', ' '))); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java b/Essentials/src/org/mcess/essentials/commands/Commandenderchest.java similarity index 89% rename from Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java rename to Essentials/src/org/mcess/essentials/commands/Commandenderchest.java index 94f27c42e..6a2c367d8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandenderchest.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/org/mcess/essentials/commands/Commandessentials.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/commands/Commandessentials.java rename to Essentials/src/org/mcess/essentials/commands/Commandessentials.java index 54f409b8e..d66e38cda 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandessentials.java @@ -1,13 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.EssentialsUpgrade; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.UserMap; -import com.earth2me.essentials.metrics.Metrics; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.EssentialsUpgrade; +import org.mcess.essentials.User; +import org.mcess.essentials.UserMap; +import org.mcess.essentials.metrics.Metrics; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.NumberUtil; import com.google.common.base.Charsets; import java.io.IOException; import java.util.HashMap; @@ -19,6 +18,7 @@ import org.bukkit.Server; import org.bukkit.Sound; import org.bukkit.block.Block; import org.bukkit.entity.Player; +import org.mcess.essentials.I18n; // This command has 4 undocumented behaviours #EasterEgg public class Commandessentials extends EssentialsCommand @@ -91,7 +91,7 @@ public class Commandessentials extends EssentialsCommand } if (disabledCommands.length() > 0) { - sender.sendMessage(tl("blockList")); + sender.sendMessage(I18n.tl("blockList")); sender.sendMessage(disabledCommands.toString()); } } @@ -116,7 +116,7 @@ public class Commandessentials extends EssentialsCommand private void run_reload(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { ess.reload(); - sender.sendMessage(tl("essentialsReload", ess.getDescription().getVersion())); + sender.sendMessage(I18n.tl("essentialsReload", ess.getDescription().getVersion())); } private void run_nya(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception @@ -267,7 +267,7 @@ public class Commandessentials extends EssentialsCommand sender.sendMessage("Unless you define larger default values, this command wil ignore people who have more than 0 money/homes."); throw new Exception("/ cleanup [money] [homes]"); } - sender.sendMessage(tl("cleaning")); + sender.sendMessage(I18n.tl("cleaning")); final long daysArg = Long.parseLong(args[1]); final double moneyArg = args.length >= 3 ? Double.parseDouble(args[2].replaceAll("[^0-9\\.]", "")) : 0; @@ -321,7 +321,7 @@ public class Commandessentials extends EssentialsCommand user.reset(); } - sender.sendMessage(tl("cleaned")); + sender.sendMessage(I18n.tl("cleaned")); } }); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandexp.java b/Essentials/src/org/mcess/essentials/commands/Commandexp.java similarity index 92% rename from Essentials/src/com/earth2me/essentials/commands/Commandexp.java rename to Essentials/src/org/mcess/essentials/commands/Commandexp.java index 3100c9708..cab6bdf75 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandexp.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandexp.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.SetExpFix; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.craftbukkit.SetExpFix; +import org.mcess.essentials.utils.NumberUtil; import java.util.List; import java.util.Locale; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandext.java b/Essentials/src/org/mcess/essentials/commands/Commandext.java similarity index 86% rename from Essentials/src/com/earth2me/essentials/commands/Commandext.java rename to Essentials/src/org/mcess/essentials/commands/Commandext.java index 8cba548ad..156777f05 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandext.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandext.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/org/mcess/essentials/commands/Commandfeed.java similarity index 86% rename from Essentials/src/com/earth2me/essentials/commands/Commandfeed.java rename to Essentials/src/org/mcess/essentials/commands/Commandfeed.java index 545475ed3..a9d688a5d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandfeed.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.event.entity.FoodLevelChangeEvent; +import org.mcess.essentials.I18n; public class Commandfeed extends EssentialsLoopCommand @@ -30,7 +30,7 @@ public class Commandfeed extends EssentialsLoopCommand } feedPlayer(user.getBase()); - user.sendMessage(tl("feed")); + user.sendMessage(I18n.tl("feed")); } @Override @@ -50,7 +50,7 @@ public class Commandfeed extends EssentialsLoopCommand try { feedPlayer(player.getBase()); - sender.sendMessage(tl("feedOther", player.getDisplayName())); + sender.sendMessage(I18n.tl("feedOther", player.getDisplayName())); } catch (QuietAbortException e) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfireball.java b/Essentials/src/org/mcess/essentials/commands/Commandfireball.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/commands/Commandfireball.java rename to Essentials/src/org/mcess/essentials/commands/Commandfireball.java index d4759802a..2ec220a47 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfireball.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandfireball.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.entity.*; import org.bukkit.util.Vector; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java b/Essentials/src/org/mcess/essentials/commands/Commandfirework.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/commands/Commandfirework.java rename to Essentials/src/org/mcess/essentials/commands/Commandfirework.java index f154a28bf..46ed6a29c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandfirework.java @@ -1,10 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.MetaItemStack; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; -import java.util.regex.Pattern; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.MetaItemStack; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import org.bukkit.FireworkEffect; import org.bukkit.Material; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java b/Essentials/src/org/mcess/essentials/commands/Commandfly.java similarity index 78% rename from Essentials/src/com/earth2me/essentials/commands/Commandfly.java rename to Essentials/src/org/mcess/essentials/commands/Commandfly.java index 790d351ab..32b49ca42 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandfly.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandfly extends EssentialsToggleCommand @@ -60,10 +60,10 @@ public class Commandfly extends EssentialsToggleCommand user.getBase().setFlying(false); } - user.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName())); + user.sendMessage(I18n.tl("flyMode", I18n.tl(enabled ? "enabled" : "disabled"), user.getDisplayName())); if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) { - sender.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName())); + sender.sendMessage(I18n.tl("flyMode", I18n.tl(enabled ? "enabled" : "disabled"), user.getDisplayName())); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/org/mcess/essentials/commands/Commandgamemode.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java rename to Essentials/src/org/mcess/essentials/commands/Commandgamemode.java index 4b91d0582..d578720de 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandgamemode.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import java.util.List; import java.util.Locale; import org.bukkit.GameMode; import org.bukkit.Server; import org.bukkit.entity.Player; +import org.mcess.essentials.I18n; public class Commandgamemode extends EssentialsCommand @@ -74,14 +74,14 @@ public class Commandgamemode extends EssentialsCommand gameMode = user.getBase().getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getBase().getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL; } user.getBase().setGameMode(gameMode); - user.sendMessage(tl("gameMode", tl(user.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName())); + user.sendMessage(I18n.tl("gameMode", I18n.tl(user.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName())); } private void gamemodeOtherPlayers(final Server server, final CommandSource sender, final GameMode gameMode, final String name) throws NotEnoughArgumentsException, PlayerNotFoundException { if (name.trim().length() < 2 || gameMode == null) { - throw new NotEnoughArgumentsException(tl("gameModeInvalid")); + throw new NotEnoughArgumentsException(I18n.tl("gameModeInvalid")); } boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).canInteractVanished(); @@ -96,7 +96,7 @@ public class Commandgamemode extends EssentialsCommand } foundUser = true; player.getBase().setGameMode(gameMode); - sender.sendMessage(tl("gameMode", tl(player.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName())); + sender.sendMessage(I18n.tl("gameMode", I18n.tl(player.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName())); } if (!foundUser) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java b/Essentials/src/org/mcess/essentials/commands/Commandgc.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/commands/Commandgc.java rename to Essentials/src/org/mcess/essentials/commands/Commandgc.java index db4432351..3575f32be 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandgc.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.NumberUtil; import java.lang.management.ManagementFactory; import java.util.List; import java.util.logging.Level; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java b/Essentials/src/org/mcess/essentials/commands/Commandgetpos.java similarity index 64% rename from Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java rename to Essentials/src/org/mcess/essentials/commands/Commandgetpos.java index f76d28e03..d9fb4041d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandgetpos.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Location; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandgetpos extends EssentialsCommand @@ -39,15 +39,15 @@ public class Commandgetpos extends EssentialsCommand private void outputPosition(final CommandSource sender, final Location coords, final Location distance) { - sender.sendMessage(tl("currentWorld", coords.getWorld().getName())); - sender.sendMessage(tl("posX", coords.getBlockX())); - sender.sendMessage(tl("posY", coords.getBlockY())); - sender.sendMessage(tl("posZ", coords.getBlockZ())); - sender.sendMessage(tl("posYaw", (coords.getYaw() + 180 + 360) % 360)); - sender.sendMessage(tl("posPitch", coords.getPitch())); + sender.sendMessage(I18n.tl("currentWorld", coords.getWorld().getName())); + sender.sendMessage(I18n.tl("posX", coords.getBlockX())); + sender.sendMessage(I18n.tl("posY", coords.getBlockY())); + sender.sendMessage(I18n.tl("posZ", coords.getBlockZ())); + sender.sendMessage(I18n.tl("posYaw", (coords.getYaw() + 180 + 360) % 360)); + sender.sendMessage(I18n.tl("posPitch", coords.getPitch())); if (distance != null && coords.getWorld().equals(distance.getWorld())) { - sender.sendMessage(tl("distance", coords.distance(distance))); + sender.sendMessage(I18n.tl("distance", coords.distance(distance))); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/org/mcess/essentials/commands/Commandgive.java similarity index 81% rename from Essentials/src/com/earth2me/essentials/commands/Commandgive.java rename to Essentials/src/org/mcess/essentials/commands/Commandgive.java index 8e8a6dfc4..04b1beb16 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandgive.java @@ -1,16 +1,16 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.MetaItemStack; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.MetaItemStack; +import org.mcess.essentials.User; +import org.mcess.essentials.craftbukkit.InventoryWorkaround; +import org.mcess.essentials.utils.NumberUtil; import java.util.Locale; import java.util.Map; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; public class Commandgive extends EssentialsCommand @@ -39,7 +39,7 @@ public class Commandgive extends EssentialsCommand : (!ess.getUser(sender.getPlayer()).isAuthorized("essentials.itemspawn.exempt") && !ess.getUser(sender.getPlayer()).canSpawnItem(stack.getTypeId())))) { - throw new Exception(tl("cantSpawnItem", itemname)); + throw new Exception(I18n.tl("cantSpawnItem", itemname)); } final User giveTo = getPlayer(server, sender, args, 0); @@ -72,7 +72,7 @@ public class Commandgive extends EssentialsCommand MetaItemStack metaStack = new MetaItemStack(stack); if (!metaStack.canSpawn(ess)) { - throw new Exception(tl("unableToSpawnItem", itemname)); + throw new Exception(I18n.tl("unableToSpawnItem", itemname)); } if (args.length > 3) @@ -95,11 +95,11 @@ public class Commandgive extends EssentialsCommand if (stack.getType() == Material.AIR) { - throw new Exception(tl("cantSpawnItem", "Air")); + throw new Exception(I18n.tl("cantSpawnItem", "Air")); } final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' '); - sender.sendMessage(tl("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName())); + sender.sendMessage(I18n.tl("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName())); Map leftovers; @@ -114,7 +114,7 @@ public class Commandgive extends EssentialsCommand for (ItemStack item : leftovers.values()) { - sender.sendMessage(tl("giveSpawnFailure", item.getAmount(), itemName, giveTo.getDisplayName())); + sender.sendMessage(I18n.tl("giveSpawnFailure", item.getAmount(), itemName, giveTo.getDisplayName())); } giveTo.getBase().updateInventory(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/org/mcess/essentials/commands/Commandgod.java similarity index 82% rename from Essentials/src/com/earth2me/essentials/commands/Commandgod.java rename to Essentials/src/org/mcess/essentials/commands/Commandgod.java index b758f6493..22bb16c1a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandgod.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import net.ess3.api.events.GodStatusChangeEvent; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandgod extends EssentialsToggleCommand @@ -66,10 +66,10 @@ public class Commandgod extends EssentialsToggleCommand user.getBase().setFoodLevel(20); } - user.sendMessage(tl("godMode", enabled ? tl("enabled") : tl("disabled"))); + user.sendMessage(I18n.tl("godMode", enabled ? I18n.tl("enabled") : I18n.tl("disabled"))); if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) { - sender.sendMessage(tl("godMode", tl(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName()))); + sender.sendMessage(I18n.tl("godMode", I18n.tl(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName()))); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhat.java b/Essentials/src/org/mcess/essentials/commands/Commandhat.java similarity index 76% rename from Essentials/src/com/earth2me/essentials/commands/Commandhat.java rename to Essentials/src/org/mcess/essentials/commands/Commandhat.java index 4f042ba60..4e1192432 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhat.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandhat.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; +import org.mcess.essentials.User; +import org.mcess.essentials.craftbukkit.InventoryWorkaround; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; +import org.mcess.essentials.I18n; public class Commandhat extends EssentialsCommand @@ -25,14 +25,14 @@ public class Commandhat extends EssentialsCommand final ItemStack head = inv.getHelmet(); if (head == null || head.getType() == Material.AIR) { - user.sendMessage(tl("hatEmpty")); + user.sendMessage(I18n.tl("hatEmpty")); } else { final ItemStack air = new ItemStack(Material.AIR); inv.setHelmet(air); InventoryWorkaround.addItems(user.getBase().getInventory(), head); - user.sendMessage(tl("hatRemoved")); + user.sendMessage(I18n.tl("hatRemoved")); } } else @@ -46,16 +46,16 @@ public class Commandhat extends EssentialsCommand final ItemStack head = inv.getHelmet(); inv.setHelmet(hand); inv.setItemInHand(head); - user.sendMessage(tl("hatPlaced")); + user.sendMessage(I18n.tl("hatPlaced")); } else { - user.sendMessage(tl("hatArmor")); + user.sendMessage(I18n.tl("hatArmor")); } } else { - user.sendMessage(tl("hatFail")); + user.sendMessage(I18n.tl("hatFail")); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java b/Essentials/src/org/mcess/essentials/commands/Commandheal.java similarity index 92% rename from Essentials/src/com/earth2me/essentials/commands/Commandheal.java rename to Essentials/src/org/mcess/essentials/commands/Commandheal.java index 6890af09f..e5ec72376 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandheal.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityRegainHealthEvent; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java b/Essentials/src/org/mcess/essentials/commands/Commandhelp.java similarity index 81% rename from Essentials/src/com/earth2me/essentials/commands/Commandhelp.java rename to Essentials/src/org/mcess/essentials/commands/Commandhelp.java index d037c3c79..a4c9bd373 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandhelp.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.textreader.*; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.textreader.*; +import org.mcess.essentials.utils.NumberUtil; import java.util.Locale; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandhelp extends EssentialsCommand @@ -55,6 +55,6 @@ public class Commandhelp extends EssentialsCommand @Override protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - sender.sendMessage(tl("helpConsole")); + sender.sendMessage(I18n.tl("helpConsole")); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/org/mcess/essentials/commands/Commandhelpop.java similarity index 75% rename from Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java rename to Essentials/src/org/mcess/essentials/commands/Commandhelpop.java index b83b5b695..7a94a403d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandhelpop.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.logging.Level; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandhelpop extends EssentialsCommand @@ -39,7 +39,7 @@ public class Commandhelpop extends EssentialsCommand { throw new NotEnoughArgumentsException(); } - final String message = tl("helpOp", from, FormatUtil.stripFormat(getFinalArg(args, 0))); + final String message = I18n.tl("helpOp", from, FormatUtil.stripFormat(getFinalArg(args, 0))); server.getLogger().log(Level.INFO, message); ess.broadcastMessage("essentials.helpop.receive", message); return message; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/org/mcess/essentials/commands/Commandhome.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/commands/Commandhome.java rename to Essentials/src/org/mcess/essentials/commands/Commandhome.java index 62b0c4161..d8ca2e5e3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandhome.java @@ -1,14 +1,14 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import java.util.List; import java.util.Locale; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandhome extends EssentialsCommand @@ -54,7 +54,7 @@ public class Commandhome extends EssentialsCommand } else { - throw new Exception(tl("bedMissing")); + throw new Exception(I18n.tl("bedMissing")); } } goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge); @@ -69,7 +69,7 @@ public class Commandhome extends EssentialsCommand } else if (homes.isEmpty()) { - throw new Exception(tl("noHomeSetPlayer")); + throw new Exception(I18n.tl("noHomeSetPlayer")); } else if (homes.size() == 1 && player.equals(user)) { @@ -82,14 +82,14 @@ public class Commandhome extends EssentialsCommand { if (bed != null) { - homes.add(tl("bed")); + homes.add(I18n.tl("bed")); } else { - homes.add(tl("bedNull")); + homes.add(I18n.tl("bedNull")); } } - user.sendMessage(tl("homes", StringUtil.joinList(homes), count, getHomeLimit(player))); + user.sendMessage(I18n.tl("homes", StringUtil.joinList(homes), count, getHomeLimit(player))); } } throw new NoChargeException(); @@ -122,7 +122,7 @@ public class Commandhome extends EssentialsCommand if (user.getWorld() != loc.getWorld() && ess.getSettings().isWorldHomePermissions() && !user.isAuthorized("essentials.worlds." + loc.getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + loc.getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + loc.getWorld().getName())); } user.getTeleport().teleport(loc, charge, TeleportCause.COMMAND); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java b/Essentials/src/org/mcess/essentials/commands/Commandignore.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/commands/Commandignore.java rename to Essentials/src/org/mcess/essentials/commands/Commandignore.java index c5bc21d46..bfe4a7fc4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandignore.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandignore.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinfo.java b/Essentials/src/org/mcess/essentials/commands/Commandinfo.java similarity index 68% rename from Essentials/src/com/earth2me/essentials/commands/Commandinfo.java rename to Essentials/src/org/mcess/essentials/commands/Commandinfo.java index 2ee915f7c..e41c9b764 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandinfo.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandinfo.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.TextInput; -import com.earth2me.essentials.textreader.TextPager; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.TextInput; +import org.mcess.essentials.textreader.TextPager; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java b/Essentials/src/org/mcess/essentials/commands/Commandinvsee.java similarity index 92% rename from Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java rename to Essentials/src/org/mcess/essentials/commands/Commandinvsee.java index f1800eb8e..7bcc4f4ea 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandinvsee.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.inventory.Inventory; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/org/mcess/essentials/commands/Commanditem.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/commands/Commanditem.java rename to Essentials/src/org/mcess/essentials/commands/Commanditem.java index 97d818172..9a230f9d3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java +++ b/Essentials/src/org/mcess/essentials/commands/Commanditem.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.MetaItemStack; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.MetaItemStack; +import org.mcess.essentials.User; +import org.mcess.essentials.craftbukkit.InventoryWorkaround; import java.util.Locale; import org.bukkit.Material; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java b/Essentials/src/org/mcess/essentials/commands/Commanditemdb.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java rename to Essentials/src/org/mcess/essentials/commands/Commanditemdb.java index 02ea1c637..edec6065e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java +++ b/Essentials/src/org/mcess/essentials/commands/Commanditemdb.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjails.java b/Essentials/src/org/mcess/essentials/commands/Commandjails.java similarity index 72% rename from Essentials/src/com/earth2me/essentials/commands/Commandjails.java rename to Essentials/src/org/mcess/essentials/commands/Commandjails.java index 5fe61032d..c398b0aae 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandjails.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandjails.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.utils.StringUtil; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/org/mcess/essentials/commands/Commandjump.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/commands/Commandjump.java rename to Essentials/src/org/mcess/essentials/commands/Commandjump.java index 228df82b0..ebd82c8e7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandjump.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandjump.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.LocationUtil; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/org/mcess/essentials/commands/Commandkick.java similarity index 62% rename from Essentials/src/com/earth2me/essentials/commands/Commandkick.java rename to Essentials/src/org/mcess/essentials/commands/Commandkick.java index f4c2bdaca..4bcbcfa35 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkick.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandkick.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.logging.Level; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandkick extends EssentialsCommand @@ -35,17 +35,17 @@ public class Commandkick extends EssentialsCommand if (target.isAuthorized("essentials.kick.exempt")) { - throw new Exception(tl("kickExempt")); + throw new Exception(I18n.tl("kickExempt")); } } - String kickReason = args.length > 1 ? getFinalArg(args, 1) : tl("kickDefault"); + String kickReason = args.length > 1 ? getFinalArg(args, 1) : I18n.tl("kickDefault"); kickReason = FormatUtil.replaceFormat(kickReason.replace("\\n", "\n").replace("|", "\n")); target.getBase().kickPlayer(kickReason); final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME; - server.getLogger().log(Level.INFO, tl("playerKicked", senderName, target.getName(), kickReason)); - ess.broadcastMessage("essentials.kick.notify", tl("playerKicked", senderName, target.getName(), kickReason)); + server.getLogger().log(Level.INFO, I18n.tl("playerKicked", senderName, target.getName(), kickReason)); + ess.broadcastMessage("essentials.kick.notify", I18n.tl("playerKicked", senderName, target.getName(), kickReason)); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/org/mcess/essentials/commands/Commandkickall.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/commands/Commandkickall.java rename to Essentials/src/org/mcess/essentials/commands/Commandkickall.java index 745da13e3..f8a80ce03 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandkickall.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.utils.FormatUtil; import org.bukkit.Server; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/org/mcess/essentials/commands/Commandkill.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/commands/Commandkill.java rename to Essentials/src/org/mcess/essentials/commands/Commandkill.java index 6c4062371..23129905e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandkill.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/org/mcess/essentials/commands/Commandkit.java similarity index 75% rename from Essentials/src/com/earth2me/essentials/commands/Commandkit.java rename to Essentials/src/org/mcess/essentials/commands/Commandkit.java index aa3f21d3b..d867a8a01 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandkit.java @@ -1,15 +1,15 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Kit; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Kit; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.logging.Level; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandkit extends EssentialsCommand @@ -25,7 +25,7 @@ public class Commandkit extends EssentialsCommand if (args.length < 1) { final String kitList = Kit.listKits(ess, user); - user.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits")); + user.sendMessage(kitList.length() > 0 ? I18n.tl("kits", kitList) : I18n.tl("noKits")); throw new NoChargeException(); } else if (args.length > 1 && user.isAuthorized("essentials.kit.others")) @@ -47,7 +47,7 @@ public class Commandkit extends EssentialsCommand if (args.length < 2) { final String kitList = Kit.listKits(ess, null); - sender.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits")); + sender.sendMessage(kitList.length() > 0 ? I18n.tl("kits", kitList) : I18n.tl("noKits")); throw new NoChargeException(); } else @@ -60,8 +60,8 @@ public class Commandkit extends EssentialsCommand final Kit kit = new Kit(kitName, ess); kit.expandItems(userTo); - sender.sendMessage(tl("kitGiveTo", kitName, userTo.getDisplayName())); - userTo.sendMessage(tl("kitReceive", kitName)); + sender.sendMessage(I18n.tl("kitGiveTo", kitName, userTo.getDisplayName())); + userTo.sendMessage(I18n.tl("kitReceive", kitName)); } } } @@ -70,7 +70,7 @@ public class Commandkit extends EssentialsCommand { if (kitNames.isEmpty()) { - throw new Exception(tl("kitNotFound")); + throw new Exception(I18n.tl("kitNotFound")); } String[] kitList = kitNames.split(","); @@ -80,7 +80,7 @@ public class Commandkit extends EssentialsCommand { if (kitName.isEmpty()) { - throw new Exception(tl("kitNotFound")); + throw new Exception(I18n.tl("kitNotFound")); } Kit kit = new Kit(kitName, ess); @@ -103,10 +103,10 @@ public class Commandkit extends EssentialsCommand if (!userFrom.equals(userTo)) { - userFrom.sendMessage(tl("kitGiveTo", kit.getName(), userTo.getDisplayName())); + userFrom.sendMessage(I18n.tl("kitGiveTo", kit.getName(), userTo.getDisplayName())); } - userTo.sendMessage(tl("kitReceive", kit.getName())); + userTo.sendMessage(I18n.tl("kitReceive", kit.getName())); } catch (NoChargeException ex) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/org/mcess/essentials/commands/Commandlightning.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/commands/Commandlightning.java rename to Essentials/src/org/mcess/essentials/commands/Commandlightning.java index 75e3c0579..fff59f868 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandlightning.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.entity.LightningStrike; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/org/mcess/essentials/commands/Commandlist.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/commands/Commandlist.java rename to Essentials/src/org/mcess/essentials/commands/Commandlist.java index bb5475721..c3b863cf2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandlist.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.PlayerList; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.PlayerList; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.NumberUtil; import java.util.*; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandlist extends EssentialsCommand @@ -79,7 +79,7 @@ public class Commandlist extends EssentialsCommand int limit = Integer.parseInt(groupValue); if (matchedList.size() > limit) { - sender.sendMessage(PlayerList.outputFormat(oConfigGroup, tl("groupNumber", matchedList.size(), commandLabel, FormatUtil.stripFormat(configGroup)))); + sender.sendMessage(PlayerList.outputFormat(oConfigGroup, I18n.tl("groupNumber", matchedList.size(), commandLabel, FormatUtil.stripFormat(configGroup)))); } else { @@ -126,7 +126,7 @@ public class Commandlist extends EssentialsCommand if (ess.getPermissionsHandler().getName().equals("ConfigPermissions")) { - groupName = tl("connectedPlayers"); + groupName = I18n.tl("connectedPlayers"); } if (users == null || users.isEmpty()) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/org/mcess/essentials/commands/Commandmail.java similarity index 59% rename from Essentials/src/com/earth2me/essentials/commands/Commandmail.java rename to Essentials/src/org/mcess/essentials/commands/Commandmail.java index 0e4869df5..da9183ef8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandmail.java @@ -1,15 +1,14 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.SimpleTextInput; -import com.earth2me.essentials.textreader.SimpleTextPager; -import com.earth2me.essentials.textreader.TextPager; -import com.earth2me.essentials.utils.FormatUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.SimpleTextInput; +import org.mcess.essentials.textreader.TextPager; +import org.mcess.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.StringUtil; import org.bukkit.Server; +import org.mcess.essentials.I18n; import java.util.List; @@ -35,7 +34,7 @@ public class Commandmail extends EssentialsCommand final List mail = user.getMails(); if (mail.isEmpty()) { - user.sendMessage(tl("noMail")); + user.sendMessage(I18n.tl("noMail")); throw new NoChargeException(); } @@ -43,31 +42,31 @@ public class Commandmail extends EssentialsCommand final TextPager pager = new TextPager(input); pager.showPage(args.length > 1 ? args[1] : null, null, commandLabel + " " + args[0], user.getSource()); - user.sendMessage(tl("mailClear")); + user.sendMessage(I18n.tl("mailClear")); return; } if (args.length >= 3 && "send".equalsIgnoreCase(args[0])) { if (!user.isAuthorized("essentials.mail.send")) { - throw new Exception(tl("noPerm", "essentials.mail.send")); + throw new Exception(I18n.tl("noPerm", "essentials.mail.send")); } if (user.isMuted()) { - throw new Exception(tl("voiceSilenced")); + throw new Exception(I18n.tl("voiceSilenced")); } User u = getPlayer(server, args[1], true, true); if (u == null) { - throw new Exception(tl("playerNeverOnServer", args[1])); + throw new Exception(I18n.tl("playerNeverOnServer", args[1])); } - final String mail = tl("mailFormat", user.getName(), StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2)))); + final String mail = I18n.tl("mailFormat", user.getName(), StringUtil.sanitizeString(FormatUtil.stripFormat(getFinalArg(args, 2)))); if (mail.length() > 1000) { - throw new Exception(tl("mailTooLong")); + throw new Exception(I18n.tl("mailTooLong")); } if (!u.isIgnoredPlayer(user)) @@ -80,12 +79,12 @@ public class Commandmail extends EssentialsCommand mailsPerMinute++; if (mailsPerMinute > ess.getSettings().getMailsPerMinute()) { - throw new Exception(tl("mailDelay", ess.getSettings().getMailsPerMinute())); + throw new Exception(I18n.tl("mailDelay", ess.getSettings().getMailsPerMinute())); } - u.addMail(tl("mailMessage", mail)); + u.addMail(I18n.tl("mailMessage", mail)); } - user.sendMessage(tl("mailSentTo", u.getDisplayName(), u.getName())); + user.sendMessage(I18n.tl("mailSentTo", u.getDisplayName(), u.getName())); user.sendMessage(mail); return; } @@ -93,16 +92,16 @@ public class Commandmail extends EssentialsCommand { if (!user.isAuthorized("essentials.mail.sendall")) { - throw new Exception(tl("noPerm", "essentials.mail.sendall")); + throw new Exception(I18n.tl("noPerm", "essentials.mail.sendall")); } - ess.runTaskAsynchronously(new SendAll(tl("mailFormat", user.getName(), FormatUtil.stripFormat(getFinalArg(args, 1))))); - user.sendMessage(tl("mailSent")); + ess.runTaskAsynchronously(new SendAll(I18n.tl("mailFormat", user.getName(), FormatUtil.stripFormat(getFinalArg(args, 1))))); + user.sendMessage(I18n.tl("mailSent")); return; } if (args.length >= 1 && "clear".equalsIgnoreCase(args[0])) { user.setMails(null); - user.sendMessage(tl("mailCleared")); + user.sendMessage(I18n.tl("mailCleared")); return; } throw new NotEnoughArgumentsException(); @@ -113,27 +112,27 @@ public class Commandmail extends EssentialsCommand { if (args.length >= 1 && "read".equalsIgnoreCase(args[0])) { - throw new Exception(tl("onlyPlayers", commandLabel + " read")); + throw new Exception(I18n.tl("onlyPlayers", commandLabel + " read")); } else if (args.length >= 1 && "clear".equalsIgnoreCase(args[0])) { - throw new Exception(tl("onlyPlayers", commandLabel + " clear")); + throw new Exception(I18n.tl("onlyPlayers", commandLabel + " clear")); } else if (args.length >= 3 && "send".equalsIgnoreCase(args[0])) { User u = getPlayer(server, args[1], true, true); if (u == null) { - throw new Exception(tl("playerNeverOnServer", args[1])); + throw new Exception(I18n.tl("playerNeverOnServer", args[1])); } - u.addMail(tl("mailFormat", "Server", getFinalArg(args, 2))); - sender.sendMessage(tl("mailSent")); + u.addMail(I18n.tl("mailFormat", "Server", getFinalArg(args, 2))); + sender.sendMessage(I18n.tl("mailSent")); return; } else if (args.length >= 2 && "sendall".equalsIgnoreCase(args[0])) { - ess.runTaskAsynchronously(new SendAll(tl("mailFormat", "Server", getFinalArg(args, 1)))); - sender.sendMessage(tl("mailSent")); + ess.runTaskAsynchronously(new SendAll(I18n.tl("mailFormat", "Server", getFinalArg(args, 1)))); + sender.sendMessage(I18n.tl("mailSent")); return; } else if (args.length >= 2) @@ -142,10 +141,10 @@ public class Commandmail extends EssentialsCommand User u = getPlayer(server, args[0], true, true); if (u == null) { - throw new Exception(tl("playerNeverOnServer", args[0])); + throw new Exception(I18n.tl("playerNeverOnServer", args[0])); } - u.addMail(tl("mailFormat", "Server", getFinalArg(args, 1))); - sender.sendMessage(tl("mailSent")); + u.addMail(I18n.tl("mailFormat", "Server", getFinalArg(args, 1))); + sender.sendMessage(I18n.tl("mailSent")); return; } throw new NotEnoughArgumentsException(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/org/mcess/essentials/commands/Commandme.java similarity index 81% rename from Essentials/src/com/earth2me/essentials/commands/Commandme.java rename to Essentials/src/org/mcess/essentials/commands/Commandme.java index 6dadd0a9c..7657a0fc9 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandme.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java b/Essentials/src/org/mcess/essentials/commands/Commandmore.java similarity index 82% rename from Essentials/src/com/earth2me/essentials/commands/Commandmore.java rename to Essentials/src/org/mcess/essentials/commands/Commandmore.java index f0fa43efc..51c945278 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmore.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandmore.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import java.util.Locale; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; public class Commandmore extends EssentialsCommand @@ -20,12 +20,12 @@ public class Commandmore extends EssentialsCommand final ItemStack stack = user.getBase().getItemInHand(); if (stack == null) { - throw new Exception(tl("cantSpawnItem", "Air")); + throw new Exception(I18n.tl("cantSpawnItem", "Air")); } if (stack.getAmount() >= ((user.isAuthorized("essentials.oversizedstacks")) ? ess.getSettings().getOversizedStackSize() : stack.getMaxStackSize())) { - throw new Exception(tl("fullStack")); + throw new Exception(I18n.tl("fullStack")); } final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""); if (ess.getSettings().permissionBasedItemSpawn() @@ -35,7 +35,7 @@ public class Commandmore extends EssentialsCommand : (!user.isAuthorized("essentials.itemspawn.exempt") && !user.canSpawnItem(stack.getTypeId()))) { - throw new Exception(tl("cantSpawnItem", itemname)); + throw new Exception(I18n.tl("cantSpawnItem", itemname)); } if (user.isAuthorized("essentials.oversizedstacks")) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java b/Essentials/src/org/mcess/essentials/commands/Commandmotd.java similarity index 68% rename from Essentials/src/com/earth2me/essentials/commands/Commandmotd.java rename to Essentials/src/org/mcess/essentials/commands/Commandmotd.java index 58c8da669..cc1f548c8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmotd.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandmotd.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.TextInput; -import com.earth2me.essentials.textreader.TextPager; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.TextInput; +import org.mcess.essentials.textreader.TextPager; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/org/mcess/essentials/commands/Commandmsg.java similarity index 69% rename from Essentials/src/com/earth2me/essentials/commands/Commandmsg.java rename to Essentials/src/org/mcess/essentials/commands/Commandmsg.java index 642742730..76189e938 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandmsg.java @@ -1,19 +1,18 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.IReplyTo; -import com.earth2me.essentials.User; -import static com.earth2me.essentials.commands.EssentialsCommand.getFinalArg; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.IReplyTo; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import org.bukkit.Server; import org.bukkit.command.CommandSender; +import org.mcess.essentials.I18n; public class Commandmsg extends EssentialsLoopCommand { - final String translatedMe = tl("me"); + final String translatedMe = I18n.tl("me"); public Commandmsg() { @@ -35,7 +34,7 @@ public class Commandmsg extends EssentialsLoopCommand User user = ess.getUser(sender.getPlayer()); if (user.isMuted()) { - throw new Exception(tl("voiceSilenced")); + throw new Exception(I18n.tl("voiceSilenced")); } message = FormatUtil.formatMessage(user, "essentials.msg", message); canWildcard = user.isAuthorized("essentials.msg.multiple"); @@ -51,9 +50,9 @@ public class Commandmsg extends EssentialsLoopCommand final IReplyTo replyTo = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : Console.getConsoleReplyTo(); final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME; - sender.sendMessage(tl("msgFormat", translatedMe, Console.NAME, message)); + sender.sendMessage(I18n.tl("msgFormat", translatedMe, Console.NAME, message)); CommandSender cs = Console.getCommandSender(server); - cs.sendMessage(tl("msgFormat", senderName, translatedMe, message)); + cs.sendMessage(I18n.tl("msgFormat", senderName, translatedMe, message)); replyTo.setReplyTo(new CommandSource(cs)); Console.getConsoleReplyTo().setReplyTo(sender); return; @@ -70,16 +69,16 @@ public class Commandmsg extends EssentialsLoopCommand if (matchedUser.isAfk()) { - sender.sendMessage(tl("userAFK", matchedUser.getDisplayName())); + sender.sendMessage(I18n.tl("userAFK", matchedUser.getDisplayName())); } - sender.sendMessage(tl("msgFormat", translatedMe, matchedUser.getDisplayName(), args[0])); + sender.sendMessage(I18n.tl("msgFormat", translatedMe, matchedUser.getDisplayName(), args[0])); if (sender.isPlayer() && matchedUser.isIgnoredPlayer(ess.getUser(sender.getPlayer()))) { return; } - matchedUser.sendMessage(tl("msgFormat", senderName, translatedMe, args[0])); + matchedUser.sendMessage(I18n.tl("msgFormat", senderName, translatedMe, args[0])); replyTo.setReplyTo(matchedUser.getSource()); matchedUser.setReplyTo(sender); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/org/mcess/essentials/commands/Commandmute.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/commands/Commandmute.java rename to Essentials/src/org/mcess/essentials/commands/Commandmute.java index fc44bc20c..02033ee6a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandmute.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.OfflinePlayer; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.DateUtil; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.OfflinePlayer; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.DateUtil; import java.util.logging.Level; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java b/Essentials/src/org/mcess/essentials/commands/Commandnear.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/commands/Commandnear.java rename to Essentials/src/org/mcess/essentials/commands/Commandnear.java index a31c220ca..f03009492 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandnear.java @@ -1,12 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; -import org.bukkit.entity.Player; public class Commandnear extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/org/mcess/essentials/commands/Commandnick.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/commands/Commandnick.java rename to Essentials/src/org/mcess/essentials/commands/Commandnick.java index fb8914fe4..18757a613 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandnick.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.Locale; import net.ess3.api.events.NickChangeEvent; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java b/Essentials/src/org/mcess/essentials/commands/Commandnuke.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/commands/Commandnuke.java rename to Essentials/src/org/mcess/essentials/commands/Commandnuke.java index e82c46c8d..b670dd008 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandnuke.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; import java.util.ArrayList; import java.util.Collection; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/org/mcess/essentials/commands/Commandpay.java similarity index 79% rename from Essentials/src/com/earth2me/essentials/commands/Commandpay.java rename to Essentials/src/org/mcess/essentials/commands/Commandpay.java index a83df4ac7..635f8adbb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandpay.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import java.math.BigDecimal; import net.ess3.api.MaxMoneyException; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandpay extends EssentialsLoopCommand @@ -49,7 +49,7 @@ public class Commandpay extends EssentialsLoopCommand } catch (MaxMoneyException ex) { - sender.sendMessage(tl("maxMoney")); + sender.sendMessage(I18n.tl("maxMoney")); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandping.java b/Essentials/src/org/mcess/essentials/commands/Commandping.java similarity index 69% rename from Essentials/src/com/earth2me/essentials/commands/Commandping.java rename to Essentials/src/org/mcess/essentials/commands/Commandping.java index 1535ad6a2..acb38f2e9 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandping.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandping.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.utils.FormatUtil; import org.bukkit.Server; +import org.mcess.essentials.I18n; // This command can be used to echo messages to the users screen, mostly useless but also an #EasterEgg public class Commandping extends EssentialsCommand @@ -19,7 +19,7 @@ public class Commandping extends EssentialsCommand if (args.length < 1) { - sender.sendMessage(tl("pong")); + sender.sendMessage(I18n.tl("pong")); } else { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java b/Essentials/src/org/mcess/essentials/commands/Commandpotion.java similarity index 81% rename from Essentials/src/com/earth2me/essentials/commands/Commandpotion.java rename to Essentials/src/org/mcess/essentials/commands/Commandpotion.java index 108644649..10b7c9610 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandpotion.java @@ -1,10 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.MetaItemStack; -import com.earth2me.essentials.Potions; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.MetaItemStack; +import org.mcess.essentials.Potions; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -15,6 +14,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import org.mcess.essentials.I18n; public class Commandpotion extends EssentialsCommand @@ -40,7 +40,7 @@ public class Commandpotion extends EssentialsCommand potionslist.add(entry.getKey()); } } - throw new NotEnoughArgumentsException(tl("potions", StringUtil.joinList(potionslist.toArray()))); + throw new NotEnoughArgumentsException(I18n.tl("potions", StringUtil.joinList(potionslist.toArray()))); } if (stack.getType() == Material.POTION) @@ -78,7 +78,7 @@ public class Commandpotion extends EssentialsCommand } else { - user.sendMessage(tl("invalidPotion")); + user.sendMessage(I18n.tl("invalidPotion")); throw new NotEnoughArgumentsException(); } } @@ -87,7 +87,7 @@ public class Commandpotion extends EssentialsCommand } else { - throw new Exception(tl("holdPotion")); + throw new Exception(I18n.tl("holdPotion")); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java b/Essentials/src/org/mcess/essentials/commands/Commandpowertool.java similarity index 74% rename from Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java rename to Essentials/src/org/mcess/essentials/commands/Commandpowertool.java index 9c951395c..59b1957ee 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandpowertool.java @@ -1,15 +1,15 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import java.util.ArrayList; import java.util.List; import java.util.Locale; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; public class Commandpowertool extends EssentialsCommand @@ -47,13 +47,13 @@ public class Commandpowertool extends EssentialsCommand if (command != null && command.equalsIgnoreCase("d:")) { user.clearAllPowertools(); - sender.sendMessage(tl("powerToolClearAll")); + sender.sendMessage(I18n.tl("powerToolClearAll")); return; } if (itemStack == null || itemStack.getType() == Material.AIR) { - throw new Exception(tl("powerToolAir")); + throw new Exception(I18n.tl("powerToolAir")); } final String itemName = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replaceAll("_", " "); @@ -64,11 +64,11 @@ public class Commandpowertool extends EssentialsCommand { if (powertools == null || powertools.isEmpty()) { - throw new Exception(tl("powerToolListEmpty", itemName)); + throw new Exception(I18n.tl("powerToolListEmpty", itemName)); } else { - sender.sendMessage(tl("powerToolList", StringUtil.joinList(powertools), itemName)); + sender.sendMessage(I18n.tl("powerToolList", StringUtil.joinList(powertools), itemName)); } throw new NoChargeException(); } @@ -77,11 +77,11 @@ public class Commandpowertool extends EssentialsCommand command = command.substring(2); if (!powertools.contains(command)) { - throw new Exception(tl("powerToolNoSuchCommandAssigned", command, itemName)); + throw new Exception(I18n.tl("powerToolNoSuchCommandAssigned", command, itemName)); } powertools.remove(command); - sender.sendMessage(tl("powerToolRemove", command, itemName)); + sender.sendMessage(I18n.tl("powerToolRemove", command, itemName)); } else { @@ -89,12 +89,12 @@ public class Commandpowertool extends EssentialsCommand { if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.powertool.append")) { - throw new Exception(tl("noPerm", "essentials.powertool.append")); + throw new Exception(I18n.tl("noPerm", "essentials.powertool.append")); } command = command.substring(2); if (powertools.contains(command)) { - throw new Exception(tl("powerToolAlreadySet", command, itemName)); + throw new Exception(I18n.tl("powerToolAlreadySet", command, itemName)); } } else if (powertools != null && !powertools.isEmpty()) @@ -108,7 +108,7 @@ public class Commandpowertool extends EssentialsCommand } powertools.add(command); - sender.sendMessage(tl("powerToolAttach", StringUtil.joinList(powertools), itemName)); + sender.sendMessage(I18n.tl("powerToolAttach", StringUtil.joinList(powertools), itemName)); } } else @@ -117,13 +117,13 @@ public class Commandpowertool extends EssentialsCommand { powertools.clear(); } - sender.sendMessage(tl("powerToolRemoveAll", itemName)); + sender.sendMessage(I18n.tl("powerToolRemoveAll", itemName)); } if (!user.arePowerToolsEnabled()) { user.setPowerToolsEnabled(true); - user.sendMessage(tl("powerToolsEnabled")); + user.sendMessage(I18n.tl("powerToolsEnabled")); } user.setPowertool(itemStack, powertools); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java b/Essentials/src/org/mcess/essentials/commands/Commandpowertooltoggle.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java rename to Essentials/src/org/mcess/essentials/commands/Commandpowertooltoggle.java index a71f3887d..024432f51 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertooltoggle.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandpowertooltoggle.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/org/mcess/essentials/commands/Commandptime.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/commands/Commandptime.java rename to Essentials/src/org/mcess/essentials/commands/Commandptime.java index edb16d5d7..3f88bb85e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandptime.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.DescParseTickFormat; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.DescParseTickFormat; import java.util.*; import org.bukkit.Server; import org.bukkit.World; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java b/Essentials/src/org/mcess/essentials/commands/Commandpweather.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/commands/Commandpweather.java rename to Essentials/src/org/mcess/essentials/commands/Commandpweather.java index 69e0295dc..139a08597 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandpweather.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import java.util.*; import org.bukkit.Server; import org.bukkit.WeatherType; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/org/mcess/essentials/commands/Commandr.java similarity index 74% rename from Essentials/src/com/earth2me/essentials/commands/Commandr.java rename to Essentials/src/org/mcess/essentials/commands/Commandr.java index b79d10f1e..2f8fd9324 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandr.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.IReplyTo; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.IReplyTo; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandr extends EssentialsCommand @@ -46,12 +46,12 @@ public class Commandr extends EssentialsCommand if (target == null || (target.isPlayer() && !target.getPlayer().isOnline())) { - throw new Exception(tl("foreverAlone")); + throw new Exception(I18n.tl("foreverAlone")); } final String targetName = target.isPlayer() ? target.getPlayer().getDisplayName() : Console.NAME; - sender.sendMessage(tl("msgFormat", tl("me"), targetName, message)); + sender.sendMessage(I18n.tl("msgFormat", I18n.tl("me"), targetName, message)); if (target.isPlayer()) { User player = ess.getUser(target.getPlayer()); @@ -60,7 +60,7 @@ public class Commandr extends EssentialsCommand return; } } - target.sendMessage(tl("msgFormat", senderName, tl("me"), message)); + target.sendMessage(I18n.tl("msgFormat", senderName, I18n.tl("me"), message)); replyTo.setReplyTo(target); if (target != sender) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java b/Essentials/src/org/mcess/essentials/commands/Commandrealname.java similarity index 81% rename from Essentials/src/com/earth2me/essentials/commands/Commandrealname.java rename to Essentials/src/org/mcess/essentials/commands/Commandrealname.java index 55cdadbfb..f86f98491 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrealname.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandrealname.java @@ -1,12 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.Locale; import org.bukkit.Server; -import org.bukkit.entity.Player; public class Commandrealname extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java b/Essentials/src/org/mcess/essentials/commands/Commandrecipe.java similarity index 74% rename from Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java rename to Essentials/src/org/mcess/essentials/commands/Commandrecipe.java index ec4fa896f..fc6a19b28 100755 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandrecipe.java @@ -1,9 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -11,6 +10,7 @@ import java.util.Map; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.*; +import org.mcess.essentials.I18n; public class Commandrecipe extends EssentialsCommand @@ -39,23 +39,23 @@ public class Commandrecipe extends EssentialsCommand } else { - throw new Exception(tl("invalidNumber")); + throw new Exception(I18n.tl("invalidNumber")); } } final List recipesOfType = ess.getServer().getRecipesFor(itemType); if (recipesOfType.size() < 1) { - throw new Exception(tl("recipeNone", getMaterialName(itemType))); + throw new Exception(I18n.tl("recipeNone", getMaterialName(itemType))); } if (recipeNo < 0 || recipeNo >= recipesOfType.size()) { - throw new Exception(tl("recipeBadIndex")); + throw new Exception(I18n.tl("recipeBadIndex")); } final Recipe selectedRecipe = recipesOfType.get(recipeNo); - sender.sendMessage(tl("recipe", getMaterialName(itemType), recipeNo + 1, recipesOfType.size())); + sender.sendMessage(I18n.tl("recipe", getMaterialName(itemType), recipeNo + 1, recipesOfType.size())); if (selectedRecipe instanceof FurnaceRecipe) { @@ -83,13 +83,13 @@ public class Commandrecipe extends EssentialsCommand if (recipesOfType.size() > 1 && args.length == 1) { - sender.sendMessage(tl("recipeMore", commandLabel, args[0], getMaterialName(itemType))); + sender.sendMessage(I18n.tl("recipeMore", commandLabel, args[0], getMaterialName(itemType))); } } public void furnaceRecipe(final CommandSource sender, final FurnaceRecipe recipe) { - sender.sendMessage(tl("recipeFurnace", getMaterialName(recipe.getInput()))); + sender.sendMessage(I18n.tl("recipeFurnace", getMaterialName(recipe.getInput()))); } public void shapedRecipe(final CommandSource sender, final ShapedRecipe recipe, final boolean showWindow) @@ -139,16 +139,16 @@ public class Commandrecipe extends EssentialsCommand materials[j][k] = item == null ? null : item.getType(); } } - sender.sendMessage(tl("recipeGrid", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2]))); - sender.sendMessage(tl("recipeGrid", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2]))); - sender.sendMessage(tl("recipeGrid", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2]))); + sender.sendMessage(I18n.tl("recipeGrid", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2]))); + sender.sendMessage(I18n.tl("recipeGrid", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2]))); + sender.sendMessage(I18n.tl("recipeGrid", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2]))); StringBuilder s = new StringBuilder(); for (Material items : colorMap.keySet().toArray(new Material[colorMap.size()])) { - s.append(tl("recipeGridItem", colorMap.get(items), getMaterialName(items))); + s.append(I18n.tl("recipeGridItem", colorMap.get(items), getMaterialName(items))); } - sender.sendMessage(tl("recipeWhere", s.toString())); + sender.sendMessage(I18n.tl("recipeWhere", s.toString())); } } @@ -178,7 +178,7 @@ public class Commandrecipe extends EssentialsCommand } s.append(" "); } - sender.sendMessage(tl("recipeShapeless", s.toString())); + sender.sendMessage(I18n.tl("recipeShapeless", s.toString())); } } @@ -186,7 +186,7 @@ public class Commandrecipe extends EssentialsCommand { if (stack == null) { - return tl("recipeNothing"); + return I18n.tl("recipeNothing"); } return getMaterialName(stack.getType()); } @@ -195,7 +195,7 @@ public class Commandrecipe extends EssentialsCommand { if (type == null) { - return tl("recipeNothing"); + return I18n.tl("recipeNothing"); } return type.toString().replace("_", " ").toLowerCase(Locale.ENGLISH); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/org/mcess/essentials/commands/Commandremove.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/commands/Commandremove.java rename to Essentials/src/org/mcess/essentials/commands/Commandremove.java index ef9d3c6af..2c602239e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandremove.java @@ -1,9 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Mob; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Mob; +import org.mcess.essentials.User; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -11,6 +10,7 @@ import org.bukkit.Chunk; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.entity.*; +import org.mcess.essentials.I18n; // This could be rewritten in a simpler form if we made a mapping of all Entity names to their types (which would also provide possible mod support) @@ -69,7 +69,7 @@ public class Commandremove extends EssentialsCommand if (world == null) { - throw new Exception(tl("invalidWorld")); + throw new Exception(I18n.tl("invalidWorld")); } if (args[0].contentEquals("*") || args[0].contentEquals("all")) @@ -136,7 +136,7 @@ public class Commandremove extends EssentialsCommand if (warnUser) { - sender.sendMessage(tl("invalidMob")); + sender.sendMessage(I18n.tl("invalidMob")); } for (Chunk chunk : world.getLoadedChunks()) @@ -297,7 +297,7 @@ public class Commandremove extends EssentialsCommand } } } - sender.sendMessage(tl("removed", removed)); + sender.sendMessage(I18n.tl("removed", removed)); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/org/mcess/essentials/commands/Commandrepair.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/commands/Commandrepair.java rename to Essentials/src/org/mcess/essentials/commands/Commandrepair.java index f0b503d2d..ed7218308 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandrepair.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -10,6 +10,8 @@ import net.ess3.api.IUser; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; +import org.mcess.essentials.Trade; public class Commandrepair extends EssentialsCommand @@ -44,14 +46,14 @@ public class Commandrepair extends EssentialsCommand final ItemStack item = user.getBase().getItemInHand(); if (item == null || item.getType().isBlock() || item.getDurability() == 0) { - throw new Exception(tl("repairInvalidType")); + throw new Exception(I18n.tl("repairInvalidType")); } if (!item.getEnchantments().isEmpty() && !ess.getSettings().getRepairEnchanted() && !user.isAuthorized("essentials.repair.enchanted")) { - throw new Exception(tl("repairEnchanted")); + throw new Exception(I18n.tl("repairEnchanted")); } final String itemName = item.getType().toString().toLowerCase(Locale.ENGLISH); @@ -63,7 +65,7 @@ public class Commandrepair extends EssentialsCommand charge.charge(user); user.getBase().updateInventory(); - user.sendMessage(tl("repair", itemName.replace('_', ' '))); + user.sendMessage(I18n.tl("repair", itemName.replace('_', ' '))); } public void repairAll(User user) throws Exception @@ -79,11 +81,11 @@ public class Commandrepair extends EssentialsCommand user.getBase().updateInventory(); if (repaired.isEmpty()) { - throw new Exception(tl("repairNone")); + throw new Exception(I18n.tl("repairNone")); } else { - user.sendMessage(tl("repair", StringUtil.joinList(repaired))); + user.sendMessage(I18n.tl("repair", StringUtil.joinList(repaired))); } } @@ -92,12 +94,12 @@ public class Commandrepair extends EssentialsCommand final Material material = Material.getMaterial(item.getTypeId()); if (material.isBlock() || material.getMaxDurability() < 1) { - throw new Exception(tl("repairInvalidType")); + throw new Exception(I18n.tl("repairInvalidType")); } if (item.getDurability() == 0) { - throw new Exception(tl("repairAlreadyFixed")); + throw new Exception(I18n.tl("repairAlreadyFixed")); } item.setDurability((short)0); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java b/Essentials/src/org/mcess/essentials/commands/Commandrules.java similarity index 68% rename from Essentials/src/com/earth2me/essentials/commands/Commandrules.java rename to Essentials/src/org/mcess/essentials/commands/Commandrules.java index f9a109a51..98d24d684 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrules.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandrules.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.TextInput; -import com.earth2me.essentials.textreader.TextPager; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.TextInput; +import org.mcess.essentials.textreader.TextPager; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/org/mcess/essentials/commands/Commandseen.java similarity index 66% rename from Essentials/src/com/earth2me/essentials/commands/Commandseen.java rename to Essentials/src/org/mcess/essentials/commands/Commandseen.java index fd4ad69b1..5d3dd615d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandseen.java @@ -1,13 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.UserMap; -import com.earth2me.essentials.craftbukkit.BanLookup; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.FormatUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.UserMap; +import org.mcess.essentials.craftbukkit.BanLookup; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.StringUtil; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -16,6 +15,7 @@ import java.util.UUID; import org.bukkit.BanEntry; import org.bukkit.Location; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandseen extends EssentialsCommand @@ -53,12 +53,12 @@ public class Commandseen extends EssentialsCommand } else if (ess.getServer().getBanList(BanList.Type.IP).isBanned(args[0])) { - sender.sendMessage(tl("isIpBanned", args[0])); + sender.sendMessage(I18n.tl("isIpBanned", args[0])); return; } else if (BanLookup.isBanned(ess, args[0])) { - sender.sendMessage(tl("whoisBanned", showBan ? BanLookup.getBanEntry(ess, args[0]).getReason() : tl("true"))); + sender.sendMessage(I18n.tl("whoisBanned", showBan ? BanLookup.getBanEntry(ess, args[0]).getReason() : I18n.tl("true"))); return; } else @@ -88,7 +88,7 @@ public class Commandseen extends EssentialsCommand { user.setDisplayNick(); - sender.sendMessage(tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin()))); + sender.sendMessage(I18n.tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin()))); if (ess.getSettings().isDebug()) { @@ -98,33 +98,33 @@ public class Commandseen extends EssentialsCommand List history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId()); if (history != null && history.size() > 1) { - sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history))); + sender.sendMessage(I18n.tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history))); } if (user.isAfk()) { - sender.sendMessage(tl("whoisAFK", tl("true"))); + sender.sendMessage(I18n.tl("whoisAFK", I18n.tl("true"))); } if (user.isJailed()) { - sender.sendMessage(tl("whoisJail", (user.getJailTimeout() > 0 - ? DateUtil.formatDateDiff(user.getJailTimeout()) - : tl("true")))); + sender.sendMessage(I18n.tl("whoisJail", (user.getJailTimeout() > 0 + ? DateUtil.formatDateDiff(user.getJailTimeout()) + : I18n.tl("true")))); } if (user.isMuted()) { - sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 - ? DateUtil.formatDateDiff(user.getMuteTimeout()) - : tl("true")))); + sender.sendMessage(I18n.tl("whoisMuted", (user.getMuteTimeout() > 0 + ? DateUtil.formatDateDiff(user.getMuteTimeout()) + : I18n.tl("true")))); } final String location = user.getGeoLocation(); if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) { - sender.sendMessage(tl("whoisGeoLocation", location)); + sender.sendMessage(I18n.tl("whoisGeoLocation", location)); } if (extra) { - sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); + sender.sendMessage(I18n.tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); } } @@ -133,11 +133,11 @@ public class Commandseen extends EssentialsCommand user.setDisplayNick(); if (user.getLastLogout() > 0) { - sender.sendMessage(tl("seenOffline", user.getName(), DateUtil.formatDateDiff(user.getLastLogout()))); + sender.sendMessage(I18n.tl("seenOffline", user.getName(), DateUtil.formatDateDiff(user.getLastLogout()))); } else { - sender.sendMessage(tl("userUnknown", user.getName())); + sender.sendMessage(I18n.tl("userUnknown", user.getName())); } if (ess.getSettings().isDebug()) @@ -148,41 +148,41 @@ public class Commandseen extends EssentialsCommand List history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId()); if (history != null && history.size() > 1) { - sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history))); + sender.sendMessage(I18n.tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history))); } if (BanLookup.isBanned(ess, user)) { final BanEntry banEntry = BanLookup.getBanEntry(ess, user.getName()); - final String reason = showBan ? banEntry.getReason() : tl("true"); - sender.sendMessage(tl("whoisBanned", reason)); + final String reason = showBan ? banEntry.getReason() : I18n.tl("true"); + sender.sendMessage(I18n.tl("whoisBanned", reason)); if (banEntry.getExpiration() != null) { Date expiry = banEntry.getExpiration(); - String expireString = tl("now"); + String expireString = I18n.tl("now"); if (expiry.after(new Date())) { expireString = DateUtil.formatDateDiff(expiry.getTime()); } - sender.sendMessage(tl("whoisTempBanned", expireString)); + sender.sendMessage(I18n.tl("whoisTempBanned", expireString)); } } final String location = user.getGeoLocation(); if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) { - sender.sendMessage(tl("whoisGeoLocation", location)); + sender.sendMessage(I18n.tl("whoisGeoLocation", location)); } if (extra) { if (!user.getLastLoginAddress().isEmpty()) { - sender.sendMessage(tl("whoisIPAddress", user.getLastLoginAddress())); + sender.sendMessage(I18n.tl("whoisIPAddress", user.getLastLoginAddress())); } final Location loc = user.getLogoutLocation(); if (loc != null) { - sender.sendMessage(tl("whoisLocation", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + sender.sendMessage(I18n.tl("whoisLocation", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } } } @@ -193,10 +193,10 @@ public class Commandseen extends EssentialsCommand if (ess.getServer().getBanList(BanList.Type.IP).isBanned(ipAddress)) { - sender.sendMessage(tl("isIpBanned", ipAddress)); + sender.sendMessage(I18n.tl("isIpBanned", ipAddress)); } - sender.sendMessage(tl("runningPlayerMatch", ipAddress)); + sender.sendMessage(I18n.tl("runningPlayerMatch", ipAddress)); ess.runTaskAsynchronously(new Runnable() { @@ -222,12 +222,12 @@ public class Commandseen extends EssentialsCommand if (matches.size() > 0) { - sender.sendMessage(tl("matchingIPAddress")); + sender.sendMessage(I18n.tl("matchingIPAddress")); sender.sendMessage(StringUtil.joinList(matches)); } else { - sender.sendMessage(tl("noMatchingPlayers")); + sender.sendMessage(I18n.tl("noMatchingPlayers")); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/org/mcess/essentials/commands/Commandsell.java similarity index 67% rename from Essentials/src/com/earth2me/essentials/commands/Commandsell.java rename to Essentials/src/org/mcess/essentials/commands/Commandsell.java index aa5eea125..5439f026b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsell.java @@ -1,15 +1,15 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import java.util.List; import java.util.Locale; import java.util.logging.Level; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; public class Commandsell extends EssentialsCommand @@ -63,11 +63,11 @@ public class Commandsell extends EssentialsCommand { if (args[0].equalsIgnoreCase("blocks")) { - user.sendMessage(tl("totalWorthBlocks", type, NumberUtil.displayCurrency(totalWorth, ess))); + user.sendMessage(I18n.tl("totalWorthBlocks", type, NumberUtil.displayCurrency(totalWorth, ess))); } else { - user.sendMessage(tl("totalWorthAll", type, NumberUtil.displayCurrency(totalWorth, ess))); + user.sendMessage(I18n.tl("totalWorthAll", type, NumberUtil.displayCurrency(totalWorth, ess))); } } } @@ -79,13 +79,13 @@ public class Commandsell extends EssentialsCommand if (worth == null) { - throw new Exception(tl("itemCannotBeSold")); + throw new Exception(I18n.tl("itemCannotBeSold")); } if (amount <= 0) { if (!isBulkSell) { - user.sendMessage(tl("itemSold", NumberUtil.displayCurrency(BigDecimal.ZERO, ess), BigDecimal.ZERO, is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(worth, ess))); + user.sendMessage(I18n.tl("itemSold", NumberUtil.displayCurrency(BigDecimal.ZERO, ess), BigDecimal.ZERO, is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(worth, ess))); } return BigDecimal.ZERO; } @@ -104,8 +104,8 @@ public class Commandsell extends EssentialsCommand user.getBase().updateInventory(); Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(result, ess), user.getLocation(), ess); user.giveMoney(result); - user.sendMessage(tl("itemSold", NumberUtil.displayCurrency(result, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(worth, ess))); - logger.log(Level.INFO, tl("itemSoldConsole", user.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess))); + user.sendMessage(I18n.tl("itemSold", NumberUtil.displayCurrency(result, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(worth, ess))); + logger.log(Level.INFO, I18n.tl("itemSoldConsole", user.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess))); return result; } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/org/mcess/essentials/commands/Commandsethome.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/commands/Commandsethome.java rename to Essentials/src/org/mcess/essentials/commands/Commandsethome.java index 866a15c1e..3a4afb37f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsethome.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.LocationUtil; -import com.earth2me.essentials.utils.NumberUtil; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.LocationUtil; +import org.mcess.essentials.utils.NumberUtil; import java.util.Locale; import org.bukkit.Location; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java b/Essentials/src/org/mcess/essentials/commands/Commandsetjail.java similarity index 62% rename from Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java rename to Essentials/src/org/mcess/essentials/commands/Commandsetjail.java index 9cf89bfaf..f6dc6e01e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsetjail.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandsetjail extends EssentialsCommand @@ -21,7 +21,7 @@ public class Commandsetjail extends EssentialsCommand throw new NotEnoughArgumentsException(); } ess.getJails().setJail(args[0], user.getLocation()); - user.sendMessage(tl("jailSet", StringUtil.sanitizeString(args[0]))); + user.sendMessage(I18n.tl("jailSet", StringUtil.sanitizeString(args[0]))); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java b/Essentials/src/org/mcess/essentials/commands/Commandsetwarp.java similarity index 68% rename from Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java rename to Essentials/src/org/mcess/essentials/commands/Commandsetwarp.java index b0fa51caf..538c5925c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsetwarp.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.api.IWarps; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.User; +import org.mcess.essentials.api.IWarps; +import org.mcess.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.StringUtil; import net.ess3.api.InvalidWorldException; import org.bukkit.Location; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandsetwarp extends EssentialsCommand @@ -27,7 +27,7 @@ public class Commandsetwarp extends EssentialsCommand if (NumberUtil.isInt(args[0]) || args[0].isEmpty()) { - throw new NoSuchFieldException(tl("invalidWarpName")); + throw new NoSuchFieldException(I18n.tl("invalidWarpName")); } final Location loc = user.getLocation(); @@ -51,8 +51,8 @@ public class Commandsetwarp extends EssentialsCommand } else { - throw new Exception(tl("warpOverwrite")); + throw new Exception(I18n.tl("warpOverwrite")); } - user.sendMessage(tl("warpSet", args[0])); + user.sendMessage(I18n.tl("warpSet", args[0])); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java b/Essentials/src/org/mcess/essentials/commands/Commandsetworth.java similarity index 86% rename from Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java rename to Essentials/src/org/mcess/essentials/commands/Commandsetworth.java index 3a0e6b5ea..841aa42ae 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsetworth.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandskull.java b/Essentials/src/org/mcess/essentials/commands/Commandskull.java similarity index 89% rename from Essentials/src/com/earth2me/essentials/commands/Commandskull.java rename to Essentials/src/org/mcess/essentials/commands/Commandskull.java index 4f00e991f..6c3ed8012 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandskull.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandskull.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; +import org.mcess.essentials.craftbukkit.InventoryWorkaround; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java b/Essentials/src/org/mcess/essentials/commands/Commandsocialspy.java similarity index 77% rename from Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java rename to Essentials/src/org/mcess/essentials/commands/Commandsocialspy.java index 8b2339637..6fcac45a6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsocialspy.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandsocialspy extends EssentialsToggleCommand @@ -55,10 +55,10 @@ public class Commandsocialspy extends EssentialsToggleCommand user.setSocialSpyEnabled(enabled); - user.sendMessage(tl("socialSpy", user.getDisplayName(), enabled ? tl("enabled") : tl("disabled"))); + user.sendMessage(I18n.tl("socialSpy", user.getDisplayName(), enabled ? I18n.tl("enabled") : I18n.tl("disabled"))); if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) { - sender.sendMessage(tl("socialSpy", user.getDisplayName(), enabled ? tl("enabled") : tl("disabled"))); + sender.sendMessage(I18n.tl("socialSpy", user.getDisplayName(), enabled ? I18n.tl("enabled") : I18n.tl("disabled"))); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/org/mcess/essentials/commands/Commandspawner.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/commands/Commandspawner.java rename to Essentials/src/org/mcess/essentials/commands/Commandspawner.java index 96c871c4c..210aa4de4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandspawner.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Mob; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.LocationUtil; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.Mob; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.LocationUtil; +import org.mcess.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.StringUtil; import java.util.Locale; import org.bukkit.Location; import org.bukkit.Material; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/org/mcess/essentials/commands/Commandspawnmob.java similarity index 75% rename from Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java rename to Essentials/src/org/mcess/essentials/commands/Commandspawnmob.java index 2626d9dad..0bf5c5256 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandspawnmob.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Mob; -import com.earth2me.essentials.SpawnMob; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Mob; +import org.mcess.essentials.SpawnMob; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.StringUtil; import java.util.List; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandspawnmob extends EssentialsCommand @@ -23,7 +23,7 @@ public class Commandspawnmob extends EssentialsCommand if (args.length < 1) { final String mobList = SpawnMob.mobList(user); - throw new NotEnoughArgumentsException(tl("mobsAvailable", mobList)); + throw new NotEnoughArgumentsException(I18n.tl("mobsAvailable", mobList)); } List mobParts = SpawnMob.mobParts(args[0]); @@ -37,7 +37,7 @@ public class Commandspawnmob extends EssentialsCommand if (mobParts.size() > 1 && !user.isAuthorized("essentials.spawnmob.stack")) { - throw new Exception(tl("cannotStackMob")); + throw new Exception(I18n.tl("cannotStackMob")); } if (args.length >= 3) @@ -56,7 +56,7 @@ public class Commandspawnmob extends EssentialsCommand if (args.length < 3) { final String mobList = StringUtil.joinList(Mob.getMobList()); - throw new NotEnoughArgumentsException(tl("mobsAvailable", mobList)); + throw new NotEnoughArgumentsException(I18n.tl("mobsAvailable", mobList)); } List mobParts = SpawnMob.mobParts(args[0]); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspeed.java b/Essentials/src/org/mcess/essentials/commands/Commandspeed.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/commands/Commandspeed.java rename to Essentials/src/org/mcess/essentials/commands/Commandspeed.java index 620f43956..8d2c58b71 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspeed.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandspeed.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import java.util.List; import org.bukkit.Server; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/org/mcess/essentials/commands/Commandsudo.java similarity index 77% rename from Essentials/src/com/earth2me/essentials/commands/Commandsudo.java rename to Essentials/src/org/mcess/essentials/commands/Commandsudo.java index 9c9bb2df9..9ada29e66 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsudo.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import java.util.Locale; import java.util.logging.Logger; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandsudo extends EssentialsCommand @@ -29,7 +29,7 @@ public class Commandsudo extends EssentialsCommand { if (user.isAuthorized("essentials.sudo.exempt") && sender.isPlayer()) { - throw new Exception(tl("sudoExempt")); + throw new Exception(I18n.tl("sudoExempt")); } user.getBase().chat(getFinalArg(args, 1).substring(2)); return; @@ -42,12 +42,12 @@ public class Commandsudo extends EssentialsCommand if (user.isAuthorized("essentials.sudo.exempt") && sender.isPlayer()) { - throw new Exception(tl("sudoExempt")); + throw new Exception(I18n.tl("sudoExempt")); } final String command = getFinalArg(arguments, 0); - sender.sendMessage(tl("sudoRun", user.getDisplayName(), command, "")); + sender.sendMessage(I18n.tl("sudoRun", user.getDisplayName(), command, "")); if (command != null && command.length() > 0) { @@ -62,7 +62,7 @@ public class Commandsudo extends EssentialsCommand } catch (Exception e) { - sender.sendMessage(tl("errorCallingCommand", command)); + sender.sendMessage(I18n.tl("errorCallingCommand", command)); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/org/mcess/essentials/commands/Commandsuicide.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java rename to Essentials/src/org/mcess/essentials/commands/Commandsuicide.java index fdd9e0bbb..176eb007b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandsuicide.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.event.entity.EntityDamageEvent; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/org/mcess/essentials/commands/Commandtempban.java similarity index 74% rename from Essentials/src/com/earth2me/essentials/commands/Commandtempban.java rename to Essentials/src/org/mcess/essentials/commands/Commandtempban.java index da8af1a13..ef29e62d2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtempban.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtempban.java @@ -1,15 +1,15 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.DateUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.DateUtil; import java.util.Date; import java.util.GregorianCalendar; import java.util.logging.Level; import org.bukkit.BanList; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandtempban extends EssentialsCommand @@ -32,7 +32,7 @@ public class Commandtempban extends EssentialsCommand if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.tempban.offline")) { - sender.sendMessage(tl("tempbanExemptOffline")); + sender.sendMessage(I18n.tl("tempbanExemptOffline")); return; } } @@ -40,7 +40,7 @@ public class Commandtempban extends EssentialsCommand { if (user.isAuthorized("essentials.tempban.exempt") && sender.isPlayer()) { - sender.sendMessage(tl("tempbanExempt")); + sender.sendMessage(I18n.tl("tempbanExempt")); return; } } @@ -52,23 +52,23 @@ public class Commandtempban extends EssentialsCommand if (maxBanLength > 0 && ((banTimestamp - GregorianCalendar.getInstance().getTimeInMillis()) > maxBanLength) && sender.isPlayer() && !(ess.getUser(sender.getPlayer()).isAuthorized("essentials.tempban.unlimited"))) { - sender.sendMessage(tl("oversizedTempban")); + sender.sendMessage(I18n.tl("oversizedTempban")); throw new NoChargeException(); } if (banReason.length() < 2) { - banReason = tl("defaultBanReason"); + banReason = I18n.tl("defaultBanReason"); } final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME; ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, new Date(banTimestamp), senderName); final String expiry = DateUtil.formatDateDiff(banTimestamp); - final String banDisplay = tl("tempBanned", expiry, senderName, banReason); + final String banDisplay = I18n.tl("tempBanned", expiry, senderName, banReason); user.getBase().kickPlayer(banDisplay); - final String message = tl("playerTempBanned", senderName, user.getName(), expiry, banReason); + final String message = I18n.tl("playerTempBanned", senderName, user.getName(), expiry, banReason); server.getLogger().log(Level.INFO, message); ess.broadcastMessage("essentials.ban.notify", message); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java b/Essentials/src/org/mcess/essentials/commands/Commandthunder.java similarity index 67% rename from Essentials/src/com/earth2me/essentials/commands/Commandthunder.java rename to Essentials/src/org/mcess/essentials/commands/Commandthunder.java index 25deb69c0..bec99f2d4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandthunder.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandthunder.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.World; +import org.mcess.essentials.I18n; public class Commandthunder extends EssentialsCommand @@ -28,13 +28,13 @@ public class Commandthunder extends EssentialsCommand world.setThundering(setThunder ? true : false); world.setThunderDuration(Integer.parseInt(args[1]) * 20); - user.sendMessage(tl("thunderDuration", (setThunder ? tl("enabled") : tl("disabled")), Integer.parseInt(args[1]))); + user.sendMessage(I18n.tl("thunderDuration", (setThunder ? I18n.tl("enabled") : I18n.tl("disabled")), Integer.parseInt(args[1]))); } else { world.setThundering(setThunder ? true : false); - user.sendMessage(tl("thunder", setThunder ? tl("enabled") : tl("disabled"))); + user.sendMessage(I18n.tl("thunder", setThunder ? I18n.tl("enabled") : I18n.tl("disabled"))); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/org/mcess/essentials/commands/Commandtime.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/commands/Commandtime.java rename to Essentials/src/org/mcess/essentials/commands/Commandtime.java index 2d456073a..67a34b4c6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtime.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.DescParseTickFormat; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.DescParseTickFormat; +import org.mcess.essentials.utils.NumberUtil; import java.util.*; import org.bukkit.Server; import org.bukkit.World; +import org.mcess.essentials.I18n; public class Commandtime extends EssentialsCommand @@ -67,7 +67,7 @@ public class Commandtime extends EssentialsCommand final User user = ess.getUser(sender.getPlayer()); if (user != null && !user.isAuthorized("essentials.time.set")) { - throw new Exception(tl("timeSetPermission")); + throw new Exception(I18n.tl("timeSetPermission")); } // Parse the target time int ticks from args[0] @@ -98,7 +98,7 @@ public class Commandtime extends EssentialsCommand for (World world : worlds) { - sender.sendMessage(tl("timeWorldCurrent", world.getName(), DescParseTickFormat.format(world.getTime()))); + sender.sendMessage(I18n.tl("timeWorldCurrent", world.getName(), DescParseTickFormat.format(world.getTime()))); } } @@ -129,7 +129,7 @@ public class Commandtime extends EssentialsCommand output.append(world.getName()); } - sender.sendMessage(tl("timeWorldSet", DescParseTickFormat.format(ticks), output.toString())); + sender.sendMessage(I18n.tl("timeWorldSet", DescParseTickFormat.format(ticks), output.toString())); } /** @@ -169,7 +169,7 @@ public class Commandtime extends EssentialsCommand // We failed to understand the world target... else { - throw new Exception(tl("invalidWorld")); + throw new Exception(I18n.tl("invalidWorld")); } return worlds; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/org/mcess/essentials/commands/Commandtogglejail.java similarity index 71% rename from Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java rename to Essentials/src/org/mcess/essentials/commands/Commandtogglejail.java index 8d67a21d0..a5010b842 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtogglejail.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.DateUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.DateUtil; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandtogglejail extends EssentialsCommand @@ -31,7 +31,7 @@ public class Commandtogglejail extends EssentialsCommand if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.togglejail.offline")) { - sender.sendMessage(tl("mayNotJailOffline")); + sender.sendMessage(I18n.tl("mayNotJailOffline")); return; } } @@ -39,7 +39,7 @@ public class Commandtogglejail extends EssentialsCommand { if (player.isAuthorized("essentials.jail.exempt")) { - sender.sendMessage(tl("mayNotJail")); + sender.sendMessage(I18n.tl("mayNotJail")); return; } } @@ -53,7 +53,7 @@ public class Commandtogglejail extends EssentialsCommand ess.getJails().getJail(args[1]); } player.setJailed(true); - player.sendMessage(tl("userJailed")); + player.sendMessage(I18n.tl("userJailed")); player.setJail(null); player.setJail(args[1]); long timeDiff = 0; @@ -64,14 +64,14 @@ public class Commandtogglejail extends EssentialsCommand player.setJailTimeout(timeDiff); } sender.sendMessage((timeDiff > 0 - ? tl("playerJailedFor", player.getName(), DateUtil.formatDateDiff(timeDiff)) - : tl("playerJailed", player.getName()))); + ? I18n.tl("playerJailedFor", player.getName(), DateUtil.formatDateDiff(timeDiff)) + : I18n.tl("playerJailed", player.getName()))); return; } if (args.length >= 2 && player.isJailed() && !args[1].equalsIgnoreCase(player.getJail())) { - sender.sendMessage(tl("jailAlreadyIncarcerated", player.getJail())); + sender.sendMessage(I18n.tl("jailAlreadyIncarcerated", player.getJail())); return; } @@ -80,7 +80,7 @@ public class Commandtogglejail extends EssentialsCommand final String time = getFinalArg(args, 2); final long timeDiff = DateUtil.parseDateDiff(time, true); player.setJailTimeout(timeDiff); - sender.sendMessage(tl("jailSentenceExtended", DateUtil.formatDateDiff(timeDiff))); + sender.sendMessage(I18n.tl("jailSentenceExtended", DateUtil.formatDateDiff(timeDiff))); return; } @@ -92,13 +92,13 @@ public class Commandtogglejail extends EssentialsCommand } player.setJailed(false); player.setJailTimeout(0); - player.sendMessage(tl("jailReleasedPlayerNotify")); + player.sendMessage(I18n.tl("jailReleasedPlayerNotify")); player.setJail(null); if (player.getBase().isOnline()) { player.getTeleport().back(); } - sender.sendMessage(tl("jailReleased", player.getName())); + sender.sendMessage(I18n.tl("jailReleased", player.getName())); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java b/Essentials/src/org/mcess/essentials/commands/Commandtop.java similarity index 70% rename from Essentials/src/com/earth2me/essentials/commands/Commandtop.java rename to Essentials/src/org/mcess/essentials/commands/Commandtop.java index d41646f2d..eb5e3f7dd 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtop.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtop.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.LocationUtil; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandtop extends EssentialsCommand @@ -25,7 +25,7 @@ public class Commandtop extends EssentialsCommand final float yaw = user.getLocation().getYaw(); final Location loc = LocationUtil.getSafeDestination(new Location(user.getWorld(), topX, user.getWorld().getMaxHeight(), topZ, yaw, pitch)); user.getTeleport().teleport(loc, new Trade(this.getName(), ess), TeleportCause.COMMAND); - user.sendMessage(tl("teleportTop", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + user.sendMessage(I18n.tl("teleportTop", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/org/mcess/essentials/commands/Commandtp.java similarity index 68% rename from Essentials/src/com/earth2me/essentials/commands/Commandtp.java rename to Essentials/src/org/mcess/essentials/commands/Commandtp.java index ee3938804..201a67619 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtp.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandtp extends EssentialsCommand @@ -29,12 +29,12 @@ public class Commandtp extends EssentialsCommand final User player = getPlayer(server, user, args, 0); if (!player.isTeleportEnabled()) { - throw new Exception(tl("teleportDisabled", player.getDisplayName())); + throw new Exception(I18n.tl("teleportDisabled", player.getDisplayName())); } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + player.getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + player.getWorld().getName())); } final Trade charge = new Trade(this.getName(), ess); charge.isAffordableFor(user); @@ -43,27 +43,27 @@ public class Commandtp extends EssentialsCommand case 3: if (!user.isAuthorized("essentials.tp.position")) { - throw new Exception(tl("noPerm", "essentials.tp.position")); + throw new Exception(I18n.tl("noPerm", "essentials.tp.position")); } final double x2 = args[0].startsWith("~") ? user.getLocation().getX() + Integer.parseInt(args[0].substring(1)) : Integer.parseInt(args[0]); final double y2 = args[1].startsWith("~") ? user.getLocation().getY() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]); final double z2 = args[2].startsWith("~") ? user.getLocation().getZ() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]); if (x2 > 30000000 || y2 > 30000000 || z2 > 30000000 || x2 < -30000000 || y2 < -30000000 || z2 < -30000000) { - throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); + throw new NotEnoughArgumentsException(I18n.tl("teleportInvalidLocation")); } final Location locpos = new Location(user.getWorld(), x2, y2, z2, user.getLocation().getYaw(), user.getLocation().getPitch()); user.getTeleport().now(locpos, false, TeleportCause.COMMAND); - user.sendMessage(tl("teleporting", locpos.getWorld().getName(), locpos.getBlockX(), locpos.getBlockY(), locpos.getBlockZ())); + user.sendMessage(I18n.tl("teleporting", locpos.getWorld().getName(), locpos.getBlockX(), locpos.getBlockY(), locpos.getBlockZ())); break; case 4: if (!user.isAuthorized("essentials.tp.others")) { - throw new Exception(tl("noPerm", "essentials.tp.others")); + throw new Exception(I18n.tl("noPerm", "essentials.tp.others")); } if (!user.isAuthorized("essentials.tp.position")) { - throw new Exception(tl("noPerm", "essentials.tp.position")); + throw new Exception(I18n.tl("noPerm", "essentials.tp.position")); } final User target2 = getPlayer(server, user, args, 0); final double x = args[1].startsWith("~") ? target2.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]); @@ -71,39 +71,39 @@ public class Commandtp extends EssentialsCommand final double z = args[3].startsWith("~") ? target2.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]); if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { - throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); + throw new NotEnoughArgumentsException(I18n.tl("teleportInvalidLocation")); } final Location locposother = new Location(target2.getWorld(), x, y, z, target2.getLocation().getYaw(), target2.getLocation().getPitch()); if (!target2.isTeleportEnabled()) { - throw new Exception(tl("teleportDisabled", target2.getDisplayName())); + throw new Exception(I18n.tl("teleportDisabled", target2.getDisplayName())); } - user.sendMessage(tl("teleporting", locposother.getWorld().getName(), locposother.getBlockX(), locposother.getBlockY(), locposother.getBlockZ())); + user.sendMessage(I18n.tl("teleporting", locposother.getWorld().getName(), locposother.getBlockX(), locposother.getBlockY(), locposother.getBlockZ())); target2.getTeleport().now(locposother, false, TeleportCause.COMMAND); - target2.sendMessage(tl("teleporting", locposother.getWorld().getName(), locposother.getBlockX(), locposother.getBlockY(), locposother.getBlockZ())); + target2.sendMessage(I18n.tl("teleporting", locposother.getWorld().getName(), locposother.getBlockX(), locposother.getBlockY(), locposother.getBlockZ())); break; case 2: default: if (!user.isAuthorized("essentials.tp.others")) { - throw new Exception(tl("noPerm", "essentials.tp.others")); + throw new Exception(I18n.tl("noPerm", "essentials.tp.others")); } final User target = getPlayer(server, user, args, 0); final User toPlayer = getPlayer(server, user, args, 1); if (!target.isTeleportEnabled()) { - throw new Exception(tl("teleportDisabled", target.getDisplayName())); + throw new Exception(I18n.tl("teleportDisabled", target.getDisplayName())); } if (!toPlayer.isTeleportEnabled()) { - throw new Exception(tl("teleportDisabled", toPlayer.getDisplayName())); + throw new Exception(I18n.tl("teleportDisabled", toPlayer.getDisplayName())); } if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + toPlayer.getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + toPlayer.getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + toPlayer.getWorld().getName())); } - target.sendMessage(tl("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); + target.sendMessage(I18n.tl("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); target.getTeleport().now(toPlayer.getBase(), false, TeleportCause.COMMAND); break; } @@ -121,7 +121,7 @@ public class Commandtp extends EssentialsCommand if (args.length == 2) { final User toPlayer = getPlayer(server, args, 1, true, false); - target.sendMessage(tl("teleportAtoB", Console.NAME, toPlayer.getDisplayName())); + target.sendMessage(I18n.tl("teleportAtoB", Console.NAME, toPlayer.getDisplayName())); target.getTeleport().now(toPlayer.getBase(), false, TeleportCause.COMMAND); } else if (args.length > 3) @@ -131,12 +131,12 @@ public class Commandtp extends EssentialsCommand final double z = args[3].startsWith("~") ? target.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]); if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { - throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); + throw new NotEnoughArgumentsException(I18n.tl("teleportInvalidLocation")); } final Location loc = new Location(target.getWorld(), x, y, z, target.getLocation().getYaw(), target.getLocation().getPitch()); - sender.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + sender.sendMessage(I18n.tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); target.getTeleport().now(loc, false, TeleportCause.COMMAND); - target.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + target.sendMessage(I18n.tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } else { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/org/mcess/essentials/commands/Commandtpa.java similarity index 57% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpa.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpa.java index 94dd672bb..50608ea73 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpa.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandtpa extends EssentialsCommand @@ -27,24 +27,24 @@ public class Commandtpa extends EssentialsCommand } if (!player.isTeleportEnabled()) { - throw new Exception(tl("teleportDisabled", player.getDisplayName())); + throw new Exception(I18n.tl("teleportDisabled", player.getDisplayName())); } if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + player.getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + player.getWorld().getName())); } if (!player.isIgnoredPlayer(user)) { player.requestTeleport(user, false); - player.sendMessage(tl("teleportRequest", user.getDisplayName())); - player.sendMessage(tl("typeTpaccept")); - player.sendMessage(tl("typeTpdeny")); + player.sendMessage(I18n.tl("teleportRequest", user.getDisplayName())); + player.sendMessage(I18n.tl("typeTpaccept")); + player.sendMessage(I18n.tl("typeTpdeny")); if (ess.getSettings().getTpaAcceptCancellation() != 0) { - player.sendMessage(tl("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation())); + player.sendMessage(I18n.tl("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation())); } } - user.sendMessage(tl("requestSent", player.getDisplayName())); + user.sendMessage(I18n.tl("requestSent", player.getDisplayName())); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java b/Essentials/src/org/mcess/essentials/commands/Commandtpaall.java similarity index 88% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpaall.java index 4cbd9603b..8905d7215 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpaall.java @@ -1,10 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; -import org.bukkit.entity.Player; public class Commandtpaall extends EssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/org/mcess/essentials/commands/Commandtpaccept.java similarity index 71% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpaccept.java index ed56a6275..cb4cfbb37 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpaccept.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandtpaccept extends EssentialsCommand @@ -25,43 +25,43 @@ public class Commandtpaccept extends EssentialsCommand } catch (Exception ex) { - throw new Exception(tl("noPendingRequest")); + throw new Exception(I18n.tl("noPendingRequest")); } if (!requester.getBase().isOnline()) { - throw new Exception(tl("noPendingRequest")); + throw new Exception(I18n.tl("noPendingRequest")); } if (user.isTpRequestHere() && ((!requester.isAuthorized("essentials.tpahere") && !requester.isAuthorized("essentials.tpaall")) || (user.getWorld() != requester.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())))) { - throw new Exception(tl("noPendingRequest")); + throw new Exception(I18n.tl("noPendingRequest")); } if (!user.isTpRequestHere() && (!requester.isAuthorized("essentials.tpa") || (user.getWorld() != requester.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + requester.getWorld().getName())))) { - throw new Exception(tl("noPendingRequest")); + throw new Exception(I18n.tl("noPendingRequest")); } if (args.length > 0 && !requester.getName().contains(args[0])) { - throw new Exception(tl("noPendingRequest")); + throw new Exception(I18n.tl("noPendingRequest")); } long timeout = ess.getSettings().getTpaAcceptCancellation(); if (timeout != 0 && (System.currentTimeMillis() - user.getTeleportRequestTime()) / 1000 > timeout) { user.requestTeleport(null, false); - throw new Exception(tl("requestTimedOut")); + throw new Exception(I18n.tl("requestTimedOut")); } final Trade charge = new Trade(this.getName(), ess); - user.sendMessage(tl("requestAccepted")); - requester.sendMessage(tl("requestAcceptedFrom", user.getDisplayName())); + user.sendMessage(I18n.tl("requestAccepted")); + requester.sendMessage(I18n.tl("requestAcceptedFrom", user.getDisplayName())); try { @@ -69,7 +69,7 @@ public class Commandtpaccept extends EssentialsCommand { final Location loc = user.getTpRequestLocation(); requester.getTeleport().teleportPlayer(user, user.getTpRequestLocation(), charge, TeleportCause.COMMAND); - requester.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + requester.sendMessage(I18n.tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } else { @@ -78,7 +78,7 @@ public class Commandtpaccept extends EssentialsCommand } catch (Exception ex) { - user.sendMessage(tl("pendingTeleportCancelled")); + user.sendMessage(I18n.tl("pendingTeleportCancelled")); ess.showError(requester.getSource(), ex, commandLabel); } user.requestTeleport(null, false); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/org/mcess/essentials/commands/Commandtpahere.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpahere.java index d0d3e47fd..d30ea5051 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpahere.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java b/Essentials/src/org/mcess/essentials/commands/Commandtpall.java similarity index 84% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpall.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpall.java index c850fad2e..8066d8300 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpall.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpall.java @@ -1,12 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Location; import org.bukkit.Server; -import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandtpall extends EssentialsCommand @@ -35,7 +34,7 @@ public class Commandtpall extends EssentialsCommand private void teleportAllPlayers(Server server, CommandSource sender, User target) { - sender.sendMessage(tl("teleportAll")); + sender.sendMessage(I18n.tl("teleportAll")); final Location loc = target.getLocation(); for (User player : ess.getOnlineUsers()) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java b/Essentials/src/org/mcess/essentials/commands/Commandtpdeny.java similarity index 81% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpdeny.java index c0dfde446..c5254cdeb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpdeny.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpdeny.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java b/Essentials/src/org/mcess/essentials/commands/Commandtphere.java similarity index 84% rename from Essentials/src/com/earth2me/essentials/commands/Commandtphere.java rename to Essentials/src/org/mcess/essentials/commands/Commandtphere.java index ec792b289..99a9510ef 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtphere.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtphere.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java b/Essentials/src/org/mcess/essentials/commands/Commandtpo.java similarity index 72% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpo.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpo.java index 0befdfc3b..b7cd625be 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpo.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpo.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandtpo extends EssentialsCommand @@ -26,7 +26,7 @@ public class Commandtpo extends EssentialsCommand if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + player.getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + player.getWorld().getName())); } user.getTeleport().now(player.getBase(), false, TeleportCause.COMMAND); break; @@ -34,7 +34,7 @@ public class Commandtpo extends EssentialsCommand default: if (!user.isAuthorized("essentials.tp.others")) { - throw new Exception(tl("noPerm", "essentials.tp.others")); + throw new Exception(I18n.tl("noPerm", "essentials.tp.others")); } final User target = getPlayer(server, user, args, 0); final User toPlayer = getPlayer(server, user, args, 1); @@ -42,11 +42,11 @@ public class Commandtpo extends EssentialsCommand if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + toPlayer.getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + toPlayer.getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + toPlayer.getWorld().getName())); } target.getTeleport().now(toPlayer.getBase(), false, TeleportCause.COMMAND); - target.sendMessage(tl("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); + target.sendMessage(I18n.tl("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); break; } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java b/Essentials/src/org/mcess/essentials/commands/Commandtpohere.java similarity index 78% rename from Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java rename to Essentials/src/org/mcess/essentials/commands/Commandtpohere.java index bb0d924eb..654d13160 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtpohere.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandtpohere extends EssentialsCommand @@ -27,7 +27,7 @@ public class Commandtpohere extends EssentialsCommand if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) { - throw new Exception(tl("noPerm", "essentials.worlds." + user.getWorld().getName())); + throw new Exception(I18n.tl("noPerm", "essentials.worlds." + user.getWorld().getName())); } // Verify permission diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/org/mcess/essentials/commands/Commandtppos.java similarity index 78% rename from Essentials/src/com/earth2me/essentials/commands/Commandtppos.java rename to Essentials/src/org/mcess/essentials/commands/Commandtppos.java index 0d48acc59..0eed2838a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtppos.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandtppos extends EssentialsCommand @@ -38,11 +38,11 @@ public class Commandtppos extends EssentialsCommand } if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { - throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); + throw new NotEnoughArgumentsException(I18n.tl("teleportInvalidLocation")); } final Trade charge = new Trade(this.getName(), ess); charge.isAffordableFor(user); - user.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + user.sendMessage(I18n.tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); user.getTeleport().teleport(loc, charge, TeleportCause.COMMAND); throw new NoChargeException(); } @@ -70,10 +70,10 @@ public class Commandtppos extends EssentialsCommand } if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { - throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); + throw new NotEnoughArgumentsException(I18n.tl("teleportInvalidLocation")); } - sender.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - user.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + sender.sendMessage(I18n.tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + user.sendMessage(I18n.tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); user.getTeleport().teleport(loc, null, TeleportCause.COMMAND); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java b/Essentials/src/org/mcess/essentials/commands/Commandtptoggle.java similarity index 75% rename from Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java rename to Essentials/src/org/mcess/essentials/commands/Commandtptoggle.java index 3bc02b02e..da997b21f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandtptoggle.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandtptoggle extends EssentialsToggleCommand @@ -54,10 +54,10 @@ public class Commandtptoggle extends EssentialsToggleCommand user.setTeleportEnabled(enabled); - user.sendMessage(enabled ? tl("teleportationEnabled") : tl("teleportationDisabled")); + user.sendMessage(enabled ? I18n.tl("teleportationEnabled") : I18n.tl("teleportationDisabled")); if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) { - sender.sendMessage(enabled ? tl("teleportationEnabledFor", user.getDisplayName()) : tl("teleportationDisabledFor", user.getDisplayName())); + sender.sendMessage(enabled ? I18n.tl("teleportationEnabledFor", user.getDisplayName()) : I18n.tl("teleportationDisabledFor", user.getDisplayName())); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/org/mcess/essentials/commands/Commandunban.java similarity index 67% rename from Essentials/src/com/earth2me/essentials/commands/Commandunban.java rename to Essentials/src/org/mcess/essentials/commands/Commandunban.java index b4cb70bf5..c38fdc5ad 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandunban.java @@ -1,14 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.User; import java.util.logging.Level; import org.bukkit.BanList; -import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandunban extends EssentialsCommand @@ -38,14 +37,14 @@ public class Commandunban extends EssentialsCommand name = player.getName(); if (!player.isBanned()) { - throw new Exception(tl("playerNotFound"), e); + throw new Exception(I18n.tl("playerNotFound"), e); } ess.getServer().getBanList(BanList.Type.NAME).pardon(name); } final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME; - server.getLogger().log(Level.INFO, tl("playerUnbanned", senderName, name)); + server.getLogger().log(Level.INFO, I18n.tl("playerUnbanned", senderName, name)); - ess.broadcastMessage("essentials.ban.notify", tl("playerUnbanned", senderName, name)); + ess.broadcastMessage("essentials.ban.notify", I18n.tl("playerUnbanned", senderName, name)); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java b/Essentials/src/org/mcess/essentials/commands/Commandunbanip.java similarity index 66% rename from Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java rename to Essentials/src/org/mcess/essentials/commands/Commandunbanip.java index 9157a3274..106fac456 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandunbanip.java @@ -1,14 +1,13 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Console; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Console; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.logging.Level; import org.bukkit.BanList; -import org.bukkit.Bukkit; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandunbanip extends EssentialsCommand @@ -52,8 +51,8 @@ public class Commandunbanip extends EssentialsCommand ess.getServer().getBanList(BanList.Type.IP).pardon(ipAddress); final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME; - server.getLogger().log(Level.INFO, tl("playerUnbanIpAddress", senderName, ipAddress)); + server.getLogger().log(Level.INFO, I18n.tl("playerUnbanIpAddress", senderName, ipAddress)); - ess.broadcastMessage("essentials.ban.notify", tl("playerUnbanIpAddress", senderName, ipAddress)); + ess.broadcastMessage("essentials.ban.notify", I18n.tl("playerUnbanIpAddress", senderName, ipAddress)); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java b/Essentials/src/org/mcess/essentials/commands/Commandvanish.java similarity index 75% rename from Essentials/src/com/earth2me/essentials/commands/Commandvanish.java rename to Essentials/src/org/mcess/essentials/commands/Commandvanish.java index fd2bd6d92..27cde2f19 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandvanish.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandvanish extends EssentialsToggleCommand @@ -53,15 +53,15 @@ public class Commandvanish extends EssentialsToggleCommand } user.setVanished(enabled); - user.sendMessage(tl("vanish", user.getDisplayName(), enabled ? tl("enabled") : tl("disabled"))); + user.sendMessage(I18n.tl("vanish", user.getDisplayName(), enabled ? I18n.tl("enabled") : I18n.tl("disabled"))); if (enabled == true) { - user.sendMessage(tl("vanished")); + user.sendMessage(I18n.tl("vanished")); } if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) { - sender.sendMessage(tl("vanish", user.getDisplayName(), enabled ? tl("enabled") : tl("disabled"))); + sender.sendMessage(I18n.tl("vanish", user.getDisplayName(), enabled ? I18n.tl("enabled") : I18n.tl("disabled"))); } } } \ No newline at end of file diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/org/mcess/essentials/commands/Commandwarp.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/commands/Commandwarp.java rename to Essentials/src/org/mcess/essentials/commands/Commandwarp.java index 8c2e88a4a..953593335 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandwarp.java @@ -1,12 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.api.IWarps; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.api.IWarps; +import org.mcess.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.StringUtil; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Iterator; @@ -15,6 +14,7 @@ import java.util.Locale; import net.ess3.api.IUser; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class Commandwarp extends EssentialsCommand @@ -33,7 +33,7 @@ public class Commandwarp extends EssentialsCommand { if (!user.isAuthorized("essentials.warp.list")) { - throw new Exception(tl("warpListPermission")); + throw new Exception(I18n.tl("warpListPermission")); } warpList(user.getSource(), args, user); throw new NoChargeException(); @@ -87,7 +87,7 @@ public class Commandwarp extends EssentialsCommand } if (warpNameList.isEmpty()) { - throw new Exception(tl("noWarpsDefined")); + throw new Exception(I18n.tl("noWarpsDefined")); } int page = 1; if (args.length > 0 && NumberUtil.isInt(args[0])) @@ -107,12 +107,12 @@ public class Commandwarp extends EssentialsCommand if (warpNameList.size() > WARPS_PER_PAGE) { - sender.sendMessage(tl("warpsCount", warpNameList.size(), page, maxPages)); - sender.sendMessage(tl("warpList", warpList)); + sender.sendMessage(I18n.tl("warpsCount", warpNameList.size(), page, maxPages)); + sender.sendMessage(I18n.tl("warpList", warpList)); } else { - sender.sendMessage(tl("warps", warpList)); + sender.sendMessage(I18n.tl("warps", warpList)); } } @@ -125,7 +125,7 @@ public class Commandwarp extends EssentialsCommand charge.isAffordableFor(owner); if (ess.getSettings().getPerWarpPermission() && !owner.isAuthorized("essentials.warps." + name)) { - throw new Exception(tl("warpUsePermission")); + throw new Exception(I18n.tl("warpUsePermission")); } owner.getTeleport().warp(user, name, charge, TeleportCause.COMMAND); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java b/Essentials/src/org/mcess/essentials/commands/Commandweather.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/commands/Commandweather.java rename to Essentials/src/org/mcess/essentials/commands/Commandweather.java index 0b7ae924f..5072e8247 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandweather.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandweather.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import org.bukkit.Server; import org.bukkit.World; diff --git a/Essentials/src/org/mcess/essentials/commands/Commandwhois.java b/Essentials/src/org/mcess/essentials/commands/Commandwhois.java new file mode 100644 index 000000000..e3f0e3d82 --- /dev/null +++ b/Essentials/src/org/mcess/essentials/commands/Commandwhois.java @@ -0,0 +1,65 @@ +package org.mcess.essentials.commands; + +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.craftbukkit.SetExpFix; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.NumberUtil; +import java.util.Locale; +import org.bukkit.Server; +import org.mcess.essentials.I18n; + + +public class Commandwhois extends EssentialsCommand +{ + public Commandwhois() + { + super("whois"); + } + + @Override + public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception + { + if (args.length < 1) + { + throw new NotEnoughArgumentsException(); + } + + User user = getPlayer(server, sender, args, 0); + + sender.sendMessage(I18n.tl("whoisTop", user.getName())); + user.setDisplayNick(); + sender.sendMessage(I18n.tl("whoisNick", user.getDisplayName())); + sender.sendMessage(I18n.tl("whoisHealth", user.getBase().getHealth())); + sender.sendMessage(I18n.tl("whoisHunger", user.getBase().getFoodLevel(), user.getBase().getSaturation())); + sender.sendMessage(I18n.tl("whoisExp", SetExpFix.getTotalExperience(user.getBase()), user.getBase().getLevel())); + sender.sendMessage(I18n.tl("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); + if (!ess.getSettings().isEcoDisabled()) + { + sender.sendMessage(I18n.tl("whoisMoney", NumberUtil.displayCurrency(user.getMoney(), ess))); + } + sender.sendMessage(I18n.tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); + final String location = user.getGeoLocation(); + if (location != null + && (sender.isPlayer() ? ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show") : true)) + { + sender.sendMessage(I18n.tl("whoisGeoLocation", location)); + } + sender.sendMessage(I18n.tl("whoisGamemode", I18n.tl(user.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)))); + sender.sendMessage(I18n.tl("whoisGod", (user.isGodModeEnabled() ? I18n.tl("true") : I18n.tl("false")))); + sender.sendMessage(I18n.tl("whoisOp", (user.getBase().isOp() ? I18n.tl("true") : I18n.tl("false")))); + sender.sendMessage(I18n.tl("whoisFly", user.getBase().getAllowFlight() ? I18n.tl("true") : I18n.tl("false"), user.getBase().isFlying() ? I18n.tl("flying") : I18n.tl("notFlying"))); + sender.sendMessage(I18n.tl("whoisAFK", (user.isAfk() ? I18n.tl("true") : I18n.tl("false")))); + sender.sendMessage(I18n.tl("whoisJail", (user.isJailed() + ? user.getJailTimeout() > 0 + ? DateUtil.formatDateDiff(user.getJailTimeout()) + : I18n.tl("true") + : I18n.tl("false")))); + sender.sendMessage(I18n.tl("whoisMuted", (user.isMuted() + ? user.getMuteTimeout() > 0 + ? DateUtil.formatDateDiff(user.getMuteTimeout()) + : I18n.tl("true") + : I18n.tl("false")))); + + } +} diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworkbench.java b/Essentials/src/org/mcess/essentials/commands/Commandworkbench.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/commands/Commandworkbench.java rename to Essentials/src/org/mcess/essentials/commands/Commandworkbench.java index 61b0f19f4..58ee3f334 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworkbench.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandworkbench.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/org/mcess/essentials/commands/Commandworld.java similarity index 92% rename from Essentials/src/com/earth2me/essentials/commands/Commandworld.java rename to Essentials/src/org/mcess/essentials/commands/Commandworld.java index 1a6d3ea7b..573be3420 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandworld.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import java.util.List; import org.bukkit.Location; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/org/mcess/essentials/commands/Commandworth.java similarity index 69% rename from Essentials/src/com/earth2me/essentials/commands/Commandworth.java rename to Essentials/src/org/mcess/essentials/commands/Commandworth.java index 648eb4139..0c056207f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java +++ b/Essentials/src/org/mcess/essentials/commands/Commandworth.java @@ -1,14 +1,14 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import java.util.List; import java.util.Locale; import org.bukkit.Server; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; public class Commandworth extends EssentialsCommand @@ -60,11 +60,11 @@ public class Commandworth extends EssentialsCommand { if (args.length > 0 && args[0].equalsIgnoreCase("blocks")) { - user.sendMessage(tl("totalSellableBlocks", type, NumberUtil.displayCurrency(totalWorth, ess))); + user.sendMessage(I18n.tl("totalSellableBlocks", type, NumberUtil.displayCurrency(totalWorth, ess))); } else { - user.sendMessage(tl("totalSellableAll", type, NumberUtil.displayCurrency(totalWorth, ess))); + user.sendMessage(I18n.tl("totalSellableAll", type, NumberUtil.displayCurrency(totalWorth, ess))); } } } @@ -109,7 +109,7 @@ public class Commandworth extends EssentialsCommand if (worth == null) { - throw new Exception(tl("itemCannotBeSold")); + throw new Exception(I18n.tl("itemCannotBeSold")); } if (amount < 0) @@ -120,17 +120,17 @@ public class Commandworth extends EssentialsCommand BigDecimal result = worth.multiply(BigDecimal.valueOf(amount)); sender.sendMessage(is.getDurability() != 0 - ? tl("worthMeta", - is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), - is.getDurability(), - NumberUtil.displayCurrency(result, ess), - amount, - NumberUtil.displayCurrency(worth, ess)) - : tl("worth", - is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), - NumberUtil.displayCurrency(result, ess), - amount, - NumberUtil.displayCurrency(worth, ess))); + ? I18n.tl("worthMeta", + is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), + is.getDurability(), + NumberUtil.displayCurrency(result, ess), + amount, + NumberUtil.displayCurrency(worth, ess)) + : I18n.tl("worth", + is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), + NumberUtil.displayCurrency(result, ess), + amount, + NumberUtil.displayCurrency(worth, ess))); return result; } diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/org/mcess/essentials/commands/EssentialsCommand.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java rename to Essentials/src/org/mcess/essentials/commands/EssentialsCommand.java index bfd1843be..26fadf8ac 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java +++ b/Essentials/src/org/mcess/essentials/commands/EssentialsCommand.java @@ -1,8 +1,11 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.FormatUtil; +import static org.mcess.essentials.I18n.tl; + +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.IEssentialsModule; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.List; import java.util.Locale; import java.util.UUID; @@ -11,6 +14,7 @@ import net.ess3.api.IEssentials; import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.entity.Player; +import org.mcess.essentials.Trade; public abstract class EssentialsCommand implements IEssentialsCommand diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java b/Essentials/src/org/mcess/essentials/commands/EssentialsLoopCommand.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java rename to Essentials/src/org/mcess/essentials/commands/EssentialsLoopCommand.java index ccb297f14..e614c8802 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java +++ b/Essentials/src/org/mcess/essentials/commands/EssentialsLoopCommand.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.List; import java.util.Locale; import java.util.UUID; diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java b/Essentials/src/org/mcess/essentials/commands/EssentialsToggleCommand.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java rename to Essentials/src/org/mcess/essentials/commands/EssentialsToggleCommand.java index deed20a13..e13aa1ec8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java +++ b/Essentials/src/org/mcess/essentials/commands/EssentialsToggleCommand.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; import java.util.List; import org.bukkit.Server; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java b/Essentials/src/org/mcess/essentials/commands/IEssentialsCommand.java similarity index 73% rename from Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java rename to Essentials/src/org/mcess/essentials/commands/IEssentialsCommand.java index 1eb241888..5ffdeb61e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/IEssentialsCommand.java +++ b/Essentials/src/org/mcess/essentials/commands/IEssentialsCommand.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.IEssentialsModule; -import com.earth2me.essentials.User; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.IEssentialsModule; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import org.bukkit.Server; import org.bukkit.command.Command; diff --git a/Essentials/src/com/earth2me/essentials/commands/NoChargeException.java b/Essentials/src/org/mcess/essentials/commands/NoChargeException.java similarity index 73% rename from Essentials/src/com/earth2me/essentials/commands/NoChargeException.java rename to Essentials/src/org/mcess/essentials/commands/NoChargeException.java index bb0088792..883174d32 100644 --- a/Essentials/src/com/earth2me/essentials/commands/NoChargeException.java +++ b/Essentials/src/org/mcess/essentials/commands/NoChargeException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; public class NoChargeException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java b/Essentials/src/org/mcess/essentials/commands/NotEnoughArgumentsException.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java rename to Essentials/src/org/mcess/essentials/commands/NotEnoughArgumentsException.java index 0c47b9893..49c2e54ed 100644 --- a/Essentials/src/com/earth2me/essentials/commands/NotEnoughArgumentsException.java +++ b/Essentials/src/org/mcess/essentials/commands/NotEnoughArgumentsException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; public class NotEnoughArgumentsException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/commands/PlayerExemptException.java b/Essentials/src/org/mcess/essentials/commands/PlayerExemptException.java similarity index 76% rename from Essentials/src/com/earth2me/essentials/commands/PlayerExemptException.java rename to Essentials/src/org/mcess/essentials/commands/PlayerExemptException.java index a916402aa..4b5060eeb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/PlayerExemptException.java +++ b/Essentials/src/org/mcess/essentials/commands/PlayerExemptException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; public class PlayerExemptException extends NoSuchFieldException { diff --git a/Essentials/src/org/mcess/essentials/commands/PlayerNotFoundException.java b/Essentials/src/org/mcess/essentials/commands/PlayerNotFoundException.java new file mode 100644 index 000000000..04f19e1ca --- /dev/null +++ b/Essentials/src/org/mcess/essentials/commands/PlayerNotFoundException.java @@ -0,0 +1,11 @@ +package org.mcess.essentials.commands; + +import org.mcess.essentials.I18n; + +public class PlayerNotFoundException extends NoSuchFieldException +{ + public PlayerNotFoundException() + { + super(I18n.tl("playerNotFound")); + } +} diff --git a/Essentials/src/com/earth2me/essentials/commands/QuietAbortException.java b/Essentials/src/org/mcess/essentials/commands/QuietAbortException.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/commands/QuietAbortException.java rename to Essentials/src/org/mcess/essentials/commands/QuietAbortException.java index 2667ef0d3..3b226e99b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/QuietAbortException.java +++ b/Essentials/src/org/mcess/essentials/commands/QuietAbortException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; public class QuietAbortException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java b/Essentials/src/org/mcess/essentials/commands/WarpNotFoundException.java similarity index 58% rename from Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java rename to Essentials/src/org/mcess/essentials/commands/WarpNotFoundException.java index 38573bfda..03c946e2a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/WarpNotFoundException.java +++ b/Essentials/src/org/mcess/essentials/commands/WarpNotFoundException.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.commands; +package org.mcess.essentials.commands; -import static com.earth2me.essentials.I18n.tl; +import org.mcess.essentials.I18n; public class WarpNotFoundException extends Exception { public WarpNotFoundException() { - super(tl("warpNotExist")); + super(I18n.tl("warpNotExist")); } public WarpNotFoundException(String message) diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/BanLookup.java b/Essentials/src/org/mcess/essentials/craftbukkit/BanLookup.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/craftbukkit/BanLookup.java rename to Essentials/src/org/mcess/essentials/craftbukkit/BanLookup.java index e5d26667d..5259faaab 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/BanLookup.java +++ b/Essentials/src/org/mcess/essentials/craftbukkit/BanLookup.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.craftbukkit; +package org.mcess.essentials.craftbukkit; + +import org.mcess.essentials.User; -import com.earth2me.essentials.User; -import java.util.Iterator; import java.util.Set; import net.ess3.api.IEssentials; import org.bukkit.BanEntry; diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/src/org/mcess/essentials/craftbukkit/FakeWorld.java similarity index 99% rename from Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java rename to Essentials/src/org/mcess/essentials/craftbukkit/FakeWorld.java index df7a237fa..eb5a71e60 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java +++ b/Essentials/src/org/mcess/essentials/craftbukkit/FakeWorld.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.craftbukkit; +package org.mcess.essentials.craftbukkit; import java.io.File; import java.util.Collection; diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java b/Essentials/src/org/mcess/essentials/craftbukkit/InventoryWorkaround.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java rename to Essentials/src/org/mcess/essentials/craftbukkit/InventoryWorkaround.java index ac83645b0..6d88f168a 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/InventoryWorkaround.java +++ b/Essentials/src/org/mcess/essentials/craftbukkit/InventoryWorkaround.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.craftbukkit; +package org.mcess.essentials.craftbukkit; import java.util.HashMap; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java b/Essentials/src/org/mcess/essentials/craftbukkit/SetExpFix.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java rename to Essentials/src/org/mcess/essentials/craftbukkit/SetExpFix.java index e484ebfe1..840bc1c40 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/SetExpFix.java +++ b/Essentials/src/org/mcess/essentials/craftbukkit/SetExpFix.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.craftbukkit; +package org.mcess.essentials.craftbukkit; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/metrics/Metrics.java b/Essentials/src/org/mcess/essentials/metrics/Metrics.java similarity index 99% rename from Essentials/src/com/earth2me/essentials/metrics/Metrics.java rename to Essentials/src/org/mcess/essentials/metrics/Metrics.java index 07229f091..1f2cb66c8 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/Metrics.java +++ b/Essentials/src/org/mcess/essentials/metrics/Metrics.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.metrics; +package org.mcess.essentials.metrics; /* * Copyright 2011 Tyler Blair. All rights reserved. @@ -24,7 +24,7 @@ package com.earth2me.essentials.metrics; * should not be interpreted as representing official policies, either expressed or implied, of anybody else. */ -import com.earth2me.essentials.IEssentials; +import org.mcess.essentials.IEssentials; import java.io.*; import java.net.Proxy; import java.net.URL; diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java b/Essentials/src/org/mcess/essentials/metrics/MetricsListener.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java rename to Essentials/src/org/mcess/essentials/metrics/MetricsListener.java index 2edbf1a80..f8a2280c0 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java +++ b/Essentials/src/org/mcess/essentials/metrics/MetricsListener.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.metrics; +package org.mcess.essentials.metrics; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import java.util.logging.Level; import net.ess3.api.IEssentials; import org.bukkit.Server; diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java b/Essentials/src/org/mcess/essentials/metrics/MetricsStarter.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java rename to Essentials/src/org/mcess/essentials/metrics/MetricsStarter.java index c59f4cc5a..9a1949816 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java +++ b/Essentials/src/org/mcess/essentials/metrics/MetricsStarter.java @@ -1,10 +1,8 @@ -package com.earth2me.essentials.metrics; +package org.mcess.essentials.metrics; -import com.earth2me.essentials.metrics.Metrics.Graph; -import com.earth2me.essentials.metrics.Metrics.Plotter; -import com.earth2me.essentials.register.payment.Method; -import com.earth2me.essentials.register.payment.methods.VaultEco; -import com.earth2me.essentials.signs.EssentialsSign; +import org.mcess.essentials.register.payment.Method; +import org.mcess.essentials.register.payment.methods.VaultEco; +import org.mcess.essentials.signs.EssentialsSign; import java.util.Locale; import java.util.logging.Level; import net.ess3.api.IEssentials; @@ -66,7 +64,7 @@ public class MetricsStarter implements Runnable { final Metrics metrics = ess.getMetrics(); - final Graph moduleGraph = metrics.createGraph("Modules Used"); + final Metrics.Graph moduleGraph = metrics.createGraph("Modules Used"); for (Modules module : Modules.values()) { final String moduleName = module.toString(); @@ -76,11 +74,11 @@ public class MetricsStarter implements Runnable } } - final Graph localeGraph = metrics.createGraph("Locale"); + final Metrics.Graph localeGraph = metrics.createGraph("Locale"); localeGraph.addPlotter(new SimplePlotter(ess.getI18n().getCurrentLocale().getDisplayLanguage(Locale.ENGLISH))); - final Graph featureGraph = metrics.createGraph("Features"); - featureGraph.addPlotter(new Plotter("Unique Accounts") + final Metrics.Graph featureGraph = metrics.createGraph("Features"); + featureGraph.addPlotter(new Metrics.Plotter("Unique Accounts") { @Override public int getValue() @@ -88,7 +86,7 @@ public class MetricsStarter implements Runnable return ess.getUserMap().getUniqueUsers(); } }); - featureGraph.addPlotter(new Plotter("Jails") + featureGraph.addPlotter(new Metrics.Plotter("Jails") { @Override public int getValue() @@ -96,7 +94,7 @@ public class MetricsStarter implements Runnable return ess.getJails().getCount(); } }); - featureGraph.addPlotter(new Plotter("Kits") + featureGraph.addPlotter(new Metrics.Plotter("Kits") { @Override public int getValue() @@ -109,7 +107,7 @@ public class MetricsStarter implements Runnable return kits.getKeys(false).size(); } }); - featureGraph.addPlotter(new Plotter("Warps") + featureGraph.addPlotter(new Metrics.Plotter("Warps") { @Override public int getValue() @@ -118,7 +116,7 @@ public class MetricsStarter implements Runnable } }); - final Graph enabledGraph = metrics.createGraph("EnabledFeatures"); + final Metrics.Graph enabledGraph = metrics.createGraph("EnabledFeatures"); enabledGraph.addPlotter(new SimplePlotter("Total")); if (ess.getJails().getCount() > 0) { @@ -165,7 +163,7 @@ public class MetricsStarter implements Runnable enabledGraph.addPlotter(new SimplePlotter("LocalChat")); } - final Graph depGraph = metrics.createGraph("Dependencies"); + final Metrics.Graph depGraph = metrics.createGraph("Dependencies"); final Method method = ess.getPaymentMethod().getMethod(); if (method != null) { @@ -187,7 +185,7 @@ public class MetricsStarter implements Runnable } depGraph.addPlotter(new SimplePlotter(ess.getPermissionsHandler().getName())); - final Graph signGraph = metrics.createGraph("Signs"); + final Metrics.Graph signGraph = metrics.createGraph("Signs"); for (EssentialsSign sign : ess.getSettings().enabledSigns()) { signGraph.addPlotter(new SimplePlotter(sign.getName())); @@ -220,7 +218,7 @@ public class MetricsStarter implements Runnable } - private class SimplePlotter extends Plotter + private class SimplePlotter extends Metrics.Plotter { public SimplePlotter(final String name) { diff --git a/Essentials/src/com/earth2me/essentials/perm/BPermissions2Handler.java b/Essentials/src/org/mcess/essentials/perm/BPermissions2Handler.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/perm/BPermissions2Handler.java rename to Essentials/src/org/mcess/essentials/perm/BPermissions2Handler.java index 791ffbe92..dbb8c358b 100644 --- a/Essentials/src/com/earth2me/essentials/perm/BPermissions2Handler.java +++ b/Essentials/src/org/mcess/essentials/perm/BPermissions2Handler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import de.bananaco.bpermissions.api.ApiLayer; import de.bananaco.bpermissions.api.util.CalculableType; diff --git a/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java b/Essentials/src/org/mcess/essentials/perm/ConfigPermissionsHandler.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java rename to Essentials/src/org/mcess/essentials/perm/ConfigPermissionsHandler.java index d77af5ce1..8dec5f3fb 100644 --- a/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/ConfigPermissionsHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import net.ess3.api.IEssentials; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java b/Essentials/src/org/mcess/essentials/perm/GroupManagerHandler.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java rename to Essentials/src/org/mcess/essentials/perm/GroupManagerHandler.java index 83dd1a846..57d247692 100644 --- a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/GroupManagerHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.Arrays; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/perm/IPermissionsHandler.java b/Essentials/src/org/mcess/essentials/perm/IPermissionsHandler.java similarity index 90% rename from Essentials/src/com/earth2me/essentials/perm/IPermissionsHandler.java rename to Essentials/src/org/mcess/essentials/perm/IPermissionsHandler.java index 27af48e8c..750ef6e80 100644 --- a/Essentials/src/com/earth2me/essentials/perm/IPermissionsHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/IPermissionsHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.List; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/perm/NullPermissionsHandler.java b/Essentials/src/org/mcess/essentials/perm/NullPermissionsHandler.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/perm/NullPermissionsHandler.java rename to Essentials/src/org/mcess/essentials/perm/NullPermissionsHandler.java index b51aeb055..57bdd86e4 100644 --- a/Essentials/src/com/earth2me/essentials/perm/NullPermissionsHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/NullPermissionsHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.Collections; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java b/Essentials/src/org/mcess/essentials/perm/PermissionsBukkitHandler.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java rename to Essentials/src/org/mcess/essentials/perm/PermissionsBukkitHandler.java index 908ce78f3..357aa749e 100644 --- a/Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/PermissionsBukkitHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import com.platymuus.bukkit.permissions.Group; import com.platymuus.bukkit.permissions.PermissionInfo; diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java b/Essentials/src/org/mcess/essentials/perm/PermissionsExHandler.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java rename to Essentials/src/org/mcess/essentials/perm/PermissionsExHandler.java index e61dfc30b..25fd19d91 100644 --- a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/PermissionsExHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.Arrays; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java b/Essentials/src/org/mcess/essentials/perm/PermissionsHandler.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java rename to Essentials/src/org/mcess/essentials/perm/PermissionsHandler.java index f92027afa..e3dc438d7 100644 --- a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/PermissionsHandler.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; -import com.earth2me.essentials.Essentials; +import org.mcess.essentials.Essentials; import java.util.Collections; import java.util.List; import java.util.logging.Level; diff --git a/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java b/Essentials/src/org/mcess/essentials/perm/PrivilegesHandler.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java rename to Essentials/src/org/mcess/essentials/perm/PrivilegesHandler.java index 03db3502b..bf4453440 100644 --- a/Essentials/src/com/earth2me/essentials/perm/PrivilegesHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/PrivilegesHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.ArrayList; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/perm/SimplyPermsHandler.java b/Essentials/src/org/mcess/essentials/perm/SimplyPermsHandler.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/perm/SimplyPermsHandler.java rename to Essentials/src/org/mcess/essentials/perm/SimplyPermsHandler.java index 093a1551f..38c477496 100644 --- a/Essentials/src/com/earth2me/essentials/perm/SimplyPermsHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/SimplyPermsHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.List; import net.crystalyx.bukkit.simplyperms.SimplyAPI; diff --git a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java b/Essentials/src/org/mcess/essentials/perm/SuperpermsHandler.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java rename to Essentials/src/org/mcess/essentials/perm/SuperpermsHandler.java index 0b4b93058..f636a6faa 100644 --- a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/SuperpermsHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.List; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java b/Essentials/src/org/mcess/essentials/perm/ZPermissionsHandler.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java rename to Essentials/src/org/mcess/essentials/perm/ZPermissionsHandler.java index 6be67b3fe..c2a8f8ed1 100644 --- a/Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java +++ b/Essentials/src/org/mcess/essentials/perm/ZPermissionsHandler.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.perm; +package org.mcess.essentials.perm; import java.util.ArrayList; import java.util.List; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Method.java b/Essentials/src/org/mcess/essentials/register/payment/Method.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/register/payment/Method.java rename to Essentials/src/org/mcess/essentials/register/payment/Method.java index c4c9d401a..fb445b8d6 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/Method.java +++ b/Essentials/src/org/mcess/essentials/register/payment/Method.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.register.payment; +package org.mcess.essentials.register.payment; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java b/Essentials/src/org/mcess/essentials/register/payment/Methods.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/register/payment/Methods.java rename to Essentials/src/org/mcess/essentials/register/payment/Methods.java index 3ba5393b1..463bd2542 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java +++ b/Essentials/src/org/mcess/essentials/register/payment/Methods.java @@ -1,9 +1,10 @@ -package com.earth2me.essentials.register.payment; +package org.mcess.essentials.register.payment; import java.util.HashSet; import java.util.Set; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; +import org.mcess.essentials.register.payment.methods.*; /** @@ -45,12 +46,12 @@ public class Methods */ private static void _init() { - addMethod("iConomy", new com.earth2me.essentials.register.payment.methods.iCo6()); - addMethod("iConomy", new com.earth2me.essentials.register.payment.methods.iCo5()); - addMethod("BOSEconomy", new com.earth2me.essentials.register.payment.methods.BOSE7()); - addMethod("Currency", new com.earth2me.essentials.register.payment.methods.MCUR()); + addMethod("iConomy", new iCo6()); + addMethod("iConomy", new iCo5()); + addMethod("BOSEconomy", new BOSE7()); + addMethod("Currency", new MCUR()); Dependencies.add("MultiCurrency"); - addMethod("Vault", new com.earth2me.essentials.register.payment.methods.VaultEco()); + addMethod("Vault", new VaultEco()); } /** diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java b/Essentials/src/org/mcess/essentials/register/payment/methods/BOSE7.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java rename to Essentials/src/org/mcess/essentials/register/payment/methods/BOSE7.java index a554548ea..128897f63 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/BOSE7.java +++ b/Essentials/src/org/mcess/essentials/register/payment/methods/BOSE7.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.register.payment.methods; +package org.mcess.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; +import org.mcess.essentials.register.payment.Method; import cosine.boseconomy.BOSEconomy; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java b/Essentials/src/org/mcess/essentials/register/payment/methods/MCUR.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java rename to Essentials/src/org/mcess/essentials/register/payment/methods/MCUR.java index efcb20fb9..b511c62aa 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/MCUR.java +++ b/Essentials/src/org/mcess/essentials/register/payment/methods/MCUR.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.register.payment.methods; +package org.mcess.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; +import org.mcess.essentials.register.payment.Method; import me.ashtheking.currency.Currency; import me.ashtheking.currency.CurrencyList; import org.bukkit.plugin.Plugin; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java b/Essentials/src/org/mcess/essentials/register/payment/methods/VaultEco.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java rename to Essentials/src/org/mcess/essentials/register/payment/methods/VaultEco.java index b1863c487..997556130 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java +++ b/Essentials/src/org/mcess/essentials/register/payment/methods/VaultEco.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.register.payment.methods; +package org.mcess.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; +import org.mcess.essentials.register.payment.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/register/payment/methods/iCo5.java b/Essentials/src/org/mcess/essentials/register/payment/methods/iCo5.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java rename to Essentials/src/org/mcess/essentials/register/payment/methods/iCo5.java index 75f052846..bf90c0091 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo5.java +++ b/Essentials/src/org/mcess/essentials/register/payment/methods/iCo5.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.register.payment.methods; +package org.mcess.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; +import org.mcess.essentials.register.payment.Method; import com.iConomy.iConomy; import com.iConomy.system.Account; import com.iConomy.system.BankAccount; diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java b/Essentials/src/org/mcess/essentials/register/payment/methods/iCo6.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java rename to Essentials/src/org/mcess/essentials/register/payment/methods/iCo6.java index bf0c1c60a..59603536b 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo6.java +++ b/Essentials/src/org/mcess/essentials/register/payment/methods/iCo6.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.register.payment.methods; +package org.mcess.essentials.register.payment.methods; -import com.earth2me.essentials.register.payment.Method; +import org.mcess.essentials.register.payment.Method; import com.iCo6.iConomy; import com.iCo6.system.Account; import com.iCo6.system.Accounts; diff --git a/Essentials/src/com/earth2me/essentials/settings/Jails.java b/Essentials/src/org/mcess/essentials/settings/Jails.java similarity index 82% rename from Essentials/src/com/earth2me/essentials/settings/Jails.java rename to Essentials/src/org/mcess/essentials/settings/Jails.java index 60290fa92..cedc12197 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Jails.java +++ b/Essentials/src/org/mcess/essentials/settings/Jails.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package org.mcess.essentials.settings; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import org.mcess.essentials.storage.MapValueType; +import org.mcess.essentials.storage.StorageObject; import java.util.HashMap; import java.util.Map; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/settings/Spawns.java b/Essentials/src/org/mcess/essentials/settings/Spawns.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/settings/Spawns.java rename to Essentials/src/org/mcess/essentials/settings/Spawns.java index e4a52d8ce..89ce18e04 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Spawns.java +++ b/Essentials/src/org/mcess/essentials/settings/Spawns.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.settings; +package org.mcess.essentials.settings; -import com.earth2me.essentials.storage.MapValueType; -import com.earth2me.essentials.storage.StorageObject; +import org.mcess.essentials.storage.MapValueType; +import org.mcess.essentials.storage.StorageObject; import java.util.HashMap; import java.util.Map; import org.bukkit.Location; diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/org/mcess/essentials/signs/EssentialsSign.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java rename to Essentials/src/org/mcess/essentials/signs/EssentialsSign.java index 6231bbc09..745de3847 100644 --- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/Essentials/src/org/mcess/essentials/signs/EssentialsSign.java @@ -1,8 +1,9 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.utils.NumberUtil; +import static org.mcess.essentials.I18n.tl; + +import org.mcess.essentials.*; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import java.util.HashSet; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBalance.java b/Essentials/src/org/mcess/essentials/signs/SignBalance.java similarity index 54% rename from Essentials/src/com/earth2me/essentials/signs/SignBalance.java rename to Essentials/src/org/mcess/essentials/signs/SignBalance.java index bd5b10f09..ed42803ea 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBalance.java +++ b/Essentials/src/org/mcess/essentials/signs/SignBalance.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import net.ess3.api.IEssentials; +import org.mcess.essentials.I18n; public class SignBalance extends EssentialsSign @@ -16,7 +16,7 @@ public class SignBalance extends EssentialsSign @Override protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - player.sendMessage(tl("balance", NumberUtil.displayCurrency(player.getMoney(), ess))); + player.sendMessage(I18n.tl("balance", NumberUtil.displayCurrency(player.getMoney(), ess))); return true; } } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/org/mcess/essentials/signs/SignBlockListener.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java rename to Essentials/src/org/mcess/essentials/signs/SignBlockListener.java index 9b4e87d93..0800f59eb 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/Essentials/src/org/mcess/essentials/signs/SignBlockListener.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import java.util.logging.Level; import java.util.logging.Logger; import net.ess3.api.IEssentials; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBuy.java b/Essentials/src/org/mcess/essentials/signs/SignBuy.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/signs/SignBuy.java rename to Essentials/src/org/mcess/essentials/signs/SignBuy.java index 13c7799c7..091da1d60 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBuy.java +++ b/Essentials/src/org/mcess/essentials/signs/SignBuy.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java b/Essentials/src/org/mcess/essentials/signs/SignDisposal.java similarity index 83% rename from Essentials/src/com/earth2me/essentials/signs/SignDisposal.java rename to Essentials/src/org/mcess/essentials/signs/SignDisposal.java index 981f5499d..c390dfcd5 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java +++ b/Essentials/src/org/mcess/essentials/signs/SignDisposal.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java b/Essentials/src/org/mcess/essentials/signs/SignEnchant.java similarity index 84% rename from Essentials/src/com/earth2me/essentials/signs/SignEnchant.java rename to Essentials/src/org/mcess/essentials/signs/SignEnchant.java index 89cfa30e9..3415078b0 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java +++ b/Essentials/src/org/mcess/essentials/signs/SignEnchant.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; + -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n.tl; import java.util.Locale; import net.ess3.api.IEssentials; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.*; public class SignEnchant extends EssentialsSign @@ -32,13 +32,13 @@ public class SignEnchant extends EssentialsSign if (enchantLevel.length != 2) { sign.setLine(2, "§c"); - throw new SignException(tl("invalidSignLine", 3)); + throw new SignException(I18n.tl("invalidSignLine", 3)); } final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]); if (enchantment == null) { sign.setLine(2, "§c"); - throw new SignException(tl("enchantmentNotFound")); + throw new SignException(I18n.tl("enchantmentNotFound")); } int level; try @@ -88,12 +88,12 @@ public class SignEnchant extends EssentialsSign final String[] enchantLevel = sign.getLine(2).split(":"); if (enchantLevel.length != 2) { - throw new SignException(tl("invalidSignLine", 3)); + throw new SignException(I18n.tl("invalidSignLine", 3)); } final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]); if (enchantment == null) { - throw new SignException(tl("enchantmentNotFound")); + throw new SignException(I18n.tl("enchantmentNotFound")); } int level; try @@ -111,11 +111,11 @@ public class SignEnchant extends EssentialsSign || (playerHand.containsEnchantment(enchantment) && playerHand.getEnchantmentLevel(enchantment) == level)) { - throw new SignException(tl("missingItems", 1, sign.getLine(1))); + throw new SignException(I18n.tl("missingItems", 1, sign.getLine(1))); } if (search != null && playerHand.getType() != search.getType()) { - throw new SignException(tl("missingItems", 1, search.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' '))); + throw new SignException(I18n.tl("missingItems", 1, search.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' '))); } final ItemStack toEnchant = playerHand; @@ -145,11 +145,11 @@ public class SignEnchant extends EssentialsSign final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); if (level == 0) { - player.sendMessage(tl("enchantmentRemoved", enchantmentName.replace('_', ' '))); + player.sendMessage(I18n.tl("enchantmentRemoved", enchantmentName.replace('_', ' '))); } else { - player.sendMessage(tl("enchantmentApplied", enchantmentName.replace('_', ' '))); + player.sendMessage(I18n.tl("enchantmentApplied", enchantmentName.replace('_', ' '))); } charge.charge(player); diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java b/Essentials/src/org/mcess/essentials/signs/SignEntityListener.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java rename to Essentials/src/org/mcess/essentials/signs/SignEntityListener.java index d6753a943..c092d4a6b 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java +++ b/Essentials/src/org/mcess/essentials/signs/SignEntityListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; import net.ess3.api.IEssentials; import org.bukkit.Material; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignException.java b/Essentials/src/org/mcess/essentials/signs/SignException.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/signs/SignException.java rename to Essentials/src/org/mcess/essentials/signs/SignException.java index 9c9ab44a2..73684cfc2 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignException.java +++ b/Essentials/src/org/mcess/essentials/signs/SignException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; public class SignException extends Exception diff --git a/Essentials/src/com/earth2me/essentials/signs/SignFree.java b/Essentials/src/org/mcess/essentials/signs/SignFree.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/signs/SignFree.java rename to Essentials/src/org/mcess/essentials/signs/SignFree.java index 9771d4868..2e1d702be 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignFree.java +++ b/Essentials/src/org/mcess/essentials/signs/SignFree.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import org.bukkit.Material; import org.bukkit.inventory.Inventory; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java b/Essentials/src/org/mcess/essentials/signs/SignGameMode.java similarity index 89% rename from Essentials/src/com/earth2me/essentials/signs/SignGameMode.java rename to Essentials/src/org/mcess/essentials/signs/SignGameMode.java index 51580f7de..26b239d14 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java +++ b/Essentials/src/org/mcess/essentials/signs/SignGameMode.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import java.util.Locale; import net.ess3.api.IEssentials; import org.bukkit.GameMode; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java b/Essentials/src/org/mcess/essentials/signs/SignHeal.java similarity index 75% rename from Essentials/src/com/earth2me/essentials/signs/SignHeal.java rename to Essentials/src/org/mcess/essentials/signs/SignHeal.java index 9f19d2968..62576d338 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java +++ b/Essentials/src/org/mcess/essentials/signs/SignHeal.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; +import org.mcess.essentials.I18n; public class SignHeal extends EssentialsSign @@ -26,14 +26,14 @@ public class SignHeal extends EssentialsSign { if (player.getBase().getHealth() == 0) { - throw new SignException(tl("healDead")); + throw new SignException(I18n.tl("healDead")); } final Trade charge = getTrade(sign, 1, ess); charge.isAffordableFor(player); player.getBase().setHealth(20); player.getBase().setFoodLevel(20); player.getBase().setFireTicks(0); - player.sendMessage(tl("youAreHealed")); + player.sendMessage(I18n.tl("youAreHealed")); charge.charge(player); Trade.log("Sign", "Heal", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess); return true; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignInfo.java b/Essentials/src/org/mcess/essentials/signs/SignInfo.java similarity index 76% rename from Essentials/src/com/earth2me/essentials/signs/SignInfo.java rename to Essentials/src/org/mcess/essentials/signs/SignInfo.java index d890b521d..095b9d743 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignInfo.java +++ b/Essentials/src/org/mcess/essentials/signs/SignInfo.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.TextInput; -import com.earth2me.essentials.textreader.TextPager; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.TextInput; +import org.mcess.essentials.textreader.TextPager; import java.io.IOException; import net.ess3.api.IEssentials; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignKit.java b/Essentials/src/org/mcess/essentials/signs/SignKit.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/signs/SignKit.java rename to Essentials/src/org/mcess/essentials/signs/SignKit.java index c956ef104..81177f17b 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignKit.java +++ b/Essentials/src/org/mcess/essentials/signs/SignKit.java @@ -1,12 +1,16 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; + +import static org.mcess.essentials.I18n.tl; + +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Kit; +import org.mcess.essentials.User; +import org.mcess.essentials.commands.NoChargeException; -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.commands.NoChargeException; -import java.util.List; import java.util.Locale; -import java.util.Map; + import net.ess3.api.IEssentials; +import org.mcess.essentials.Trade; public class SignKit extends EssentialsSign diff --git a/Essentials/src/com/earth2me/essentials/signs/SignMail.java b/Essentials/src/org/mcess/essentials/signs/SignMail.java similarity index 69% rename from Essentials/src/com/earth2me/essentials/signs/SignMail.java rename to Essentials/src/org/mcess/essentials/signs/SignMail.java index 85f150eca..f39581180 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignMail.java +++ b/Essentials/src/org/mcess/essentials/signs/SignMail.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import java.util.List; import net.ess3.api.IEssentials; +import org.mcess.essentials.I18n; public class SignMail extends EssentialsSign @@ -19,14 +19,14 @@ public class SignMail extends EssentialsSign final List mail = player.getMails(); if (mail.isEmpty()) { - player.sendMessage(tl("noNewMail")); + player.sendMessage(I18n.tl("noNewMail")); return false; } for (String s : mail) { player.sendMessage(s); } - player.sendMessage(tl("markMailAsRead")); + player.sendMessage(I18n.tl("markMailAsRead")); return true; } } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java b/Essentials/src/org/mcess/essentials/signs/SignPlayerListener.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java rename to Essentials/src/org/mcess/essentials/signs/SignPlayerListener.java index 042c5003f..dc3e56f3c 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java +++ b/Essentials/src/org/mcess/essentials/signs/SignPlayerListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; import java.util.logging.Level; import net.ess3.api.IEssentials; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/org/mcess/essentials/signs/SignProtection.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/signs/SignProtection.java rename to Essentials/src/org/mcess/essentials/signs/SignProtection.java index 501782968..9d64f37ee 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java +++ b/Essentials/src/org/mcess/essentials/signs/SignProtection.java @@ -1,9 +1,6 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade.OverflowType; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.FormatUtil; import java.util.*; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; @@ -13,6 +10,10 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Sign; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.I18n; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; @Deprecated // This sign will be removed soon @@ -43,7 +44,7 @@ public class SignProtection extends EssentialsSign return true; } } - player.sendMessage(tl("signProtectInvalidLocation")); + player.sendMessage(I18n.tl("signProtectInvalidLocation")); return false; } @@ -86,7 +87,7 @@ public class SignProtection extends EssentialsSign { block.setType(Material.AIR); final Trade trade = new Trade(new ItemStack(Material.SIGN, 1), ess); - trade.pay(player, OverflowType.DROP); + trade.pay(player, Trade.OverflowType.DROP); } } } @@ -257,7 +258,7 @@ public class SignProtection extends EssentialsSign if ((state == SignProtectionState.ALLOWED || state == SignProtectionState.NOT_ALLOWED) && !player.isAuthorized("essentials.signs.protection.override")) { - player.sendMessage(tl("noPlacePermission", block.getType().toString().toLowerCase(Locale.ENGLISH))); + player.sendMessage(I18n.tl("noPlacePermission", block.getType().toString().toLowerCase(Locale.ENGLISH))); return false; } } @@ -282,7 +283,7 @@ public class SignProtection extends EssentialsSign } - player.sendMessage(tl("noAccessPermission", block.getType().toString().toLowerCase(Locale.ENGLISH))); + player.sendMessage(I18n.tl("noAccessPermission", block.getType().toString().toLowerCase(Locale.ENGLISH))); return false; } @@ -305,7 +306,7 @@ public class SignProtection extends EssentialsSign } - player.sendMessage(tl("noDestroyPermission", block.getType().toString().toLowerCase(Locale.ENGLISH))); + player.sendMessage(I18n.tl("noDestroyPermission", block.getType().toString().toLowerCase(Locale.ENGLISH))); return false; } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignRepair.java b/Essentials/src/org/mcess/essentials/signs/SignRepair.java similarity index 78% rename from Essentials/src/com/earth2me/essentials/signs/SignRepair.java rename to Essentials/src/org/mcess/essentials/signs/SignRepair.java index 91c4a4314..b67455eb2 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignRepair.java +++ b/Essentials/src/org/mcess/essentials/signs/SignRepair.java @@ -1,12 +1,12 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.commands.Commandrepair; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.commands.Commandrepair; +import org.mcess.essentials.commands.NotEnoughArgumentsException; import net.ess3.api.IEssentials; +import org.mcess.essentials.I18n; public class SignRepair extends EssentialsSign @@ -27,7 +27,7 @@ public class SignRepair extends EssentialsSign else if (!repairTarget.equalsIgnoreCase("all") && !repairTarget.equalsIgnoreCase("hand")) { sign.setLine(1, "§c"); - throw new SignException(tl("invalidSignLine", 2)); + throw new SignException(I18n.tl("invalidSignLine", 2)); } validateTrade(sign, 2, ess); return true; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignSell.java b/Essentials/src/org/mcess/essentials/signs/SignSell.java similarity index 77% rename from Essentials/src/com/earth2me/essentials/signs/SignSell.java rename to Essentials/src/org/mcess/essentials/signs/SignSell.java index 45fee196e..00df61667 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignSell.java +++ b/Essentials/src/org/mcess/essentials/signs/SignSell.java @@ -1,9 +1,8 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.Trade.OverflowType; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; @@ -29,7 +28,7 @@ public class SignSell extends EssentialsSign final Trade charge = getTrade(sign, 1, 2, player, ess); final Trade money = getTrade(sign, 3, ess); charge.isAffordableFor(player); - money.pay(player, OverflowType.DROP); + money.pay(player, Trade.OverflowType.DROP); charge.charge(player); Trade.log("Sign", "Sell", "Interact", username, charge, username, money, sign.getBlock().getLocation(), ess); return true; diff --git a/Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java b/Essentials/src/org/mcess/essentials/signs/SignSpawnmob.java similarity index 85% rename from Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java rename to Essentials/src/org/mcess/essentials/signs/SignSpawnmob.java index 4916d131b..b5b7d7d54 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/Essentials/src/org/mcess/essentials/signs/SignSpawnmob.java @@ -1,8 +1,11 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.*; import java.util.List; import net.ess3.api.IEssentials; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.SpawnMob; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; public class SignSpawnmob extends EssentialsSign diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTime.java b/Essentials/src/org/mcess/essentials/signs/SignTime.java similarity index 82% rename from Essentials/src/com/earth2me/essentials/signs/SignTime.java rename to Essentials/src/org/mcess/essentials/signs/SignTime.java index 2f6390f7a..8b67990d6 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTime.java +++ b/Essentials/src/org/mcess/essentials/signs/SignTime.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; +import org.mcess.essentials.I18n; public class SignTime extends EssentialsSign @@ -29,7 +29,7 @@ public class SignTime extends EssentialsSign sign.setLine(1, "§2Night"); return true; } - throw new SignException(tl("onlyDayNight")); + throw new SignException(I18n.tl("onlyDayNight")); } @Override @@ -54,6 +54,6 @@ public class SignTime extends EssentialsSign Trade.log("Sign", "TimeNight", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess); return true; } - throw new SignException(tl("onlyDayNight")); + throw new SignException(I18n.tl("onlyDayNight")); } } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/org/mcess/essentials/signs/SignTrade.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/signs/SignTrade.java rename to Essentials/src/org/mcess/essentials/signs/SignTrade.java index 59910cb4d..8b6b8c21d 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java +++ b/Essentials/src/org/mcess/essentials/signs/SignTrade.java @@ -1,16 +1,16 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.*; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade.OverflowType; -import com.earth2me.essentials.Trade.TradeType; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.NumberUtil; import java.math.BigDecimal; import java.util.Map; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +import org.mcess.essentials.I18n; +import org.mcess.essentials.Trade; //TODO: TL exceptions public class SignTrade extends EssentialsSign @@ -28,7 +28,7 @@ public class SignTrade extends EssentialsSign final Trade trade = getTrade(sign, 2, AmountType.ROUNDED, true, ess); final Trade charge = getTrade(sign, 1, AmountType.ROUNDED, false, ess); if (trade.getType() == charge.getType() - && (trade.getType() != TradeType.ITEM || trade.getItemStack().isSimilar(charge.getItemStack()))) + && (trade.getType() != Trade.TradeType.ITEM || trade.getItemStack().isSimilar(charge.getItemStack()))) { throw new SignException("You cannot trade for the same item type."); } @@ -51,7 +51,7 @@ public class SignTrade extends EssentialsSign stored = getTrade(sign, 1, AmountType.TOTAL, true, ess); subtractAmount(sign, 1, stored, ess); - Map withdraw = stored.pay(player, OverflowType.RETURN); + Map withdraw = stored.pay(player, Trade.OverflowType.RETURN); if (withdraw == null) { @@ -67,7 +67,7 @@ public class SignTrade extends EssentialsSign { if (store == null) { - throw new SignException(tl("tradeSignEmptyOwner"), e); + throw new SignException(I18n.tl("tradeSignEmptyOwner"), e); } } Trade.log("Sign", "Trade", "Deposit", username, store, username, null, sign.getBlock().getLocation(), ess); @@ -137,8 +137,8 @@ public class SignTrade extends EssentialsSign return true; } - final Map withdraw1 = stored1.pay(player, OverflowType.RETURN); - final Map withdraw2 = stored2.pay(player, OverflowType.RETURN); + final Map withdraw1 = stored1.pay(player, Trade.OverflowType.RETURN); + final Map withdraw2 = stored2.pay(player, Trade.OverflowType.RETURN); if (withdraw1 == null && withdraw2 == null) { @@ -202,7 +202,7 @@ public class SignTrade extends EssentialsSign amount = amount.subtract(amount.remainder(money)); if (amount.compareTo(MINTRANSACTION) < 0 || money.compareTo(MINTRANSACTION) < 0) { - throw new SignException(tl("moreThanZero")); + throw new SignException(I18n.tl("moreThanZero")); } sign.setLine(index, NumberUtil.shortCurrency(money, ess) + ":" + NumberUtil.shortCurrency(amount, ess).substring(1)); return; @@ -215,12 +215,12 @@ public class SignTrade extends EssentialsSign if (amount < 1) { - throw new SignException(tl("moreThanZero")); + throw new SignException(I18n.tl("moreThanZero")); } if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], amount, ess).getType() == Material.AIR) { - throw new SignException(tl("moreThanZero")); + throw new SignException(I18n.tl("moreThanZero")); } String newline = amount + " " + split[1] + ":0"; if ((newline + amount).length() > 15) @@ -238,17 +238,17 @@ public class SignTrade extends EssentialsSign amount -= amount % stackamount; if (amount < 1 || stackamount < 1) { - throw new SignException(tl("moreThanZero")); + throw new SignException(I18n.tl("moreThanZero")); } if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], stackamount, ess).getType() == Material.AIR) { - throw new SignException(tl("moreThanZero")); + throw new SignException(I18n.tl("moreThanZero")); } sign.setLine(index, stackamount + " " + split[1] + ":" + amount); return; } - throw new SignException(tl("invalidSignLine", index + 1)); + throw new SignException(I18n.tl("invalidSignLine", index + 1)); } protected final Trade getTrade(final ISign sign, final int index, final AmountType amountType, final boolean notEmpty, final IEssentials ess) throws SignException @@ -273,7 +273,7 @@ public class SignTrade extends EssentialsSign } catch (SignException e) { - throw new SignException(tl("tradeSignEmpty"), e); + throw new SignException(I18n.tl("tradeSignEmpty"), e); } } @@ -289,7 +289,7 @@ public class SignTrade extends EssentialsSign } if (notEmpty && (amount < 1 || stackamount < 1)) { - throw new SignException(tl("tradeSignEmpty")); + throw new SignException(I18n.tl("tradeSignEmpty")); } return new Trade((amountType == AmountType.COST ? stackamount : amount), ess); } @@ -304,13 +304,13 @@ public class SignTrade extends EssentialsSign } if (notEmpty && (amount < 1 || stackamount < 1 || item.getType() == Material.AIR || amount < stackamount)) { - throw new SignException(tl("tradeSignEmpty")); + throw new SignException(I18n.tl("tradeSignEmpty")); } item.setAmount(amountType == AmountType.COST ? stackamount : amount); return new Trade(item, ess); } } - throw new SignException(tl("invalidSignLine", index + 1)); + throw new SignException(I18n.tl("invalidSignLine", index + 1)); } protected final void subtractAmount(final ISign sign, final int index, final Trade trade, final IEssentials ess) throws SignException @@ -373,7 +373,7 @@ public class SignTrade extends EssentialsSign setAmount(sign, index, amount, ess); return; } - throw new SignException(tl("invalidSignLine", index + 1)); + throw new SignException(I18n.tl("invalidSignLine", index + 1)); } //TODO: Translate these exceptions. @@ -429,7 +429,7 @@ public class SignTrade extends EssentialsSign return; } } - throw new SignException(tl("invalidSignLine", index + 1)); + throw new SignException(I18n.tl("invalidSignLine", index + 1)); } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java b/Essentials/src/org/mcess/essentials/signs/SignWarp.java similarity index 86% rename from Essentials/src/com/earth2me/essentials/signs/SignWarp.java rename to Essentials/src/org/mcess/essentials/signs/SignWarp.java index 2281ec650..72f830c6d 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java +++ b/Essentials/src/org/mcess/essentials/signs/SignWarp.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class SignWarp extends EssentialsSign @@ -24,7 +24,7 @@ public class SignWarp extends EssentialsSign if (warpName.isEmpty()) { sign.setLine(1, "§c"); - throw new SignException(tl("invalidSignLine", 1)); + throw new SignException(I18n.tl("invalidSignLine", 1)); } else { diff --git a/Essentials/src/com/earth2me/essentials/signs/SignWeather.java b/Essentials/src/org/mcess/essentials/signs/SignWeather.java similarity index 82% rename from Essentials/src/com/earth2me/essentials/signs/SignWeather.java rename to Essentials/src/org/mcess/essentials/signs/SignWeather.java index 910adeb32..02aa46bd5 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignWeather.java +++ b/Essentials/src/org/mcess/essentials/signs/SignWeather.java @@ -1,10 +1,10 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; -import com.earth2me.essentials.ChargeException; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; +import org.mcess.essentials.I18n; public class SignWeather extends EssentialsSign @@ -30,7 +30,7 @@ public class SignWeather extends EssentialsSign return true; } sign.setLine(1, "§c"); - throw new SignException(tl("onlySunStorm")); + throw new SignException(I18n.tl("onlySunStorm")); } @Override @@ -53,6 +53,6 @@ public class SignWeather extends EssentialsSign Trade.log("Sign", "WeatherStorm", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess); return true; } - throw new SignException(tl("onlySunStorm")); + throw new SignException(I18n.tl("onlySunStorm")); } } diff --git a/Essentials/src/com/earth2me/essentials/signs/Signs.java b/Essentials/src/org/mcess/essentials/signs/Signs.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/signs/Signs.java rename to Essentials/src/org/mcess/essentials/signs/Signs.java index 8076cb2a7..b460dab25 100644 --- a/Essentials/src/com/earth2me/essentials/signs/Signs.java +++ b/Essentials/src/org/mcess/essentials/signs/Signs.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.signs; +package org.mcess.essentials.signs; //This enum is used when checking to see what signs are enabled public enum Signs diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/org/mcess/essentials/storage/AbstractDelayedYamlFileReader.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java rename to Essentials/src/org/mcess/essentials/storage/AbstractDelayedYamlFileReader.java index 752a48289..430865ab3 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/org/mcess/essentials/storage/AbstractDelayedYamlFileReader.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; import java.io.File; import java.io.FileNotFoundException; diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/org/mcess/essentials/storage/AbstractDelayedYamlFileWriter.java similarity index 95% rename from Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java rename to Essentials/src/org/mcess/essentials/storage/AbstractDelayedYamlFileWriter.java index cf1c1c90e..54824601b 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/org/mcess/essentials/storage/AbstractDelayedYamlFileWriter.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; import java.io.File; import java.io.FileNotFoundException; diff --git a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java b/Essentials/src/org/mcess/essentials/storage/AsyncStorageObjectHolder.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java rename to Essentials/src/org/mcess/essentials/storage/AsyncStorageObjectHolder.java index 5282587e7..8ce4ae851 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/org/mcess/essentials/storage/AsyncStorageObjectHolder.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; -import com.earth2me.essentials.IConf; +import org.mcess.essentials.IConf; import java.io.File; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; diff --git a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java b/Essentials/src/org/mcess/essentials/storage/BukkitConstructor.java similarity index 99% rename from Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java rename to Essentials/src/org/mcess/essentials/storage/BukkitConstructor.java index cf0a656a6..bcaed0eae 100644 --- a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java +++ b/Essentials/src/org/mcess/essentials/storage/BukkitConstructor.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.utils.NumberUtil; import java.lang.reflect.Field; import java.util.List; import java.util.Locale; diff --git a/Essentials/src/com/earth2me/essentials/storage/Comment.java b/Essentials/src/org/mcess/essentials/storage/Comment.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/storage/Comment.java rename to Essentials/src/org/mcess/essentials/storage/Comment.java index 8cb9d4d31..394fa09c2 100644 --- a/Essentials/src/com/earth2me/essentials/storage/Comment.java +++ b/Essentials/src/org/mcess/essentials/storage/Comment.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; import java.lang.annotation.*; diff --git a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java b/Essentials/src/org/mcess/essentials/storage/EnchantmentLevel.java similarity index 97% rename from Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java rename to Essentials/src/org/mcess/essentials/storage/EnchantmentLevel.java index f4cacea67..45466d3ed 100644 --- a/Essentials/src/com/earth2me/essentials/storage/EnchantmentLevel.java +++ b/Essentials/src/org/mcess/essentials/storage/EnchantmentLevel.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.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/org/mcess/essentials/storage/IStorageObjectHolder.java similarity index 80% rename from Essentials/src/com/earth2me/essentials/storage/IStorageObjectHolder.java rename to Essentials/src/org/mcess/essentials/storage/IStorageObjectHolder.java index 4e860bd8c..88b72e041 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageObjectHolder.java +++ b/Essentials/src/org/mcess/essentials/storage/IStorageObjectHolder.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; public interface IStorageObjectHolder diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java b/Essentials/src/org/mcess/essentials/storage/IStorageReader.java similarity index 76% rename from Essentials/src/com/earth2me/essentials/storage/IStorageReader.java rename to Essentials/src/org/mcess/essentials/storage/IStorageReader.java index d59adafe0..f0d7c91ba 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageReader.java +++ b/Essentials/src/org/mcess/essentials/storage/IStorageReader.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; public interface IStorageReader diff --git a/Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java b/Essentials/src/org/mcess/essentials/storage/IStorageWriter.java similarity index 65% rename from Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java rename to Essentials/src/org/mcess/essentials/storage/IStorageWriter.java index 5b8498869..d66110347 100644 --- a/Essentials/src/com/earth2me/essentials/storage/IStorageWriter.java +++ b/Essentials/src/org/mcess/essentials/storage/IStorageWriter.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; public interface IStorageWriter diff --git a/Essentials/src/com/earth2me/essentials/storage/ListType.java b/Essentials/src/org/mcess/essentials/storage/ListType.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/storage/ListType.java rename to Essentials/src/org/mcess/essentials/storage/ListType.java index 9bf6e2e64..d9b59b8e2 100644 --- a/Essentials/src/com/earth2me/essentials/storage/ListType.java +++ b/Essentials/src/org/mcess/essentials/storage/ListType.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Essentials/src/com/earth2me/essentials/storage/MapKeyType.java b/Essentials/src/org/mcess/essentials/storage/MapKeyType.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/storage/MapKeyType.java rename to Essentials/src/org/mcess/essentials/storage/MapKeyType.java index aa162e51c..c92d199b5 100644 --- a/Essentials/src/com/earth2me/essentials/storage/MapKeyType.java +++ b/Essentials/src/org/mcess/essentials/storage/MapKeyType.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.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/org/mcess/essentials/storage/MapValueType.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/storage/MapValueType.java rename to Essentials/src/org/mcess/essentials/storage/MapValueType.java index 1b5fff978..04255887f 100644 --- a/Essentials/src/com/earth2me/essentials/storage/MapValueType.java +++ b/Essentials/src/org/mcess/essentials/storage/MapValueType.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.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/org/mcess/essentials/storage/ObjectLoadException.java similarity index 75% rename from Essentials/src/com/earth2me/essentials/storage/ObjectLoadException.java rename to Essentials/src/org/mcess/essentials/storage/ObjectLoadException.java index 8b804abc3..bd85be920 100644 --- a/Essentials/src/com/earth2me/essentials/storage/ObjectLoadException.java +++ b/Essentials/src/org/mcess/essentials/storage/ObjectLoadException.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; public class ObjectLoadException extends Exception diff --git a/Essentials/src/org/mcess/essentials/storage/StorageObject.java b/Essentials/src/org/mcess/essentials/storage/StorageObject.java new file mode 100644 index 000000000..fa226627f --- /dev/null +++ b/Essentials/src/org/mcess/essentials/storage/StorageObject.java @@ -0,0 +1,6 @@ +package org.mcess.essentials.storage; + + +public interface StorageObject +{ +} diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java b/Essentials/src/org/mcess/essentials/storage/YamlStorageReader.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java rename to Essentials/src/org/mcess/essentials/storage/YamlStorageReader.java index 6f921ec10..7b4a444f7 100644 --- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java +++ b/Essentials/src/org/mcess/essentials/storage/YamlStorageReader.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; import java.io.Reader; import java.lang.reflect.Field; diff --git a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java b/Essentials/src/org/mcess/essentials/storage/YamlStorageWriter.java similarity index 99% rename from Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java rename to Essentials/src/org/mcess/essentials/storage/YamlStorageWriter.java index f08e734f8..0a86c59d4 100644 --- a/Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java +++ b/Essentials/src/org/mcess/essentials/storage/YamlStorageWriter.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.storage; +package org.mcess.essentials.storage; import java.io.PrintWriter; import java.lang.reflect.Field; diff --git a/Essentials/src/com/earth2me/essentials/textreader/BookInput.java b/Essentials/src/org/mcess/essentials/textreader/BookInput.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/textreader/BookInput.java rename to Essentials/src/org/mcess/essentials/textreader/BookInput.java index 4c0ee9236..e26810d0a 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/BookInput.java +++ b/Essentials/src/org/mcess/essentials/textreader/BookInput.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; import java.io.*; import java.lang.ref.SoftReference; diff --git a/Essentials/src/com/earth2me/essentials/textreader/BookPager.java b/Essentials/src/org/mcess/essentials/textreader/BookPager.java similarity index 96% rename from Essentials/src/com/earth2me/essentials/textreader/BookPager.java rename to Essentials/src/org/mcess/essentials/textreader/BookPager.java index b84bfea79..27f011e2d 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/BookPager.java +++ b/Essentials/src/org/mcess/essentials/textreader/BookPager.java @@ -1,6 +1,7 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; + +import org.mcess.essentials.I18n; -import static com.earth2me.essentials.I18n.tl; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -29,7 +30,7 @@ public class BookPager //This checks to see if we have the chapter in the index if (!bookmarks.containsKey(pageStr.toLowerCase(Locale.ENGLISH))) { - throw new Exception(tl("infoUnknownChapter")); + throw new Exception(I18n.tl("infoUnknownChapter")); } //Since we have a valid chapter, count the number of lines in the chapter diff --git a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java b/Essentials/src/org/mcess/essentials/textreader/HelpInput.java similarity index 84% rename from Essentials/src/com/earth2me/essentials/textreader/HelpInput.java rename to Essentials/src/org/mcess/essentials/textreader/HelpInput.java index 1e74871d4..6bf03c5fc 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java +++ b/Essentials/src/org/mcess/essentials/textreader/HelpInput.java @@ -1,7 +1,6 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import java.io.IOException; import java.util.*; import java.util.logging.Level; @@ -9,6 +8,7 @@ import java.util.logging.Logger; import net.ess3.api.IEssentials; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; +import org.mcess.essentials.I18n; public class HelpInput implements IText @@ -29,7 +29,7 @@ public class HelpInput implements IText String pluginNameLow = ""; if (!match.equalsIgnoreCase("")) { - lines.add(tl("helpMatching", match)); + lines.add(I18n.tl("helpMatching", match)); } for (Plugin p : ess.getServer().getPluginManager().getPlugins()) @@ -45,7 +45,7 @@ public class HelpInput implements IText { lines.clear(); newLines.clear(); - lines.add(tl("helpFrom", p.getDescription().getName())); + lines.add(I18n.tl("helpFrom", p.getDescription().getName())); } final boolean isOnWhitelist = user.isAuthorized("essentials.help." + pluginNameLow); @@ -65,7 +65,7 @@ public class HelpInput implements IText final String node = "essentials." + k.getKey(); if (!ess.getSettings().isCommandDisabled(k.getKey()) && user.isAuthorized(node)) { - pluginLines.add(tl("helpLine", k.getKey(), k.getValue().get(DESCRIPTION))); + pluginLines.add(I18n.tl("helpLine", k.getKey(), k.getValue().get(DESCRIPTION))); } } else @@ -84,7 +84,7 @@ public class HelpInput implements IText } if (isOnWhitelist || user.isAuthorized("essentials.help." + pluginNameLow + "." + k.getKey())) { - pluginLines.add(tl("helpLine", k.getKey(), value.get(DESCRIPTION))); + pluginLines.add(I18n.tl("helpLine", k.getKey(), value.get(DESCRIPTION))); } else if (permissions instanceof List && !((List)permissions).isEmpty()) { @@ -99,21 +99,21 @@ public class HelpInput implements IText } if (enabled) { - pluginLines.add(tl("helpLine", k.getKey(), value.get(DESCRIPTION))); + pluginLines.add(I18n.tl("helpLine", k.getKey(), value.get(DESCRIPTION))); } } else if (permissions instanceof String && !"".equals(permissions)) { if (user.isAuthorized(permissions.toString())) { - pluginLines.add(tl("helpLine", k.getKey(), value.get(DESCRIPTION))); + pluginLines.add(I18n.tl("helpLine", k.getKey(), value.get(DESCRIPTION))); } } else { if (!ess.getSettings().hidePermissionlessHelp()) { - pluginLines.add(tl("helpLine", k.getKey(), value.get(DESCRIPTION))); + pluginLines.add(I18n.tl("helpLine", k.getKey(), value.get(DESCRIPTION))); } } } @@ -132,7 +132,7 @@ public class HelpInput implements IText } if (match.equalsIgnoreCase("")) { - lines.add(tl("helpPlugin", pluginName, pluginNameLow)); + lines.add(I18n.tl("helpPlugin", pluginName, pluginNameLow)); } } } @@ -143,7 +143,7 @@ public class HelpInput implements IText { if (!reported) { - logger.log(Level.WARNING, tl("commandHelpFailedForPlugin", pluginNameLow), ex); + logger.log(Level.WARNING, I18n.tl("commandHelpFailedForPlugin", pluginNameLow), ex); } reported = true; } diff --git a/Essentials/src/com/earth2me/essentials/textreader/IText.java b/Essentials/src/org/mcess/essentials/textreader/IText.java similarity index 89% rename from Essentials/src/com/earth2me/essentials/textreader/IText.java rename to Essentials/src/org/mcess/essentials/textreader/IText.java index 60db6dadf..715eeddc6 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/IText.java +++ b/Essentials/src/org/mcess/essentials/textreader/IText.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; import java.util.List; import java.util.Map; diff --git a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java b/Essentials/src/org/mcess/essentials/textreader/KeywordReplacer.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java rename to Essentials/src/org/mcess/essentials/textreader/KeywordReplacer.java index c2c40b1dc..c1e69c928 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java +++ b/Essentials/src/org/mcess/essentials/textreader/KeywordReplacer.java @@ -1,15 +1,12 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.ExecuteTimer; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.PlayerList; -import com.earth2me.essentials.User; -import static com.earth2me.essentials.textreader.KeywordType.DISPLAYNAME; -import static com.earth2me.essentials.textreader.KeywordType.PLAYER; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.DescParseTickFormat; -import com.earth2me.essentials.utils.NumberUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.ExecuteTimer; +import org.mcess.essentials.PlayerList; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.DescParseTickFormat; +import org.mcess.essentials.utils.NumberUtil; import java.lang.management.ManagementFactory; import java.text.DateFormat; import java.util.ArrayList; @@ -27,6 +24,7 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import org.mcess.essentials.I18n; public class KeywordReplacer implements IText @@ -282,7 +280,7 @@ public class KeywordReplacer implements IText if (user != null) { final Location location = user.getLocation(); - replacer = tl("coordsKeyword", location.getBlockX(), location.getBlockY(), location.getBlockZ()); + replacer = I18n.tl("coordsKeyword", location.getBlockX(), location.getBlockY(), location.getBlockZ()); } break; case TPS: diff --git a/Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java b/Essentials/src/org/mcess/essentials/textreader/SimpleTextInput.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java rename to Essentials/src/org/mcess/essentials/textreader/SimpleTextInput.java index f15ce6df5..65eae620b 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java +++ b/Essentials/src/org/mcess/essentials/textreader/SimpleTextInput.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; import java.util.*; diff --git a/Essentials/src/com/earth2me/essentials/textreader/SimpleTextPager.java b/Essentials/src/org/mcess/essentials/textreader/SimpleTextPager.java similarity index 84% rename from Essentials/src/com/earth2me/essentials/textreader/SimpleTextPager.java rename to Essentials/src/org/mcess/essentials/textreader/SimpleTextPager.java index 2556201f1..61c7ce7c2 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/SimpleTextPager.java +++ b/Essentials/src/org/mcess/essentials/textreader/SimpleTextPager.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; -import com.earth2me.essentials.CommandSource; +import org.mcess.essentials.CommandSource; import java.util.List; public class SimpleTextPager diff --git a/Essentials/src/com/earth2me/essentials/textreader/TextInput.java b/Essentials/src/org/mcess/essentials/textreader/TextInput.java similarity index 94% rename from Essentials/src/com/earth2me/essentials/textreader/TextInput.java rename to Essentials/src/org/mcess/essentials/textreader/TextInput.java index 7de60979d..ea785aa6c 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/TextInput.java +++ b/Essentials/src/org/mcess/essentials/textreader/TextInput.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; -import com.earth2me.essentials.utils.StringUtil; +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; +import org.mcess.essentials.utils.StringUtil; import java.io.*; import java.lang.ref.SoftReference; import java.util.*; diff --git a/Essentials/src/com/earth2me/essentials/textreader/TextPager.java b/Essentials/src/org/mcess/essentials/textreader/TextPager.java similarity index 87% rename from Essentials/src/com/earth2me/essentials/textreader/TextPager.java rename to Essentials/src/org/mcess/essentials/textreader/TextPager.java index 13b8aca00..87f13e644 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/TextPager.java +++ b/Essentials/src/org/mcess/essentials/textreader/TextPager.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.textreader; +package org.mcess.essentials.textreader; + +import org.mcess.essentials.CommandSource; +import org.mcess.essentials.I18n; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.I18n; -import static com.earth2me.essentials.I18n.tl; import java.util.List; import java.util.Locale; import java.util.Map; @@ -42,7 +42,7 @@ public class TextPager { return; } - sender.sendMessage(tl("infoChapter")); + sender.sendMessage(I18n.tl("infoChapter")); final StringBuilder sb = new StringBuilder(); boolean first = true; for (String string : chapters) @@ -99,7 +99,7 @@ public class TextPager { content.append(I18n.capitalCase(commandName)); } - sender.sendMessage(tl("infoPages", page, pages, content)); + sender.sendMessage(I18n.tl("infoPages", page, pages, content)); } for (int i = start; i < end && i < start + (onePage ? 20 : 9); i++) { @@ -107,7 +107,7 @@ public class TextPager } if (!onePage && page < pages && commandName != null) { - sender.sendMessage(tl("readNextPage", commandName, page + 1)); + sender.sendMessage(I18n.tl("readNextPage", commandName, page + 1)); } return; } @@ -134,7 +134,7 @@ public class TextPager //This checks to see if we have the chapter in the index if (!bookmarks.containsKey(pageStr.toLowerCase(Locale.ENGLISH))) { - sender.sendMessage(tl("infoUnknownChapter")); + sender.sendMessage(I18n.tl("infoUnknownChapter")); return; } @@ -159,7 +159,7 @@ public class TextPager StringBuilder content = new StringBuilder(); content.append(I18n.capitalCase(commandName)).append(": "); content.append(pageStr); - sender.sendMessage(tl("infoChapterPages", content, page, pages)); + sender.sendMessage(I18n.tl("infoChapterPages", content, page, pages)); } for (int i = start; i < chapterend && i < start + (onePage ? 20 : 9); i++) { @@ -167,7 +167,7 @@ public class TextPager } if (!onePage && page < pages && commandName != null) { - sender.sendMessage(tl("readNextPage", commandName, pageStr + " " + (page + 1))); + sender.sendMessage(I18n.tl("readNextPage", commandName, pageStr + " " + (page + 1))); } } } diff --git a/Essentials/src/com/earth2me/essentials/utils/DateUtil.java b/Essentials/src/org/mcess/essentials/utils/DateUtil.java similarity index 91% rename from Essentials/src/com/earth2me/essentials/utils/DateUtil.java rename to Essentials/src/org/mcess/essentials/utils/DateUtil.java index 77a374f88..88e5e0936 100644 --- a/Essentials/src/com/earth2me/essentials/utils/DateUtil.java +++ b/Essentials/src/org/mcess/essentials/utils/DateUtil.java @@ -1,6 +1,7 @@ -package com.earth2me.essentials.utils; +package org.mcess.essentials.utils; + +import org.mcess.essentials.I18n; -import static com.earth2me.essentials.I18n.tl; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.regex.Matcher; @@ -76,7 +77,7 @@ public class DateUtil } if (!found) { - throw new Exception(tl("illegalDate")); + throw new Exception(I18n.tl("illegalDate")); } Calendar c = new GregorianCalendar(); if (years > 0) @@ -144,7 +145,7 @@ public class DateUtil boolean future = false; if (toDate.equals(fromDate)) { - return tl("now"); + return I18n.tl("now"); } if (toDate.after(fromDate)) { @@ -157,7 +158,7 @@ public class DateUtil }; String[] names = new String[] { - tl("year"), tl("years"), tl("month"), tl("months"), tl("day"), tl("days"), tl("hour"), tl("hours"), tl("minute"), tl("minutes"), tl("second"), tl("seconds") + I18n.tl("year"), I18n.tl("years"), I18n.tl("month"), I18n.tl("months"), I18n.tl("day"), I18n.tl("days"), I18n.tl("hour"), I18n.tl("hours"), I18n.tl("minute"), I18n.tl("minutes"), I18n.tl("second"), I18n.tl("seconds") }; int accuracy = 0; for (int i = 0; i < types.length; i++) diff --git a/Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java b/Essentials/src/org/mcess/essentials/utils/DescParseTickFormat.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java rename to Essentials/src/org/mcess/essentials/utils/DescParseTickFormat.java index f2087f914..030459bd9 100644 --- a/Essentials/src/com/earth2me/essentials/utils/DescParseTickFormat.java +++ b/Essentials/src/org/mcess/essentials/utils/DescParseTickFormat.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.utils; +package org.mcess.essentials.utils; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; import java.text.SimpleDateFormat; import java.util.*; diff --git a/Essentials/src/com/earth2me/essentials/utils/FormatUtil.java b/Essentials/src/org/mcess/essentials/utils/FormatUtil.java similarity index 99% rename from Essentials/src/com/earth2me/essentials/utils/FormatUtil.java rename to Essentials/src/org/mcess/essentials/utils/FormatUtil.java index 7da311ebe..4796ae8b8 100644 --- a/Essentials/src/com/earth2me/essentials/utils/FormatUtil.java +++ b/Essentials/src/org/mcess/essentials/utils/FormatUtil.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils; +package org.mcess.essentials.utils; import java.util.regex.Pattern; import net.ess3.api.IUser; diff --git a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java b/Essentials/src/org/mcess/essentials/utils/LocationUtil.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/utils/LocationUtil.java rename to Essentials/src/org/mcess/essentials/utils/LocationUtil.java index 8f0b926fc..872993447 100644 --- a/Essentials/src/com/earth2me/essentials/utils/LocationUtil.java +++ b/Essentials/src/org/mcess/essentials/utils/LocationUtil.java @@ -1,7 +1,6 @@ -package com.earth2me.essentials.utils; +package org.mcess.essentials.utils; -import com.earth2me.essentials.Essentials; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java b/Essentials/src/org/mcess/essentials/utils/NumberUtil.java similarity index 93% rename from Essentials/src/com/earth2me/essentials/utils/NumberUtil.java rename to Essentials/src/org/mcess/essentials/utils/NumberUtil.java index 2c03d33da..1552a6717 100644 --- a/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java +++ b/Essentials/src/org/mcess/essentials/utils/NumberUtil.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.utils; +package org.mcess.essentials.utils; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/Essentials/src/com/earth2me/essentials/utils/StringUtil.java b/Essentials/src/org/mcess/essentials/utils/StringUtil.java similarity index 98% rename from Essentials/src/com/earth2me/essentials/utils/StringUtil.java rename to Essentials/src/org/mcess/essentials/utils/StringUtil.java index 6bb91313e..75eadfb7c 100644 --- a/Essentials/src/com/earth2me/essentials/utils/StringUtil.java +++ b/Essentials/src/org/mcess/essentials/utils/StringUtil.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.utils; +package org.mcess.essentials.utils; import java.util.*; import java.util.regex.Pattern; diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index f05b2a7c1..52d640963 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 -main: com.earth2me.essentials.Essentials +main: org.mcess.essentials.Essentials # Note to developers: This next line cannot change, or the automatic versioning system will break. version: TeamCity website: http://tiny.cc/EssentialsCommands diff --git a/Essentials/test/com/earth2me/essentials/EconomyTest.java b/Essentials/test/org/mcess/essentials/EconomyTest.java similarity index 95% rename from Essentials/test/com/earth2me/essentials/EconomyTest.java rename to Essentials/test/org/mcess/essentials/EconomyTest.java index 00d994b2b..c21ad289a 100644 --- a/Essentials/test/com/earth2me/essentials/EconomyTest.java +++ b/Essentials/test/org/mcess/essentials/EconomyTest.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.api.NoLoanPermittedException; -import com.earth2me.essentials.api.UserDoesNotExistException; +import org.mcess.essentials.api.NoLoanPermittedException; +import org.mcess.essentials.api.UserDoesNotExistException; import java.io.IOException; import junit.framework.TestCase; import static junit.framework.TestCase.assertFalse; diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/org/mcess/essentials/FakeServer.java similarity index 98% rename from Essentials/test/com/earth2me/essentials/FakeServer.java rename to Essentials/test/org/mcess/essentials/FakeServer.java index e11d4ab76..51cf9d46b 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/org/mcess/essentials/FakeServer.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import com.avaje.ebean.config.ServerConfig; -import com.earth2me.essentials.craftbukkit.FakeWorld; +import org.mcess.essentials.craftbukkit.FakeWorld; import java.awt.image.BufferedImage; import java.io.File; @@ -397,9 +397,9 @@ public class FakeServer implements Server pluginManager.callEvent(new PlayerJoinEvent(base1, null)); } - public OfflinePlayer createPlayer(String name) + public org.mcess.essentials.OfflinePlayer createPlayer(String name) { - OfflinePlayer player = new OfflinePlayer(name, this); + org.mcess.essentials.OfflinePlayer player = new org.mcess.essentials.OfflinePlayer(name, this); player.setLocation(new Location(worlds.get(0), 0, 0, 0, 0, 0)); return player; } @@ -842,7 +842,7 @@ public class FakeServer implements Server } @Override - public OfflinePlayer[] getOfflinePlayers() + public org.mcess.essentials.OfflinePlayer[] getOfflinePlayers() { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/Essentials/test/com/earth2me/essentials/StorageTest.java b/Essentials/test/org/mcess/essentials/StorageTest.java similarity index 97% rename from Essentials/test/com/earth2me/essentials/StorageTest.java rename to Essentials/test/org/mcess/essentials/StorageTest.java index 617d3c6b3..9a3511df2 100644 --- a/Essentials/test/com/earth2me/essentials/StorageTest.java +++ b/Essentials/test/org/mcess/essentials/StorageTest.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import java.io.IOException; import junit.framework.TestCase; diff --git a/Essentials/test/com/earth2me/essentials/ToggleTest.java b/Essentials/test/org/mcess/essentials/ToggleTest.java similarity index 93% rename from Essentials/test/com/earth2me/essentials/ToggleTest.java rename to Essentials/test/org/mcess/essentials/ToggleTest.java index d3a496df9..288d2a92d 100644 --- a/Essentials/test/com/earth2me/essentials/ToggleTest.java +++ b/Essentials/test/org/mcess/essentials/ToggleTest.java @@ -1,7 +1,8 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.commands.IEssentialsCommand; -import com.earth2me.essentials.commands.NoChargeException; +import org.junit.Test; +import org.mcess.essentials.commands.IEssentialsCommand; +import org.mcess.essentials.commands.NoChargeException; import java.io.IOException; import junit.framework.TestCase; import org.bukkit.World.Environment; @@ -9,8 +10,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.plugin.InvalidDescriptionException; -public class ToggleTest extends TestCase -{ +public class ToggleTest extends TestCase{ private final OfflinePlayer base1; private final Essentials ess; private final FakeServer server; @@ -44,7 +44,7 @@ public class ToggleTest extends TestCase try { - cmd = (IEssentialsCommand)Essentials.class.getClassLoader().loadClass("com.earth2me.essentials.commands.Command" + command).newInstance(); + cmd = (IEssentialsCommand)Essentials.class.getClassLoader().loadClass("org.mcess.essentials.commands.Command" + command).newInstance(); cmd.setEssentials(ess); cmd.run(server, user, command, null, args); } @@ -62,7 +62,7 @@ public class ToggleTest extends TestCase try { - cmd = (IEssentialsCommand)Essentials.class.getClassLoader().loadClass("com.earth2me.essentials.commands.Command" + command).newInstance(); + cmd = (IEssentialsCommand)Essentials.class.getClassLoader().loadClass("org.mcess.essentials.commands.Command" + command).newInstance(); cmd.setEssentials(ess); cmd.run(server, new CommandSource(sender), command, null, args); } @@ -72,6 +72,7 @@ public class ToggleTest extends TestCase } + @Test public void testFlyToggle() throws Exception { User user = ess.getUser(base1); @@ -113,6 +114,7 @@ public class ToggleTest extends TestCase assertFalse(user.getBase().getAllowFlight()); } + @Test public void testFlyDisOnToggle() throws Exception { User user = ess.getUser(base1); @@ -127,6 +129,7 @@ public class ToggleTest extends TestCase assertFalse(user.getBase().isFlying()); } + @Test public void testGodToggle() throws Exception { User user = ess.getUser(base1); @@ -168,6 +171,7 @@ public class ToggleTest extends TestCase assertFalse(user.isGodModeEnabled()); } + @Test public void testConsoleToggle() throws Exception { User user = ess.getUser(base1); @@ -211,6 +215,7 @@ public class ToggleTest extends TestCase assertFalse(user.getBase().getAllowFlight()); } + @Test public void testAliasesToggle() throws Exception { User user = ess.getUser(base1); diff --git a/Essentials/test/com/earth2me/essentials/UserTest.java b/Essentials/test/org/mcess/essentials/UserTest.java similarity index 98% rename from Essentials/test/com/earth2me/essentials/UserTest.java rename to Essentials/test/org/mcess/essentials/UserTest.java index 7bae28c31..090eff5ca 100644 --- a/Essentials/test/com/earth2me/essentials/UserTest.java +++ b/Essentials/test/org/mcess/essentials/UserTest.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials; +package org.mcess.essentials; import java.io.IOException; import java.math.BigDecimal; diff --git a/Essentials/test/com/earth2me/essentials/UtilTest.java b/Essentials/test/org/mcess/essentials/UtilTest.java similarity index 98% rename from Essentials/test/com/earth2me/essentials/UtilTest.java rename to Essentials/test/org/mcess/essentials/UtilTest.java index 497d26d7a..2dbb18402 100644 --- a/Essentials/test/com/earth2me/essentials/UtilTest.java +++ b/Essentials/test/org/mcess/essentials/UtilTest.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials; +package org.mcess.essentials; -import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.LocationUtil; +import org.mcess.essentials.utils.DateUtil; +import org.mcess.essentials.utils.LocationUtil; import java.io.IOException; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml index 66eae3c20..7478d5b3d 100644 --- a/EssentialsAntiBuild/pom.xml +++ b/EssentialsAntiBuild/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - net.ess3 + org.mcess EssentialsParent 2.x-SNAPSHOT @@ -43,7 +43,7 @@ - net.ess3 + org.mcess Essentials ${project.version} diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/AntiBuildConfig.java b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/AntiBuildConfig.java similarity index 97% rename from EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/AntiBuildConfig.java rename to EssentialsAntiBuild/src/org/mcess/essentials/antibuild/AntiBuildConfig.java index f0cdfcef4..ec93c55e8 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/AntiBuildConfig.java +++ b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/AntiBuildConfig.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.antibuild; +package org.mcess.essentials.antibuild; public enum AntiBuildConfig diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuild.java b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsAntiBuild.java similarity index 97% rename from EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuild.java rename to EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsAntiBuild.java index 8654b9949..3e7d3daaa 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuild.java +++ b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsAntiBuild.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.antibuild; +package org.mcess.essentials.antibuild; import java.util.EnumMap; import java.util.List; diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsAntiBuildListener.java similarity index 98% rename from EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java rename to EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsAntiBuildListener.java index f9e924931..61b109112 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsAntiBuildListener.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.antibuild; +package org.mcess.essentials.antibuild; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import java.util.logging.Level; import org.bukkit.Material; diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsConnect.java similarity index 80% rename from EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java rename to EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsConnect.java index 2a7b4ecf7..bc273d3aa 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java +++ b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/EssentialsConnect.java @@ -1,14 +1,14 @@ -package com.earth2me.essentials.antibuild; +package org.mcess.essentials.antibuild; -import com.earth2me.essentials.IConf; -import com.earth2me.essentials.User; -import static com.earth2me.essentials.I18n.tl; +import org.mcess.essentials.IConf; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import org.mcess.essentials.I18n; public class EssentialsConnect @@ -21,7 +21,7 @@ public class EssentialsConnect { if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, tl("versionMismatchAll")); + LOGGER.log(Level.WARNING, I18n.tl("versionMismatchAll")); } ess = (IEssentials)essPlugin; protect = (IAntiBuild)essProtect; @@ -42,9 +42,9 @@ public class EssentialsConnect public void alert(final User user, final String item, final String type) { final Location loc = user.getLocation(); - final String warnMessage = tl("alertFormat", user.getName(), type, item, - loc.getWorld().getName() + "," + loc.getBlockX() + "," - + loc.getBlockY() + "," + loc.getBlockZ()); + final String warnMessage = I18n.tl("alertFormat", user.getName(), type, item, + loc.getWorld().getName() + "," + loc.getBlockX() + "," + + loc.getBlockY() + "," + loc.getBlockZ()); LOGGER.log(Level.WARNING, warnMessage); for (Player p : ess.getServer().getOnlinePlayers()) { diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/IAntiBuild.java b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/IAntiBuild.java similarity index 90% rename from EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/IAntiBuild.java rename to EssentialsAntiBuild/src/org/mcess/essentials/antibuild/IAntiBuild.java index c7b370006..a01b201f6 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/IAntiBuild.java +++ b/EssentialsAntiBuild/src/org/mcess/essentials/antibuild/IAntiBuild.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.antibuild; +package org.mcess.essentials.antibuild; import java.util.List; import java.util.Map; diff --git a/EssentialsAntiBuild/src/plugin.yml b/EssentialsAntiBuild/src/plugin.yml index cfe6e6367..26ff8a1d6 100644 --- a/EssentialsAntiBuild/src/plugin.yml +++ b/EssentialsAntiBuild/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsAntiBuild -main: com.earth2me.essentials.antibuild.EssentialsAntiBuild +main: org.mcess.essentials.antibuild.EssentialsAntiBuild # Note to developers: This next line cannot change, or the automatic versioning system will break. version: TeamCity website: http://tiny.cc/EssentialsCommands diff --git a/EssentialsChat/pom.xml b/EssentialsChat/pom.xml index 20916f31f..ed2c3a96a 100644 --- a/EssentialsChat/pom.xml +++ b/EssentialsChat/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - net.ess3 + org.mcess EssentialsParent 2.x-SNAPSHOT @@ -43,7 +43,7 @@ - net.ess3 + org.mcess Essentials ${project.version} diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java b/EssentialsChat/src/org/mcess/essentials/chat/ChatStore.java similarity index 85% rename from EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java rename to EssentialsChat/src/org/mcess/essentials/chat/ChatStore.java index 8e40a3dff..1d90df158 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java +++ b/EssentialsChat/src/org/mcess/essentials/chat/ChatStore.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.chat; +package org.mcess.essentials.chat; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChat.java similarity index 91% rename from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java rename to EssentialsChat/src/org/mcess/essentials/chat/EssentialsChat.java index d8b40d36c..2862dfc74 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChat.java @@ -1,6 +1,5 @@ -package com.earth2me.essentials.chat; +package org.mcess.essentials.chat; -import static com.earth2me.essentials.I18n.tl; import net.ess3.api.IEssentials; import java.util.Collections; import java.util.HashMap; @@ -10,6 +9,7 @@ import java.util.logging.Logger; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import org.mcess.essentials.I18n; public class EssentialsChat extends JavaPlugin @@ -23,7 +23,7 @@ public class EssentialsChat extends JavaPlugin final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, tl("versionMismatchAll")); + LOGGER.log(Level.WARNING, I18n.tl("versionMismatchAll")); } if (!ess.isEnabled()) { diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayer.java similarity index 92% rename from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java rename to EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayer.java index 8b8737e14..a67492600 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayer.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.chat; +package org.mcess.essentials.chat; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; +import org.mcess.essentials.ChargeException; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import java.util.Map; import java.util.logging.Logger; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerHighest.java similarity index 95% rename from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java rename to EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerHighest.java index 2a0d621a4..69567b53c 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java +++ b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerHighest.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.chat; +package org.mcess.essentials.chat; import net.ess3.api.IEssentials; import java.util.Map; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerLowest.java similarity index 93% rename from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java rename to EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerLowest.java index aa40a8148..a8901b0e0 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerLowest.java @@ -1,7 +1,7 @@ -package com.earth2me.essentials.chat; +package org.mcess.essentials.chat; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FormatUtil; +import org.mcess.essentials.User; +import org.mcess.essentials.utils.FormatUtil; import net.ess3.api.IEssentials; import java.util.Locale; import java.util.Map; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerNormal.java similarity index 95% rename from EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java rename to EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerNormal.java index 07e81d9d4..aad92734a 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/org/mcess/essentials/chat/EssentialsChatPlayerListenerNormal.java @@ -1,8 +1,7 @@ -package com.earth2me.essentials.chat; +package org.mcess.essentials.chat; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import static com.earth2me.essentials.chat.EssentialsChatPlayer.logger; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import java.util.HashSet; import java.util.Iterator; diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml index b75ab8ecc..9a58199d6 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: org.mcess.essentials.chat.EssentialsChat # Note to developers: This next line cannot change, or the automatic versioning system will break. version: TeamCity website: http://tiny.cc/EssentialsCommands diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml index 4e886a4bb..8d41ad8f5 100644 --- a/EssentialsGeoIP/pom.xml +++ b/EssentialsGeoIP/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - net.ess3 + org.mcess EssentialsParent 2.x-SNAPSHOT @@ -43,7 +43,7 @@ - net.ess3 + org.mcess Essentials ${project.version} diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/org/mcess/essentials/geoip/EssentialsGeoIP.java similarity index 91% rename from EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java rename to EssentialsGeoIP/src/org/mcess/essentials/geoip/EssentialsGeoIP.java index aced4ccb8..963176ae4 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java +++ b/EssentialsGeoIP/src/org/mcess/essentials/geoip/EssentialsGeoIP.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.geoip; +package org.mcess.essentials.geoip; -import static com.earth2me.essentials.I18n.tl; +import static org.mcess.essentials.I18n.tl; import net.ess3.api.IEssentials; import java.util.logging.Level; import org.bukkit.plugin.PluginManager; diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/org/mcess/essentials/geoip/EssentialsGeoIPPlayerListener.java similarity index 95% rename from EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java rename to EssentialsGeoIP/src/org/mcess/essentials/geoip/EssentialsGeoIPPlayerListener.java index a6cb28ddc..1d2c1d5b7 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/org/mcess/essentials/geoip/EssentialsGeoIPPlayerListener.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.geoip; +package org.mcess.essentials.geoip; -import com.earth2me.essentials.EssentialsConf; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.IConf; -import com.earth2me.essentials.User; +import org.mcess.essentials.EssentialsConf; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.IConf; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import com.maxmind.geoip.Location; import com.maxmind.geoip.LookupService; diff --git a/EssentialsGeoIP/src/plugin.yml b/EssentialsGeoIP/src/plugin.yml index adf75b83d..17b56c8fb 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: org.mcess.essentials.geoip.EssentialsGeoIP # Note to developers: This next line cannot change, or the automatic versioning system will break. version: TeamCity website: http://tiny.cc/EssentialsCommands diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml index 47da06ad7..b4699aae5 100644 --- a/EssentialsProtect/pom.xml +++ b/EssentialsProtect/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - net.ess3 + org.mcess EssentialsParent 2.x-SNAPSHOT @@ -43,7 +43,7 @@ - net.ess3 + org.mcess Essentials ${project.version} diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java b/EssentialsProtect/src/org/mcess/essentials/protect/EmergencyListener.java similarity index 97% rename from EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java rename to EssentialsProtect/src/org/mcess/essentials/protect/EmergencyListener.java index 5f9253c55..ae00e755c 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EmergencyListener.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/EmergencyListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.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/org/mcess/essentials/protect/EssentialsConnect.java similarity index 85% rename from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java rename to EssentialsProtect/src/org/mcess/essentials/protect/EssentialsConnect.java index 58290a8b8..e05a7f72e 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsConnect.java @@ -1,11 +1,11 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.protect; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.IConf; +import org.mcess.essentials.IConf; import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.plugin.Plugin; +import org.mcess.essentials.I18n; public class EssentialsConnect @@ -18,7 +18,7 @@ public class EssentialsConnect { if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, tl("versionMismatchAll")); + LOGGER.log(Level.WARNING, I18n.tl("versionMismatchAll")); } ess = (IEssentials)essPlugin; protect = (IProtect)essProtect; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtect.java similarity index 95% rename from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java rename to EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtect.java index 1e9013408..48e40c9f6 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtect.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.protect; import java.util.EnumMap; import java.util.List; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectBlockListener.java similarity index 95% rename from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java rename to EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectBlockListener.java index 70ae90e03..7f1232a68 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectBlockListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.protect; import net.ess3.api.IEssentials; import org.bukkit.Material; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectEntityListener.java similarity index 96% rename from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java rename to EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectEntityListener.java index 111751c2d..a645dcb1a 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectEntityListener.java @@ -1,6 +1,6 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.protect; -import com.earth2me.essentials.User; +import org.mcess.essentials.User; import net.ess3.api.IEssentials; import java.util.Locale; import org.bukkit.entity.*; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectWeatherListener.java similarity index 93% rename from EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java rename to EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectWeatherListener.java index ed621a675..81b21fa5e 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectWeatherListener.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/EssentialsProtectWeatherListener.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.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/org/mcess/essentials/protect/IProtect.java similarity index 91% rename from EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java rename to EssentialsProtect/src/org/mcess/essentials/protect/IProtect.java index e3acaabce..a83c117e6 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/IProtect.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/IProtect.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.protect; import java.util.List; import java.util.Map; diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java b/EssentialsProtect/src/org/mcess/essentials/protect/ProtectConfig.java similarity index 99% rename from EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java rename to EssentialsProtect/src/org/mcess/essentials/protect/ProtectConfig.java index 2faef22ed..962d128dc 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java +++ b/EssentialsProtect/src/org/mcess/essentials/protect/ProtectConfig.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.protect; +package org.mcess.essentials.protect; public enum ProtectConfig diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml index bf7389a91..398eadae9 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: org.mcess.essentials.protect.EssentialsProtect # Note to developers: This next line cannot change, or the automatic versioning system will break. version: TeamCity website: http://tiny.cc/EssentialsCommands diff --git a/EssentialsSpawn/pom.xml b/EssentialsSpawn/pom.xml index 194496dfc..f23d9f5d9 100644 --- a/EssentialsSpawn/pom.xml +++ b/EssentialsSpawn/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - net.ess3 + org.mcess EssentialsParent 2.x-SNAPSHOT @@ -43,7 +43,7 @@ - net.ess3 + org.mcess Essentials ${project.version} diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandsetspawn.java similarity index 64% rename from EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java rename to EssentialsSpawn/src/org/mcess/essentials/spawn/Commandsetspawn.java index 15d2ca2ab..de8a6f60a 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java +++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandsetspawn.java @@ -1,9 +1,9 @@ -package com.earth2me.essentials.spawn; +package org.mcess.essentials.spawn; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.User; -import com.earth2me.essentials.commands.EssentialsCommand; +import org.mcess.essentials.User; +import org.mcess.essentials.commands.EssentialsCommand; import org.bukkit.Server; +import org.mcess.essentials.I18n; public class Commandsetspawn extends EssentialsCommand @@ -18,6 +18,6 @@ public class Commandsetspawn extends EssentialsCommand { final String group = args.length > 0 ? getFinalArg(args, 0) : "default"; ((SpawnStorage)module).setSpawn(user.getLocation(), group); - user.sendMessage(tl("spawnSet", group)); + user.sendMessage(I18n.tl("spawnSet", group)); } } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandspawn.java similarity index 81% rename from EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java rename to EssentialsSpawn/src/org/mcess/essentials/spawn/Commandspawn.java index 34a4eb6bd..7914e078e 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java +++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandspawn.java @@ -1,13 +1,13 @@ -package com.earth2me.essentials.spawn; +package org.mcess.essentials.spawn; -import com.earth2me.essentials.CommandSource; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Console; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.commands.EssentialsCommand; -import com.earth2me.essentials.commands.NoChargeException; -import com.earth2me.essentials.commands.NotEnoughArgumentsException; +import org.mcess.essentials.CommandSource; +import static org.mcess.essentials.I18n.tl; +import org.mcess.essentials.Console; +import org.mcess.essentials.Trade; +import org.mcess.essentials.User; +import org.mcess.essentials.commands.EssentialsCommand; +import org.mcess.essentials.commands.NoChargeException; +import org.mcess.essentials.commands.NotEnoughArgumentsException; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawn.java similarity index 90% rename from EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java rename to EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawn.java index d07637303..eab53303c 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawn.java @@ -1,6 +1,5 @@ -package com.earth2me.essentials.spawn; +package org.mcess.essentials.spawn; -import static com.earth2me.essentials.I18n.tl; import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; @@ -16,6 +15,7 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.plugin.EventExecutor; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import org.mcess.essentials.I18n; public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn @@ -31,7 +31,7 @@ public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn ess = (IEssentials)pluginManager.getPlugin("Essentials"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, tl("versionMismatchAll")); + LOGGER.log(Level.WARNING, I18n.tl("versionMismatchAll")); } if (!ess.isEnabled()) { @@ -69,7 +69,7 @@ public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn @Override public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args) { - return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns); + return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "org.mcess.spawn.Command", "essentials.", spawns); } @Override diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawnPlayerListener.java similarity index 87% rename from EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java rename to EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawnPlayerListener.java index d637014eb..a162d4944 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -1,16 +1,14 @@ -package com.earth2me.essentials.spawn; +package org.mcess.essentials.spawn; -import static com.earth2me.essentials.I18n.tl; -import com.earth2me.essentials.Kit; -import com.earth2me.essentials.OfflinePlayer; -import com.earth2me.essentials.User; -import com.earth2me.essentials.textreader.IText; -import com.earth2me.essentials.textreader.KeywordReplacer; -import com.earth2me.essentials.textreader.SimpleTextPager; +import org.mcess.essentials.Kit; +import org.mcess.essentials.OfflinePlayer; +import org.mcess.essentials.User; +import org.mcess.essentials.textreader.IText; +import org.mcess.essentials.textreader.KeywordReplacer; +import org.mcess.essentials.textreader.SimpleTextPager; import net.ess3.api.IEssentials; -import java.util.List; + import java.util.Locale; -import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Bukkit; @@ -20,6 +18,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.mcess.essentials.I18n; public class EssentialsSpawnPlayerListener implements Listener @@ -164,7 +163,7 @@ public class EssentialsSpawnPlayerListener implements Listener } catch (Exception ex) { - Bukkit.getLogger().log(Level.WARNING, tl("teleportNewPlayerError"), ex); + Bukkit.getLogger().log(Level.WARNING, I18n.tl("teleportNewPlayerError"), ex); } } } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/IEssentialsSpawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/IEssentialsSpawn.java similarity index 94% rename from EssentialsSpawn/src/com/earth2me/essentials/spawn/IEssentialsSpawn.java rename to EssentialsSpawn/src/org/mcess/essentials/spawn/IEssentialsSpawn.java index a7c43bcb0..3356389e7 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/IEssentialsSpawn.java +++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/IEssentialsSpawn.java @@ -1,4 +1,4 @@ -package com.earth2me.essentials.spawn; +package org.mcess.essentials.spawn; import org.bukkit.Location; import org.bukkit.plugin.Plugin; diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/SpawnStorage.java similarity index 90% rename from EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java rename to EssentialsSpawn/src/org/mcess/essentials/spawn/SpawnStorage.java index 36b6f9662..aafd22342 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java +++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/SpawnStorage.java @@ -1,8 +1,8 @@ -package com.earth2me.essentials.spawn; +package org.mcess.essentials.spawn; -import com.earth2me.essentials.IEssentialsModule; -import com.earth2me.essentials.settings.Spawns; -import com.earth2me.essentials.storage.AsyncStorageObjectHolder; +import org.mcess.essentials.IEssentialsModule; +import org.mcess.essentials.settings.Spawns; +import org.mcess.essentials.storage.AsyncStorageObjectHolder; import net.ess3.api.IEssentials; import java.io.File; import java.util.HashMap; diff --git a/EssentialsSpawn/src/plugin.yml b/EssentialsSpawn/src/plugin.yml index 21f77db78..95e9b1973 100644 --- a/EssentialsSpawn/src/plugin.yml +++ b/EssentialsSpawn/src/plugin.yml @@ -1,6 +1,6 @@ # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) name: EssentialsSpawn -main: com.earth2me.essentials.spawn.EssentialsSpawn +main: org.mcess.essentials.spawn.EssentialsSpawn # Note to developers: This next line cannot change, or the automatic versioning system will break. version: TeamCity website: http://tiny.cc/EssentialsCommands diff --git a/pom.xml b/pom.xml index 75e910769..301a3f940 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.ess3 + org.mcess EssentialsParent 2.x-SNAPSHOT