summaryrefslogtreecommitdiffstats
path: root/EssentialsAntiBuild/src/com/earth2me
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-03-23 18:14:21 +0000
committerKHobbits <rob@khobbits.co.uk>2014-03-23 18:14:21 +0000
commit200dbda6d3a09c1b9df8a3d4b699ab4962f258dc (patch)
treed0c178abefac50ecb0992608acf907dc29de1c2c /EssentialsAntiBuild/src/com/earth2me
parent3538728733e035c532c1fef3835761610d3916ce (diff)
parent5724c0c8df28bdf3911f19356806969a3b820b35 (diff)
downloadEssentials-200dbda6d3a09c1b9df8a3d4b699ab4962f258dc.tar
Essentials-200dbda6d3a09c1b9df8a3d4b699ab4962f258dc.tar.gz
Essentials-200dbda6d3a09c1b9df8a3d4b699ab4962f258dc.tar.lz
Essentials-200dbda6d3a09c1b9df8a3d4b699ab4962f258dc.tar.xz
Essentials-200dbda6d3a09c1b9df8a3d4b699ab4962f258dc.zip
Merge branch '2.x' of github.com:essentials/Essentials into 2.x
Diffstat (limited to 'EssentialsAntiBuild/src/com/earth2me')
-rw-r--r--EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java30
-rw-r--r--EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java6
2 files changed, 18 insertions, 18 deletions
diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
index 27ca5fe35..43fb60d2e 100644
--- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
+++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.antibuild;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import java.util.logging.Level;
@@ -85,7 +85,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildPlace", type.toString()));
+ user.sendMessage(tl("antiBuildPlace", type.toString()));
}
event.setCancelled(true);
return;
@@ -95,7 +95,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildPlace", type.toString()));
+ user.sendMessage(tl("antiBuildPlace", type.toString()));
}
event.setCancelled(true);
return;
@@ -104,7 +104,7 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.checkProtectionItems(AntiBuildConfig.alert_on_placement, typeId)
&& !user.isAuthorized("essentials.protect.alerts.notrigger"))
{
- prot.getEssentialsConnect().alert(user, type.toString(), _("alertPlaced"));
+ prot.getEssentialsConnect().alert(user, type.toString(), tl("alertPlaced"));
}
}
@@ -121,7 +121,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildBreak", type.toString()));
+ user.sendMessage(tl("antiBuildBreak", type.toString()));
}
event.setCancelled(true);
return;
@@ -132,7 +132,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildBreak", type.toString()));
+ user.sendMessage(tl("antiBuildBreak", type.toString()));
}
event.setCancelled(true);
return;
@@ -141,7 +141,7 @@ public class EssentialsAntiBuildListener implements Listener
if (prot.checkProtectionItems(AntiBuildConfig.alert_on_break, typeId)
&& !user.isAuthorized("essentials.protect.alerts.notrigger"))
{
- prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke"));
+ prot.getEssentialsConnect().alert(user, type.toString(), tl("alertBroke"));
}
}
@@ -160,7 +160,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (warn)
{
- user.sendMessage(_("antiBuildBreak", Material.PAINTING.toString()));
+ user.sendMessage(tl("antiBuildBreak", Material.PAINTING.toString()));
}
event.setCancelled(true);
}
@@ -168,7 +168,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (warn)
{
- user.sendMessage(_("antiBuildBreak", Material.ITEM_FRAME.toString()));
+ user.sendMessage(tl("antiBuildBreak", Material.ITEM_FRAME.toString()));
}
event.setCancelled(true);
}
@@ -216,7 +216,7 @@ public class EssentialsAntiBuildListener implements Listener
{
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildUse", item.getType().toString()));
+ user.sendMessage(tl("antiBuildUse", item.getType().toString()));
}
event.setCancelled(true);
return;
@@ -226,7 +226,7 @@ public class EssentialsAntiBuildListener implements Listener
&& prot.checkProtectionItems(AntiBuildConfig.alert_on_use, item.getTypeId())
&& !user.isAuthorized("essentials.protect.alerts.notrigger"))
{
- prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed"));
+ prot.getEssentialsConnect().alert(user, item.getType().toString(), tl("alertUsed"));
}
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.build"))
@@ -236,7 +236,7 @@ public class EssentialsAntiBuildListener implements Listener
event.setCancelled(true);
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildUse", item.getType().toString()));
+ user.sendMessage(tl("antiBuildUse", item.getType().toString()));
}
return;
}
@@ -245,7 +245,7 @@ public class EssentialsAntiBuildListener implements Listener
event.setCancelled(true);
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildInteract", event.getClickedBlock().getType().toString()));
+ user.sendMessage(tl("antiBuildInteract", event.getClickedBlock().getType().toString()));
}
}
}
@@ -268,7 +268,7 @@ public class EssentialsAntiBuildListener implements Listener
event.setCancelled(true);
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildCraft", item.getType().toString()));
+ user.sendMessage(tl("antiBuildCraft", item.getType().toString()));
}
}
}
@@ -307,7 +307,7 @@ public class EssentialsAntiBuildListener implements Listener
user.updateInventory();
if (ess.getSettings().warnOnBuildDisallow())
{
- user.sendMessage(_("antiBuildDrop", item.getType().toString()));
+ user.sendMessage(tl("antiBuildDrop", item.getType().toString()));
}
}
}
diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java
index 6f568a109..2a7b4ecf7 100644
--- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java
+++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsConnect.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.antibuild;
import com.earth2me.essentials.IConf;
import com.earth2me.essentials.User;
-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;
@@ -21,7 +21,7 @@ public class EssentialsConnect
{
if (!essProtect.getDescription().getVersion().equals(essPlugin.getDescription().getVersion()))
{
- LOGGER.log(Level.WARNING, _("versionMismatchAll"));
+ LOGGER.log(Level.WARNING, tl("versionMismatchAll"));
}
ess = (IEssentials)essPlugin;
protect = (IAntiBuild)essProtect;
@@ -42,7 +42,7 @@ public class EssentialsConnect
public void alert(final User user, final String item, final String type)
{
final Location loc = user.getLocation();
- final String warnMessage = _("alertFormat", user.getName(), type, item,
+ final String warnMessage = tl("alertFormat", user.getName(), type, item,
loc.getWorld().getName() + "," + loc.getBlockX() + ","
+ loc.getBlockY() + "," + loc.getBlockZ());
LOGGER.log(Level.WARNING, warnMessage);