summaryrefslogtreecommitdiffstats
path: root/EssentialsSigns
diff options
context:
space:
mode:
authorIaccidentally <coryhuckaby@gmail.com>2013-01-14 20:06:28 -0500
committerIaccidentally <coryhuckaby@gmail.com>2013-01-14 20:06:28 -0500
commit2a097530e5ea96e1329dca19b049a23ccce5d3ba (patch)
treeda72b93c02edb4182f649114fee5fad7d833601f /EssentialsSigns
parent8e54bf13b281d1299c3dc33f89940bd3a06d1a30 (diff)
downloadEssentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar.gz
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar.lz
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.tar.xz
Essentials-2a097530e5ea96e1329dca19b049a23ccce5d3ba.zip
Revert "Remove Transient :: Formatting Cleanup"
Diffstat (limited to 'EssentialsSigns')
-rw-r--r--EssentialsSigns/pom.xml30
-rw-r--r--EssentialsSigns/src/net/ess3/signs/EssentialsSign.java17
-rw-r--r--EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java4
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignConfig.java11
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java2
-rw-r--r--EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java12
-rw-r--r--EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java8
-rw-r--r--EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.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
12 files changed, 49 insertions, 50 deletions
diff --git a/EssentialsSigns/pom.xml b/EssentialsSigns/pom.xml
index 781bd4512..85a47c60b 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 cf1b44ef8..10ed1989d 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
@@ -22,7 +22,7 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsSign
{
private static final Set<Material> EMPTY_SET = new HashSet<Material>();
- protected final String signName;
+ protected transient final String signName;
public EssentialsSign(final String signName)
{
@@ -212,9 +212,8 @@ 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)
{
@@ -255,7 +254,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();
@@ -431,8 +430,8 @@ public class EssentialsSign
static class EventSign implements ISign
{
- private final SignChangeEvent event;
- private final Block block;
+ private final transient SignChangeEvent event;
+ private final transient Block block;
public EventSign(final SignChangeEvent event)
{
@@ -467,8 +466,8 @@ public class EssentialsSign
public static class BlockSign implements ISign
{
- private final Sign sign;
- private final Block block;
+ private final transient Sign sign;
+ private final transient Block block;
public BlockSign(final Block block)
{
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
index 29e2edd59..cdd4494ea 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java
@@ -15,8 +15,8 @@ import org.bukkit.plugin.java.JavaPlugin;
public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin
{
- private static final Logger LOGGER = Bukkit.getLogger();
- private SignsConfigHolder config;
+ private static final transient Logger LOGGER = Bukkit.getLogger();
+ private transient SignsConfigHolder config;
@Override
public void onEnable()
diff --git a/EssentialsSigns/src/net/ess3/signs/SignConfig.java b/EssentialsSigns/src/net/ess3/signs/SignConfig.java
index 34516dbc4..1b8bfddc3 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignConfig.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignConfig.java
@@ -23,12 +23,13 @@ public class SignConfig implements StorageObject
{
this.signs = signs;
}
+
@Comment(
- {
- "How many times per second can Essentials signs be interacted with.",
- "Values should be between 1-20, 20 being virtually no lag protection.",
- "Lower numbers will reduce the possiblity of lag, but may annoy players."
- })
+ {
+ "How many times per second can Essentials signs be interacted with.",
+ "Values should be between 1-20, 20 being virtually no lag protection.",
+ "Lower numbers will reduce the possiblity of lag, but may annoy players."
+ })
private int signUsesPerSecond = 4;
public int getSignUsePerSecond()
diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
index 613c2edee..9c62337c4 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
@@ -9,7 +9,7 @@ import org.bukkit.plugin.Plugin;
public class SignsConfigHolder extends AsyncStorageObjectHolder<SignConfig>
{
- private final Plugin plugin;
+ private final transient Plugin plugin;
private Set<EssentialsSign> enabledSigns = new HashSet<EssentialsSign>();
private boolean signsEnabled = false;
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
index 69ca1b4c2..4aa8182b5 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
@@ -21,8 +21,8 @@ import org.bukkit.event.block.*;
public class SignBlockListener implements Listener
{
- private final IEssentials ess;
- private final ISignsPlugin plugin;
+ private final transient IEssentials ess;
+ private final transient ISignsPlugin plugin;
private final static Logger LOGGER = Logger.getLogger("Minecraft");
private final static int WALL_SIGN = Material.WALL_SIGN.getId();
private final static int SIGN_POST = Material.SIGN_POST.getId();
@@ -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 be1e5398e..3c9d63977 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
@@ -14,8 +14,8 @@ import org.bukkit.event.entity.EntityExplodeEvent;
public class SignEntityListener implements Listener
{
- private final IEssentials ess;
- private final ISignsPlugin plugin;
+ private final transient IEssentials ess;
+ private final transient ISignsPlugin plugin;
public SignEntityListener(final IEssentials ess, final ISignsPlugin plugin)
{
@@ -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/listeners/SignPlayerListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
index d6c6e3ece..6d6f14b93 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
@@ -15,8 +15,8 @@ import org.bukkit.event.player.PlayerInteractEvent;
public class SignPlayerListener implements Listener
{
- private final IEssentials ess;
- private final ISignsPlugin plugin;
+ private final transient IEssentials ess;
+ private final transient ISignsPlugin plugin;
public SignPlayerListener(final IEssentials ess, final ISignsPlugin plugin)
{
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
index b05bc10f2..50e99a8d7 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(_("missingItems", 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 c962eae85..fc95f09d6 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 5b60c348c..cd3d9dc93 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java
@@ -40,9 +40,8 @@ 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 750e71ee7..43e4792aa 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