summaryrefslogtreecommitdiffstats
path: root/EssentialsSpawn/src/com/earth2me
diff options
context:
space:
mode:
authorFearFree <fearfree@cubetown.net>2014-03-20 10:54:07 -0500
committerChris Ward <chris@chrisgward.com>2014-03-22 16:08:11 +1100
commit5724c0c8df28bdf3911f19356806969a3b820b35 (patch)
tree85568c6caff64c3e9375cafd4032aa6a03a92aef /EssentialsSpawn/src/com/earth2me
parent0b5718f7ffc249126199a8eb2278cde47a997506 (diff)
downloadEssentials-5724c0c8df28bdf3911f19356806969a3b820b35.tar
Essentials-5724c0c8df28bdf3911f19356806969a3b820b35.tar.gz
Essentials-5724c0c8df28bdf3911f19356806969a3b820b35.tar.lz
Essentials-5724c0c8df28bdf3911f19356806969a3b820b35.tar.xz
Essentials-5724c0c8df28bdf3911f19356806969a3b820b35.zip
Future Java versions may not support _ as identifier.
Diffstat (limited to 'EssentialsSpawn/src/com/earth2me')
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java4
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java8
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java4
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java4
4 files changed, 10 insertions, 10 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java
index c6c89a20d..15d2ca2ab 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.spawn;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.User;
import com.earth2me.essentials.commands.EssentialsCommand;
import org.bukkit.Server;
@@ -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(_("spawnSet", group));
+ user.sendMessage(tl("spawnSet", group));
}
}
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
index cccce4284..34a4eb6bd 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.spawn;
import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.Console;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
@@ -31,7 +31,7 @@ public class Commandspawn extends EssentialsCommand
respawn(user.getSource(), user, otherUser, charge);
if (!otherUser.equals(user))
{
- otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
+ otherUser.sendMessage(tl("teleportAtoB", user.getDisplayName(), "spawn"));
}
}
else
@@ -50,7 +50,7 @@ public class Commandspawn extends EssentialsCommand
}
final User user = getPlayer(server, args, 0, true, false);
respawn(sender, null, user, null);
- user.sendMessage(_("teleportAtoB", Console.NAME, "spawn"));
+ user.sendMessage(tl("teleportAtoB", Console.NAME, "spawn"));
}
@@ -58,7 +58,7 @@ public class Commandspawn extends EssentialsCommand
{
final SpawnStorage spawns = (SpawnStorage)this.module;
final Location spawn = spawns.getSpawn(teleportee.getGroup());
- sender.sendMessage(_("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ()));
+ sender.sendMessage(tl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ()));
if (teleportOwner == null)
{
teleportee.getTeleport().now(spawn, false, TeleportCause.COMMAND);
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
index a22615550..d07637303 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.spawn;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
import net.ess3.api.IEssentials;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -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, _("versionMismatchAll"));
+ LOGGER.log(Level.WARNING, tl("versionMismatchAll"));
}
if (!ess.isEnabled())
{
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
index b1732f578..e5611b494 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.spawn;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.Kit;
import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.User;
@@ -165,7 +165,7 @@ public class EssentialsSpawnPlayerListener implements Listener
}
catch (Exception ex)
{
- Bukkit.getLogger().log(Level.WARNING, _("teleportNewPlayerError"), ex);
+ Bukkit.getLogger().log(Level.WARNING, tl("teleportNewPlayerError"), ex);
}
}
}