summaryrefslogtreecommitdiffstats
path: root/EssentialsSigns
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2013-04-07 15:00:40 +0200
committersnowleo <schneeleo@gmail.com>2013-04-07 15:00:40 +0200
commitdbf0125eec13ada653bb1c9134f689f56d5c5e83 (patch)
tree115554e27f51d101751dbd09dba473a5c17b4c50 /EssentialsSigns
parentee98136fc50f842231cb9052c40578d54e3d75a6 (diff)
downloadEssentials-dbf0125eec13ada653bb1c9134f689f56d5c5e83.tar
Essentials-dbf0125eec13ada653bb1c9134f689f56d5c5e83.tar.gz
Essentials-dbf0125eec13ada653bb1c9134f689f56d5c5e83.tar.lz
Essentials-dbf0125eec13ada653bb1c9134f689f56d5c5e83.tar.xz
Essentials-dbf0125eec13ada653bb1c9134f689f56d5c5e83.zip
Format everything using Netbeans
Diffstat (limited to 'EssentialsSigns')
-rw-r--r--EssentialsSigns/pom.xml30
-rw-r--r--EssentialsSigns/src/net/ess3/signs/EssentialsSign.java7
-rw-r--r--EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java8
-rw-r--r--EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java4
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignKit.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java5
-rw-r--r--EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java2
8 files changed, 31 insertions, 29 deletions
diff --git a/EssentialsSigns/pom.xml b/EssentialsSigns/pom.xml
index 85a47c60b..781bd4512 100644
--- a/EssentialsSigns/pom.xml
+++ b/EssentialsSigns/pom.xml
@@ -1,20 +1,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.essentials3</groupId>
- <artifactId>BuildAll</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>net.essentials3</groupId>
+ <artifactId>BuildAll</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <artifactId>EssentialsSigns</artifactId>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>Essentials</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <artifactId>EssentialsSigns</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
index e1dd99367..385147ef8 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
@@ -212,8 +212,9 @@ public class EssentialsSign
{
return true;
}
- final BlockFace[] directions = new BlockFace[]{
- BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST
+ final BlockFace[] directions = new BlockFace[]
+ {
+ BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST
};
for (BlockFace blockFace : directions)
{
@@ -254,7 +255,7 @@ public class EssentialsSign
{
return EMPTY_SET;
}
-
+
protected final void validateTrade(final ISign sign, final int index, final IEssentials ess) throws SignException
{
final String line = sign.getLine(index).trim();
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
index 7af02af5b..69ca1b4c2 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
@@ -150,7 +150,7 @@ public class SignBlockListener implements Listener
final Block block = event.getBlock();
if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
- new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
+ new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
{
event.setCancelled(true);
return;
@@ -175,7 +175,7 @@ public class SignBlockListener implements Listener
final Block block = event.getBlock();
if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
- new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
+ new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
{
event.setCancelled(true);
return;
@@ -201,7 +201,7 @@ public class SignBlockListener implements Listener
for (Block block : event.getBlocks())
{
if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
- new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
+ new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
{
event.setCancelled(true);
return;
@@ -229,7 +229,7 @@ public class SignBlockListener implements Listener
{
final Block block = event.getBlock();
if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(
- new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
+ new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
{
event.setCancelled(true);
return;
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
index 272d7ac11..be1e5398e 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
@@ -34,7 +34,7 @@ public class SignEntityListener implements Listener
for (Block block : event.blockList())
{
if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign(
- new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
+ new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
{
event.setCancelled(true);
return;
@@ -60,7 +60,7 @@ public class SignEntityListener implements Listener
final Block block = event.getBlock();
if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign(
- new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
+ new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block))
{
event.setCancelled(true);
return;
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
index fb2521c8c..b7873a9cb 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
@@ -90,7 +90,7 @@ public class SignEnchant extends EssentialsSign
final ItemStack playerHand = player.getPlayer().getItemInHand();
if (playerHand == null || playerHand.getAmount() != 1 || (playerHand.containsEnchantment(enchantment) && playerHand.getEnchantmentLevel(
- enchantment) == level))
+ enchantment) == level))
{
throw new SignException(_("§4You do not have {0}x {1}.", 1, sign.getLine(1)));
}
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
index 4cee8ab41..636805319 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
@@ -55,7 +55,7 @@ public class SignKit extends EssentialsSign
final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH);
final String group = sign.getLine(2);
if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && Permissions.KITS.isAuthorized(
- player, kitName)))
+ player, kitName)))
{
final Trade charge = getTrade(sign, 3, ess);
charge.isAffordableFor(player);
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
index 7c69c6372..3c1620bcd 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
@@ -40,8 +40,9 @@ public class SignRepair extends EssentialsSign
Commandrepair command = new Commandrepair();
command.init(ess, "repair");
- String[] args = new String[]{
- sign.getLine(1)
+ String[] args = new String[]
+ {
+ sign.getLine(1)
};
try
{
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java
index 43e4792aa..750e71ee7 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java
@@ -53,7 +53,7 @@ public class SignWarp extends EssentialsSign
final String group = sign.getLine(2);
if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && Permissions.WARPS.isAuthorized(
- player, warpName)))
+ player, warpName)))
{
final Trade charge = getTrade(sign, 3, ess);
try