*/
@@ -16,7 +17,8 @@ public interface Method
* Encodes the Plugin into an Object disguised as the Plugin. If you want the original Plugin Class you must cast it
* to the correct Plugin, to do so you have to verify the name and or version then cast.
*
- *
+ * <
+ * pre>
* if(method.getName().equalsIgnoreCase("iConomy"))
* iConomy plugin = ((iConomy)method.getPlugin());
*
@@ -48,8 +50,7 @@ public interface Method
public String getVersion();
/**
- * Returns the amount of decimal places that get stored
- * NOTE: it will return -1 if there is no rounding
+ * Returns the amount of decimal places that get stored NOTE: it will return -1 if there is no rounding
*
* @return int for each decimal place
*/
@@ -88,7 +89,9 @@ public interface Method
public boolean hasAccount(String name);
/**
- * Check to see if an account name is tied to a bank.
+ * Check to see if an account
+ * name is tied to a
+ * bank.
*
* @param bank Bank name
* @param name Account name
@@ -107,14 +110,16 @@ public interface Method
/**
* Forces an account creation
*
- * @param name Account name
+ * @param name Account name
* @param balance Initial account balance
* @return boolean
*/
public boolean createAccount(String name, Double balance);
/**
- * Returns a MethodAccount class for an account name.
+ * Returns a
+ * MethodAccount class for an account
+ * name.
*
* @param name Account name
* @return MethodAccount or Null
@@ -122,7 +127,9 @@ public interface Method
public MethodAccount getAccount(String name);
/**
- * Returns a MethodBankAccount class for an account name.
+ * Returns a
+ * MethodBankAccount class for an account
+ * name.
*
* @param bank Bank name
* @param name Account name
@@ -131,8 +138,7 @@ public interface Method
public MethodBankAccount getBankAccount(String bank, String name);
/**
- * Checks to verify the compatibility between this Method and a plugin.
- * Internal usage only, for the most part.
+ * Checks to verify the compatibility between this Method and a plugin. Internal usage only, for the most part.
*
* @param plugin Plugin
* @return boolean
diff --git a/Essentials/src/net/ess3/economy/register/Methods.java b/Essentials/src/net/ess3/economy/register/Methods.java
index 3c0772129..1ac716aa7 100644
--- a/Essentials/src/net/ess3/economy/register/Methods.java
+++ b/Essentials/src/net/ess3/economy/register/Methods.java
@@ -22,8 +22,10 @@ import org.bukkit.plugin.PluginManager;
* preferred: "iConomy"
*
*
- * @author: Nijikokun (@nijikokun) @copyright: Copyright (C) 2011 @license: AOL license
- *
+ * @author: Nijikokun (
+ * @nijikokun)
+ * @copyright: Copyright (C) 2011
+ * @license: AOL license
*/
public class Methods
{
@@ -255,8 +257,7 @@ public class Methods
/**
* Grab the existing and initialized (hopefully) Method Class.
*
- * @return Method or
- * Null
+ * @return Method or Null
*/
public static Method getMethod()
{
diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java
index cbb9b9314..f186dfadd 100644
--- a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java
+++ b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java
@@ -9,8 +9,10 @@ import org.bukkit.plugin.Plugin;
* BOSEconomy 7 Implementation of Method
*
* @author Acrobot
- * @author Nijikokun (@nijikokun) @copyright (c) 2011 @license AOL license
- *
+ * @author Nijikokun (
+ * @nijikokun)
+ * @copyright (c) 2011
+ * @license AOL license
*/
public class BOSE7 implements Method
{
diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo5.java b/Essentials/src/net/ess3/economy/register/methods/iCo5.java
index a615ada5d..9e4dab821 100644
--- a/Essentials/src/net/ess3/economy/register/methods/iCo5.java
+++ b/Essentials/src/net/ess3/economy/register/methods/iCo5.java
@@ -12,8 +12,10 @@ import org.bukkit.plugin.Plugin;
/**
* iConomy 5 Implementation of Method
*
- * @author Nijikokun (@nijikokun) @copyright (c) 2011 @license AOL license
- *
+ * @author Nijikokun (
+ * @nijikokun)
+ * @copyright (c) 2011
+ * @license AOL license
*/
public class iCo5 implements Method
{
diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo6.java b/Essentials/src/net/ess3/economy/register/methods/iCo6.java
index 9dfdabe2e..d98819828 100644
--- a/Essentials/src/net/ess3/economy/register/methods/iCo6.java
+++ b/Essentials/src/net/ess3/economy/register/methods/iCo6.java
@@ -11,8 +11,10 @@ import org.bukkit.plugin.Plugin;
/**
* iConomy 6 Implementation of Method
*
- * @author Nijikokun (@nijikokun) @copyright (c) 2011 @license AOL license
- *
+ * @author Nijikokun (
+ * @nijikokun)
+ * @copyright (c) 2011
+ * @license AOL license
*/
public class iCo6 implements Method
{
diff --git a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java
index 8d3f380a7..f72b95e64 100644
--- a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java
@@ -15,7 +15,7 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsBlockListener implements Listener
{
- private final transient IEssentials ess;
+ private final IEssentials ess;
public EssentialsBlockListener(final IEssentials ess)
{
diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
index 41ed4503a..c0b5a54d0 100644
--- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java
@@ -19,7 +19,7 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsEntityListener implements Listener
{
- private final transient IEssentials ess;
+ private final IEssentials ess;
public EssentialsEntityListener(final IEssentials ess)
{
@@ -41,7 +41,7 @@ public class EssentialsEntityListener implements Listener
attacker.updateActivity(true);
if (settings.getData().getGeneral().getLoginAttackDelay() > 0 && !Permissions.PVPDELAY_EXEMPT.isAuthorized(
attacker) && (System.currentTimeMillis() < (attacker.getTimestamp(
- TimestampType.LOGIN) + settings.getData().getGeneral().getLoginAttackDelay())))
+ TimestampType.LOGIN) + settings.getData().getGeneral().getLoginAttackDelay())))
{
event.setCancelled(true);
}
diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
index 81ec8a397..b5de18fd1 100644
--- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
@@ -40,9 +40,9 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsPlayerListener implements Listener
{
private static final Logger LOGGER = Logger.getLogger("Minecraft");
- private final transient Server server;
- private final transient IEssentials ess;
- private final transient IUserMap userMap;
+ private final Server server;
+ private final IEssentials ess;
+ private final IUserMap userMap;
public EssentialsPlayerListener(final IEssentials parent)
{
@@ -56,7 +56,8 @@ public class EssentialsPlayerListener implements Listener
public void onPlayerRespawn(final PlayerRespawnEvent event)
{
final Player player = event.getPlayer();
- if (!player.isOnline()) {
+ if (!player.isOnline())
+ {
return;
}
final IUser user = userMap.getUser(player);
@@ -173,83 +174,83 @@ public class EssentialsPlayerListener implements Listener
delayedJoin(event.getPlayer());
}
});
-/* TODO: Make sure my update is good
- if (!event.getPlayer().isOnline())
- {
- return;
- }
+ /* TODO: Make sure my update is good
+ if (!event.getPlayer().isOnline())
+ {
+ return;
+ }
- ess.getBackup().startTask();
+ ess.getBackup().startTask();
- final String joinMessage = ess.getSettings().getData().getGeneral().getJoinMessage();
- if (joinMessage != null)
- {
- final IText itOutput = new KeywordReplacer(new SimpleTextInput(joinMessage), ess.getUserMap().getUser(event.getPlayer()), ess);
- final SimpleTextPager stPager = new SimpleTextPager(itOutput);
- event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0)));
- }
- else
- {
- event.setJoinMessage(joinMessage);
- }
+ final String joinMessage = ess.getSettings().getData().getGeneral().getJoinMessage();
+ if (joinMessage != null)
+ {
+ final IText itOutput = new KeywordReplacer(new SimpleTextInput(joinMessage), ess.getUserMap().getUser(event.getPlayer()), ess);
+ final SimpleTextPager stPager = new SimpleTextPager(itOutput);
+ event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0)));
+ }
+ else
+ {
+ event.setJoinMessage(joinMessage);
+ }
- final IUser user = ess.getUserMap().getUser(event.getPlayer());
+ final IUser user = ess.getUserMap().getUser(event.getPlayer());
- user.updateDisplayName();
- user.getData().setIpAddress(user.getPlayer().getAddress().getAddress().getHostAddress());
- user.updateActivity(false);
+ user.updateDisplayName();
+ user.getData().setIpAddress(user.getPlayer().getAddress().getAddress().getHostAddress());
+ user.updateActivity(false);
- for (String p : ess.getVanishedPlayers())
- {
- if (!Permissions.VANISH_SEE_OTHERS.isAuthorized(user))
- {
- user.getPlayer().hidePlayer(ess.getUserMap().getUser(p).getPlayer());
- }
- }
+ for (String p : ess.getVanishedPlayers())
+ {
+ if (!Permissions.VANISH_SEE_OTHERS.isAuthorized(user))
+ {
+ user.getPlayer().hidePlayer(ess.getUserMap().getUser(p).getPlayer());
+ }
+ }
- if (Permissions.SLEEPINGIGNORED.isAuthorized(user))
- {
- user.getPlayer().setSleepingIgnored(true);
- }
- user.queueSave();
+ if (Permissions.SLEEPINGIGNORED.isAuthorized(user))
+ {
+ user.getPlayer().setSleepingIgnored(true);
+ }
+ user.queueSave();
- final ISettings settings = ess.getSettings();
+ final ISettings settings = ess.getSettings();
- if (!settings.getData().getCommands().isDisabled("motd") && Permissions.MOTD.isAuthorized(user))
- {
- try
- {
- final IText input = new TextInput(user, "motd", true, ess);
- final IText output = new KeywordReplacer(input, user, ess);
- final TextPager pager = new TextPager(output, true);
- pager.showPage("1", null, "motd", user);
- }
- catch (IOException ex)
- {
- if (settings.getData().getGeneral().isDebug())
- {
- LOGGER.log(Level.WARNING, ex.getMessage(), ex);
- }
- else
- {
- LOGGER.log(Level.WARNING, ex.getMessage());
- }
- }
- }
+ if (!settings.getData().getCommands().isDisabled("motd") && Permissions.MOTD.isAuthorized(user))
+ {
+ try
+ {
+ final IText input = new TextInput(user, "motd", true, ess);
+ final IText output = new KeywordReplacer(input, user, ess);
+ final TextPager pager = new TextPager(output, true);
+ pager.showPage("1", null, "motd", user);
+ }
+ catch (IOException ex)
+ {
+ if (settings.getData().getGeneral().isDebug())
+ {
+ LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+ }
+ else
+ {
+ LOGGER.log(Level.WARNING, ex.getMessage());
+ }
+ }
+ }
- if (!settings.getData().getCommands().isDisabled("mail") && Permissions.MAIL.isAuthorized(user))
- {
- final List mail = user.getData().getMails();
- if (mail == null || mail.isEmpty())
- {
- user.sendMessage(_("noNewMail"));
- }
- else
- {
- user.sendMessage(_("youHaveNewMail", mail.size()));
- }
- }*/
+ if (!settings.getData().getCommands().isDisabled("mail") && Permissions.MAIL.isAuthorized(user))
+ {
+ final List mail = user.getData().getMails();
+ if (mail == null || mail.isEmpty())
+ {
+ user.sendMessage(_("noNewMail"));
+ }
+ else
+ {
+ user.sendMessage(_("youHaveNewMail", mail.size()));
+ }
+ }*/
}
public void delayedJoin(final Player player)
@@ -330,19 +331,19 @@ public class EssentialsPlayerListener implements Listener
user.sendMessage(_("youHaveNewMail", mail.size()));
}
}
- if(Permissions.FLY_SAFELOGIN.isAuthorized(user))
+ if (Permissions.FLY_SAFELOGIN.isAuthorized(user))
{
final Location loc = user.getPlayer().getLocation();
final World world = loc.getWorld();
final int x = loc.getBlockX();
int y = loc.getBlockY();
final int z = loc.getBlockZ();
- while(LocationUtil.isBlockUnsafe(world, x, y, z) && y > -1)
+ while (LocationUtil.isBlockUnsafe(world, x, y, z) && y > -1)
{
y--;
}
- if(loc.getBlockY() - y > 1 || y < 0)
+ if (loc.getBlockY() - y > 1 || y < 0)
{
user.getPlayer().setAllowFlight(true);
user.getPlayer().setFlying(true);
@@ -351,7 +352,6 @@ public class EssentialsPlayerListener implements Listener
}
}
-
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerLogin(final PlayerLoginEvent event)
{
@@ -449,7 +449,6 @@ public class EssentialsPlayerListener implements Listener
});
}
}
-
private final Pattern spaceSplit = Pattern.compile(" ");
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -613,7 +612,7 @@ public class EssentialsPlayerListener implements Listener
{
final IUser invOwner = userMap.getUser((Player)invHolder);
if (user.isInvSee() && (!Permissions.INVSEE_MODIFY.isAuthorized(user) || Permissions.INVSEE_PREVENT_MODIFY.isAuthorized(
- invOwner) || !invOwner.isOnline()))
+ invOwner) || !invOwner.isOnline()))
{
event.setCancelled(true);
}
@@ -621,7 +620,7 @@ public class EssentialsPlayerListener implements Listener
}
if (event.getView().getTopInventory().getType() == InventoryType.WORKBENCH)
{
- final IUser user = userMap.getUser((Player) event.getWhoClicked());
+ final IUser user = userMap.getUser((Player)event.getWhoClicked());
if (user.isRecipeSee())
{
event.setCancelled(true);
diff --git a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java
index 56e3add3d..8f5de1ec2 100644
--- a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java
@@ -19,7 +19,7 @@ import org.bukkit.plugin.Plugin;
public class EssentialsPluginListener implements Listener, IReload
{
- private final transient IEssentials ess;
+ private final IEssentials ess;
public EssentialsPluginListener(final IEssentials ess)
{
@@ -36,9 +36,10 @@ public class EssentialsPluginListener implements Listener, IReload
if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager()))
{
ess.getLogger().log(
- Level.INFO, "Payment method found ({0} version: {1})", new Object[]{
- Methods.getMethod().getName(), Methods.getMethod().getVersion()
- });
+ Level.INFO, "Payment method found ({0} version: {1})", new Object[]
+ {
+ Methods.getMethod().getName(), Methods.getMethod().getVersion()
+ });
}
}
diff --git a/Essentials/src/net/ess3/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java
index 17664ab61..b83406e35 100644
--- a/Essentials/src/net/ess3/metrics/MetricsListener.java
+++ b/Essentials/src/net/ess3/metrics/MetricsListener.java
@@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
public class MetricsListener implements Listener
{
- private final transient IEssentials ess;
- private final transient MetricsStarter starter;
+ private final IEssentials ess;
+ private final MetricsStarter starter;
public MetricsListener(final IEssentials parent, final MetricsStarter starter)
{
@@ -30,7 +30,7 @@ public class MetricsListener implements Listener
ISettings settings = ess.getSettings();
if (settings.getData().getGeneral().getMetricsEnabled() == null && (Permissions.ESSENTIALS.isAuthorized(
- event.getPlayer()) || event.getPlayer().hasPermission("bukkit.broadcast.admin")))
+ event.getPlayer()) || event.getPlayer().hasPermission("bukkit.broadcast.admin")))
{
player.sendMessage(_("metrics1"));
player.sendMessage(_("metrics2"));
diff --git a/Essentials/src/net/ess3/metrics/MetricsStarter.java b/Essentials/src/net/ess3/metrics/MetricsStarter.java
index 2c5314142..0c1ac9df9 100644
--- a/Essentials/src/net/ess3/metrics/MetricsStarter.java
+++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java
@@ -14,7 +14,7 @@ import net.ess3.metrics.Metrics.Plotter;
public class MetricsStarter implements Runnable
{
private final IEssentials ess;
- private transient Boolean start;
+ private Boolean start;
private enum Modules
@@ -30,10 +30,7 @@ public class MetricsStarter implements Runnable
EssentialsProtect,
EssentialsGeoIP,
EssentialsXMPP
- }
-
-
- ;
+ };
public MetricsStarter(final IEssentials plugin)
{
diff --git a/Essentials/src/net/ess3/permissions/BasePermission.java b/Essentials/src/net/ess3/permissions/BasePermission.java
index b1cb0be68..5312ebb93 100644
--- a/Essentials/src/net/ess3/permissions/BasePermission.java
+++ b/Essentials/src/net/ess3/permissions/BasePermission.java
@@ -1,5 +1,6 @@
package net.ess3.permissions;
+
public class BasePermission extends AbstractSuperpermsPermission
{
protected String permission;
diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java
index c4c1e19c7..4655ca309 100644
--- a/Essentials/src/net/ess3/permissions/Permissions.java
+++ b/Essentials/src/net/ess3/permissions/Permissions.java
@@ -121,7 +121,7 @@ public enum Permissions implements IPermission
private static final String base = "essentials.";
private final String permission;
private final PermissionDefault defaultPerm;
- private transient String parent = null;
+ private String parent = null;
private Permissions()
{
@@ -164,7 +164,6 @@ public enum Permissions implements IPermission
{
return PermissionFactory.checkPermission(sender, this);
}
-
public static DotStarPermission ENCHANT = new DotStarPermission("essentials.enchant");
public static MaterialDotStarPermission GIVE = new MaterialDotStarPermission("essentials.give", PermissionDefault.TRUE);
public static DotStarPermission RANKS = new DotStarPermission("essentials.ranks");
diff --git a/Essentials/src/net/ess3/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java
index 55a6295d3..9e2bd745f 100644
--- a/Essentials/src/net/ess3/ranks/GMGroups.java
+++ b/Essentials/src/net/ess3/ranks/GMGroups.java
@@ -12,8 +12,8 @@ import org.bukkit.plugin.Plugin;
public class GMGroups extends AbstractRanks implements IRanks
{
- private final transient IEssentials ess;
- private final transient GroupManager groupManager;
+ private final IEssentials ess;
+ private final GroupManager groupManager;
public GMGroups(final IEssentials ess, final Plugin groupManager)
{
diff --git a/Essentials/src/net/ess3/ranks/Ranks.java b/Essentials/src/net/ess3/ranks/Ranks.java
index 4e876b128..31a9bc34b 100644
--- a/Essentials/src/net/ess3/ranks/Ranks.java
+++ b/Essentials/src/net/ess3/ranks/Ranks.java
@@ -17,12 +17,11 @@ public class Ranks implements StorageObject
final RankOptions defaultOptions = new RankOptions();
ranks.put("default", defaultOptions);
}
-
@Comment(
- {
- "The order of the ranks matters, the ranks are checked from top to bottom.", "All rank names have to be lower case.",
- "The ranks can be connected to users using the permission essentials.ranks.rankname"
- })
+ {
+ "The order of the ranks matters, the ranks are checked from top to bottom.", "All rank names have to be lower case.",
+ "The ranks can be connected to users using the permission essentials.ranks.rankname"
+ })
@MapValueType(RankOptions.class)
private LinkedHashMap ranks = new LinkedHashMap();
}
diff --git a/Essentials/src/net/ess3/settings/Backup.java b/Essentials/src/net/ess3/settings/Backup.java
index bbdef7bdf..01ba37322 100644
--- a/Essentials/src/net/ess3/settings/Backup.java
+++ b/Essentials/src/net/ess3/settings/Backup.java
@@ -18,17 +18,16 @@ public class Backup implements StorageObject
@Comment("Add a command that backups your data, e.g. 'rdiff-backup World1 backups/World1'")
private String command;
@Comment(
- {
- "Runs these commands before a backup.", "This will run every time time (in minutes) you specify in the interval setting.",
- "ex: say \"Hello World\" will make the server say Hello World"
- })
+ {
+ "Runs these commands before a backup.", "This will run every time time (in minutes) you specify in the interval setting.",
+ "ex: say \"Hello World\" will make the server say Hello World"
+ })
private List commandsBeforeBackup;
-
@Comment(
- {
- "Runs these commands after a backup.", "This will run every time time (in minutes) you specify in the interval setting.",
- "ex: say \"Hello World\" will make the server say Hello World"
- })
+ {
+ "Runs these commands after a backup.", "This will run every time time (in minutes) you specify in the interval setting.",
+ "ex: say \"Hello World\" will make the server say Hello World"
+ })
private List commandsAfterBackup;
public Backup()
@@ -49,5 +48,4 @@ public class Backup implements StorageObject
{
return commandsAfterBackup == null ? Collections.emptyList() : Collections.unmodifiableList(commandsAfterBackup);
}
-
}
diff --git a/Essentials/src/net/ess3/settings/Chat.java b/Essentials/src/net/ess3/settings/Chat.java
index 14c7cc702..a7a99fe6e 100644
--- a/Essentials/src/net/ess3/settings/Chat.java
+++ b/Essentials/src/net/ess3/settings/Chat.java
@@ -13,20 +13,20 @@ public class Chat implements StorageObject
@Comment("The character(s) to prefix all nicknames, so that you know they are not true usernames.")
private String nicknamePrefix = "~";
@Comment(
- {
- "Disable this if you have any other plugin, that modifies the displayname of a user.",
- "If it is not set, it will be enabled if EssentialsChat is installed, otherwise not."
- })
+ {
+ "Disable this if you have any other plugin, that modifies the displayname of a user.",
+ "If it is not set, it will be enabled if EssentialsChat is installed, otherwise not."
+ })
private Boolean changeDisplayname;
private String displaynameFormat = "{PREFIX}{NICKNAMEPREFIX}{NAME}{SUFFIX}";
@Comment(
- {
- "If EssentialsChat is installed, this will define how far a player's voice travels, in blocks. Set to 0 to make all chat global.",
- "Note that users with the \"essentials.chat.spy\" permission will hear everything, regardless of this setting.",
- "Users with essentials.chat.shout can override this by prefixing text with an exclamation mark (!)",
- "Or with essentials.chat.question can override this by prefixing text with a question mark (?)",
- "You can add command costs for shout/question by adding chat-shout and chat-question to the command costs section."
- })
+ {
+ "If EssentialsChat is installed, this will define how far a player's voice travels, in blocks. Set to 0 to make all chat global.",
+ "Note that users with the \"essentials.chat.spy\" permission will hear everything, regardless of this setting.",
+ "Users with essentials.chat.shout can override this by prefixing text with an exclamation mark (!)",
+ "Or with essentials.chat.question can override this by prefixing text with a question mark (?)",
+ "You can add command costs for shout/question by adding chat-shout and chat-question to the command costs section."
+ })
private int localRadius = 0;
@Comment("Set the default chat format here, it will be overwritten by group specific chat formats.")
private String defaultFormat = "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}";
diff --git a/Essentials/src/net/ess3/settings/Commands.java b/Essentials/src/net/ess3/settings/Commands.java
index e78e09f34..6bd29b4c7 100644
--- a/Essentials/src/net/ess3/settings/Commands.java
+++ b/Essentials/src/net/ess3/settings/Commands.java
@@ -26,16 +26,16 @@ public class Commands implements StorageObject
private Speed speed = new Speed();
@ListType
@Comment(
- {
- "When a command conflicts with another plugin, by default, Essentials will try to force the OTHER plugin to take",
- "priority. If a command is in this list, Essentials will try to give ITSELF priority. This does not always work:",
- "usually whichever plugin was updated most recently wins out. However, the full name of the command will always work.",
- "For example, if WorldGuard and Essentials are both enabled, and WorldGuard takes control over /god, /essentials:god",
- "will still map to Essentials, whereas it might normally get forced upon WorldGuard. Commands prefixed with an \"e\",",
- "such as /egod, will always grant Essentials priority.",
- "We should try to take priority over /god. If this doesn't work, use /essentials:god or /egod.",
- "If god is set using WorldGuard, use /ungod to remove then use whichever you see fit."
- })
+ {
+ "When a command conflicts with another plugin, by default, Essentials will try to force the OTHER plugin to take",
+ "priority. If a command is in this list, Essentials will try to give ITSELF priority. This does not always work:",
+ "usually whichever plugin was updated most recently wins out. However, the full name of the command will always work.",
+ "For example, if WorldGuard and Essentials are both enabled, and WorldGuard takes control over /god, /essentials:god",
+ "will still map to Essentials, whereas it might normally get forced upon WorldGuard. Commands prefixed with an \"e\",",
+ "such as /egod, will always grant Essentials priority.",
+ "We should try to take priority over /god. If this doesn't work, use /essentials:god or /egod.",
+ "If god is set using WorldGuard, use /ungod to remove then use whichever you see fit."
+ })
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
private List overridden = null;
diff --git a/Essentials/src/net/ess3/settings/Economy.java b/Essentials/src/net/ess3/settings/Economy.java
index bd37372bd..e43992b61 100644
--- a/Essentials/src/net/ess3/settings/Economy.java
+++ b/Essentials/src/net/ess3/settings/Economy.java
@@ -26,32 +26,29 @@ public class Economy implements StorageObject
{
return currencySymbol == null || currencySymbol.isEmpty() ? "$" : currencySymbol.substring(0, 1);
}
-
- private final transient static double MAXMONEY = 10000000000000.0;
+ private final static double MAXMONEY = 10000000000000.0;
@Comment(
- {
- "Set the maximum amount of money a player can have",
- "The amount is always limited to 10 trillions because of the limitations of a java double"
- })
+ {
+ "Set the maximum amount of money a player can have",
+ "The amount is always limited to 10 trillions because of the limitations of a java double"
+ })
private double maxMoney = MAXMONEY;
public double getMaxMoney()
{
return Math.abs(maxMoney) > MAXMONEY ? MAXMONEY : Math.abs(maxMoney);
}
-
@Comment(
- {
- "Set the minimum amount of money a player can have (must be above the negative of max-money).",
- "Setting this to 0, will disable overdrafts/loans completely. Users need 'essentials.eco.loan' perm to go below 0."
- })
+ {
+ "Set the minimum amount of money a player can have (must be above the negative of max-money).",
+ "Setting this to 0, will disable overdrafts/loans completely. Users need 'essentials.eco.loan' perm to go below 0."
+ })
private double minMoney = -MAXMONEY;
public double getMinMoney()
{
return Math.abs(minMoney) > MAXMONEY ? -MAXMONEY : minMoney;
}
-
@Comment("Enable this to log all interactions with trade/buy/sell signs and sell command")
private boolean logEnabled = false;
private Worth worth = new Worth();
diff --git a/Essentials/src/net/ess3/settings/General.java b/Essentials/src/net/ess3/settings/General.java
index 6fbdb5b8c..01ee58704 100644
--- a/Essentials/src/net/ess3/settings/General.java
+++ b/Essentials/src/net/ess3/settings/General.java
@@ -17,24 +17,24 @@ public class General implements StorageObject
@Comment("Turn this on, if you want to see more error messages, if something goes wrong.")
private boolean debug = false;
@Comment(
- {
- "Set the locale here, if you want to change the language of Essentials.",
- "If this is not set, Essentials will use the language of your computer.", "Available locales: da, de, en, fr, nl"
- })
+ {
+ "Set the locale here, if you want to change the language of Essentials.",
+ "If this is not set, Essentials will use the language of your computer.", "Available locales: da, de, en, fr, nl"
+ })
private String locale;
@Comment(
- {
- "The number of items given, if the quantity parameter is left out in /item or /give.",
- "If this number is below 1, the maximum stack size size is given. If oversized stacks",
- "is not enabled, any number higher then the maximum stack size results in more than one stack."
- })
+ {
+ "The number of items given, if the quantity parameter is left out in /item or /give.",
+ "If this number is below 1, the maximum stack size size is given. If oversized stacks",
+ "is not enabled, any number higher then the maximum stack size results in more than one stack."
+ })
private int defaultStacksize = -1;
@Comment(
- {
- "Oversized stacks are stacks that ignore the normal max stacksize.",
- "They can be obtained using /give and /item, if the player has essentials.oversizedstacks permission.",
- "How many items should be in a oversized stack?"
- })
+ {
+ "Oversized stacks are stacks that ignore the normal max stacksize.",
+ "They can be obtained using /give and /item, if the player has essentials.oversizedstacks permission.",
+ "How many items should be in a oversized stack?"
+ })
private int oversizedStacksize = 64;
@@ -42,21 +42,19 @@ public class General implements StorageObject
{
FILE, GROUPMANAGER, VAULT
}
-
-
@Comment(
- {
- "Sets the place where group options should be stored:", " FILE: Options are stored inside groups.yml in the Essentials folder",
- " GROUPMANAGER: Options are stored using the GroupManager groups",
- " VAULT: Options are stored using a permissions plugin supported by Vault"
- })
+ {
+ "Sets the place where group options should be stored:", " FILE: Options are stored inside groups.yml in the Essentials folder",
+ " GROUPMANAGER: Options are stored using the GroupManager groups",
+ " VAULT: Options are stored using a permissions plugin supported by Vault"
+ })
private GroupStorage groupStorage = GroupStorage.FILE;
@Comment(
- {
- "Set to true to enable per-world permissions for teleporting between worlds with essentials commands",
- "This applies to /world, /back, /tp[a|o][here|all], but not warps.",
- "Give someone permission to teleport to a world with essentials.world."
- })
+ {
+ "Set to true to enable per-world permissions for teleporting between worlds with essentials commands",
+ "This applies to /world, /back, /tp[a|o][here|all], but not warps.",
+ "Give someone permission to teleport to a world with essentials.world."
+ })
private boolean worldTeleportPermissions = false;
private boolean worldHomePermissions = false;
@Comment("Delay to wait before people can cause attack damage after logging in ")
@@ -71,7 +69,6 @@ public class General implements StorageObject
{
this.loginAttackDelay = loginAttackDelay / 1000;
}
-
private Boolean metricsEnabled = null;
@Comment("The join message when players join the server")
private String joinMessage = "&e{PLAYER} has joined the game";
diff --git a/Essentials/src/net/ess3/settings/Kits.java b/Essentials/src/net/ess3/settings/Kits.java
index f68ac5d83..2892729c4 100644
--- a/Essentials/src/net/ess3/settings/Kits.java
+++ b/Essentials/src/net/ess3/settings/Kits.java
@@ -21,11 +21,10 @@ public class Kits implements StorageObject
kit.setDelay(10.0);
kit.setItems(
Arrays.asList(
- new ItemStack(Material.DIAMOND_SPADE, 1), new ItemStack(Material.DIAMOND_PICKAXE, 1), new ItemStack(Material.DIAMOND_AXE, 1)));
+ new ItemStack(Material.DIAMOND_SPADE, 1), new ItemStack(Material.DIAMOND_PICKAXE, 1), new ItemStack(Material.DIAMOND_AXE, 1)));
kits = new HashMap();
kits.put("tools", kit);
}
-
@MapValueType(Kit.class)
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
diff --git a/Essentials/src/net/ess3/settings/Settings.java b/Essentials/src/net/ess3/settings/Settings.java
index a73e5f42d..9552c4cc7 100644
--- a/Essentials/src/net/ess3/settings/Settings.java
+++ b/Essentials/src/net/ess3/settings/Settings.java
@@ -12,39 +12,39 @@ import net.ess3.storage.StorageObject;
public class Settings implements StorageObject
{
@Comment(
- {
- "##########################################################", "+------------------------------------------------------+ #",
- "| General Settings | #", "+------------------------------------------------------+ #",
- "##########################################################"
- })
+ {
+ "##########################################################", "+------------------------------------------------------+ #",
+ "| General Settings | #", "+------------------------------------------------------+ #",
+ "##########################################################"
+ })
private General general = new General();
@Comment(
- {
- "##########################################################", "+------------------------------------------------------+ #",
- "| Chat Settings | #", "+------------------------------------------------------+ #",
- "##########################################################"
- })
+ {
+ "##########################################################", "+------------------------------------------------------+ #",
+ "| Chat Settings | #", "+------------------------------------------------------+ #",
+ "##########################################################"
+ })
private Chat chat = new Chat();
@Comment(
- {
- "##########################################################", "+------------------------------------------------------+ #",
- "| Economy Settings | #", "+------------------------------------------------------+ #",
- "##########################################################"
- })
+ {
+ "##########################################################", "+------------------------------------------------------+ #",
+ "| Economy Settings | #", "+------------------------------------------------------+ #",
+ "##########################################################"
+ })
private Economy economy = new Economy();
@Comment(
- {
- "##########################################################", "+------------------------------------------------------+ #",
- "| Commands Settings | #", "+------------------------------------------------------+ #",
- "##########################################################"
- })
+ {
+ "##########################################################", "+------------------------------------------------------+ #",
+ "| Commands Settings | #", "+------------------------------------------------------+ #",
+ "##########################################################"
+ })
private Commands commands = new Commands();
@Comment(
- {
- "##########################################################", "+------------------------------------------------------+ #",
- "| Worlds Settings | #", "+------------------------------------------------------+ #",
- "##########################################################"
- })
+ {
+ "##########################################################", "+------------------------------------------------------+ #",
+ "| Worlds Settings | #", "+------------------------------------------------------+ #",
+ "##########################################################"
+ })
@MapValueType(WorldOptions.class)
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
diff --git a/Essentials/src/net/ess3/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java
index e9b7f8af3..5d5ab3934 100644
--- a/Essentials/src/net/ess3/settings/SettingsHolder.java
+++ b/Essentials/src/net/ess3/settings/SettingsHolder.java
@@ -8,7 +8,7 @@ import net.ess3.storage.AsyncStorageObjectHolder;
public class SettingsHolder extends AsyncStorageObjectHolder implements ISettings
{
- private transient volatile boolean debug = false;
+ private volatile boolean debug = false;
public SettingsHolder(final IEssentials ess)
{
diff --git a/Essentials/src/net/ess3/settings/Spawns.java b/Essentials/src/net/ess3/settings/Spawns.java
index 7d05d55d2..57a63409c 100644
--- a/Essentials/src/net/ess3/settings/Spawns.java
+++ b/Essentials/src/net/ess3/settings/Spawns.java
@@ -16,22 +16,22 @@ import org.bukkit.Location;
public class Spawns implements StorageObject
{
@Comment(
- {
- "Should we announce to the server when someone logs in for the first time?",
- "If so, use this format, replacing {DISPLAYNAME} with the player name.", "If not, set to ''"
- })
+ {
+ "Should we announce to the server when someone logs in for the first time?",
+ "If so, use this format, replacing {DISPLAYNAME} with the player name.", "If not, set to ''"
+ })
private String newPlayerAnnouncement = "&dWelcome {DISPLAYNAME} to the server!";
@Comment(
- {
- "Priority of the respawn event listener", "Set this to lowest, if you want e.g. Multiverse to handle the respawning",
- "Set this to normal, if you want EssentialsSpawn to handle the respawning",
- "Set this to highest, if you want to force EssentialsSpawn to handle the respawning"
- })
+ {
+ "Priority of the respawn event listener", "Set this to lowest, if you want e.g. Multiverse to handle the respawning",
+ "Set this to normal, if you want EssentialsSpawn to handle the respawning",
+ "Set this to highest, if you want to force EssentialsSpawn to handle the respawning"
+ })
private String respawnPriority = "normal";
@Comment(
- {
- "When we spawn for the first time, which spawnpoint do we use?", "Set to none if you want to use the spawn point of the world."
- })
+ {
+ "When we spawn for the first time, which spawnpoint do we use?", "Set to none if you want to use the spawn point of the world."
+ })
private String newbieSpawn = "none";
@Comment("List of all spawnpoints")
@MapValueType(StoredLocation.class)
diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java
index 1c310c7c3..9aaaaa350 100644
--- a/Essentials/src/net/ess3/settings/SpawnsHolder.java
+++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java
@@ -38,7 +38,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder implements IE
/**
* Sets a spawn location
*
- * @param loc - Location you want to set as spawn
+ * @param loc - Location you want to set as spawn
* @param group - Group to save it undr in the config
*/
public void setSpawn(final Location loc, final String group)
@@ -174,8 +174,8 @@ public class SpawnsHolder extends AsyncStorageObjectHolder implements IE
private class SpawnPlayerListener implements Listener // TODO: What is this for?
{
- private final transient IEssentials ess;
- private final transient SpawnsHolder spawns;
+ private final IEssentials ess;
+ private final SpawnsHolder spawns;
public SpawnPlayerListener(final IEssentials ess, final SpawnsHolder spawns)
{
@@ -187,8 +187,6 @@ public class SpawnsHolder extends AsyncStorageObjectHolder implements IE
public void onPlayerRespawn(final PlayerRespawnEvent event)
{
final IUser user = ess.getUserMap().getUser(event.getPlayer());
-
- final ISettings settings = ess.getSettings();
boolean respawnAtHome = ess.getSettings().getData().getCommands().getHome().isRespawnAtHome();
if (respawnAtHome)
{
@@ -240,7 +238,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder implements IE
private class NewPlayerTeleport implements Runnable
{
- private final transient IUser user;
+ private final IUser user;
public NewPlayerTeleport(final IUser user)
{
diff --git a/Essentials/src/net/ess3/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java
index e49ebb181..40e57dee7 100644
--- a/Essentials/src/net/ess3/settings/WorldOptions.java
+++ b/Essentials/src/net/ess3/settings/WorldOptions.java
@@ -26,7 +26,6 @@ public class WorldOptions implements StorageObject
}
}
}
-
@Comment("Disables godmode for all players if they teleport to this world.")
private boolean godmode = true;
@Comment("Prevent creatures spawning")
diff --git a/Essentials/src/net/ess3/settings/Worlds.java b/Essentials/src/net/ess3/settings/Worlds.java
index c3f1f09d0..10dc63823 100644
--- a/Essentials/src/net/ess3/settings/Worlds.java
+++ b/Essentials/src/net/ess3/settings/Worlds.java
@@ -9,5 +9,4 @@ import net.ess3.storage.StorageObject;
@EqualsAndHashCode(callSuper = false)
public class Worlds implements StorageObject
{
-
}
\ No newline at end of file
diff --git a/Essentials/src/net/ess3/settings/antibuild/Alert.java b/Essentials/src/net/ess3/settings/antibuild/Alert.java
index 481cc39ec..dc11841b1 100644
--- a/Essentials/src/net/ess3/settings/antibuild/Alert.java
+++ b/Essentials/src/net/ess3/settings/antibuild/Alert.java
@@ -32,8 +32,9 @@ public class Alert implements StorageObject
public void setupDefaults()
{
- Material[] mat = {
- Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET
+ Material[] mat =
+ {
+ Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET
};
alertOnPlacement.addAll(Arrays.asList(mat));
alertOnUse.add(Material.LAVA_BUCKET);
diff --git a/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java b/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java
index 3bbf32f42..b45c65e3e 100644
--- a/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java
+++ b/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java
@@ -11,24 +11,22 @@ import net.ess3.storage.StorageObject;
public class AntiBuild implements StorageObject
{
@Comment(
- {
- "Should people with build: false in permissions be allowed to build", "Set true to disable building for those people",
- "Setting to false means EssentialsAntiBuild will never prevent you from building"
- })
+ {
+ "Should people with build: false in permissions be allowed to build", "Set true to disable building for those people",
+ "Setting to false means EssentialsAntiBuild will never prevent you from building"
+ })
private boolean disableBuild = true;
@Comment(
- {
- "Should people with build: false in permissions be allowed to use items", "Set true to disable using for those people",
- "Setting to false means EssentialsAntiBuild will never prevent you from using"
- })
+ {
+ "Should people with build: false in permissions be allowed to use items", "Set true to disable using for those people",
+ "Setting to false means EssentialsAntiBuild will never prevent you from using"
+ })
private boolean disableUse = true;
@Comment(
- {
- "Should we tell people they are not allowed to build"
- })
+ {
+ "Should we tell people they are not allowed to build"
+ })
private boolean warnOnBuildDisallow = true;
-
private Alert alert = new Alert();
private BlackList blacklist = new BlackList();
-
}
diff --git a/Essentials/src/net/ess3/settings/antibuild/BlackList.java b/Essentials/src/net/ess3/settings/antibuild/BlackList.java
index af9205f7e..ca67ab479 100644
--- a/Essentials/src/net/ess3/settings/antibuild/BlackList.java
+++ b/Essentials/src/net/ess3/settings/antibuild/BlackList.java
@@ -15,33 +15,33 @@ import org.bukkit.Material;
public class BlackList implements StorageObject
{
@Comment(
- {
- "Which blocks should people be prevented from placing"
- })
+ {
+ "Which blocks should people be prevented from placing"
+ })
@ListType(Material.class)
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
private Set placement = new HashSet();
@Comment(
- {
- "Which items should people be prevented from using"
- })
+ {
+ "Which items should people be prevented from using"
+ })
@ListType(Material.class)
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
private Set usage = new HashSet();
@Comment(
- {
- "Which blocks should people be prevented from breaking"
- })
+ {
+ "Which blocks should people be prevented from breaking"
+ })
@ListType(Material.class)
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
private Set breaking = new HashSet();
@Comment(
- {
- "Which blocks should not be pushed by pistons"
- })
+ {
+ "Which blocks should not be pushed by pistons"
+ })
@ListType(Material.class)
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
@@ -49,8 +49,9 @@ public class BlackList implements StorageObject
public void setupDefaults()
{
- Material[] mat = {
- Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET
+ Material[] mat =
+ {
+ Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET
};
placement.addAll(Arrays.asList(mat));
}
diff --git a/Essentials/src/net/ess3/settings/commands/Afk.java b/Essentials/src/net/ess3/settings/commands/Afk.java
index 5136dd8d0..2f3ab65dd 100644
--- a/Essentials/src/net/ess3/settings/commands/Afk.java
+++ b/Essentials/src/net/ess3/settings/commands/Afk.java
@@ -11,22 +11,21 @@ import net.ess3.storage.StorageObject;
public class Afk implements StorageObject
{
@Comment(
- {
- "After this timeout in seconds, the user will be set as afk.", "Set to -1 for no timeout."
- })
+ {
+ "After this timeout in seconds, the user will be set as afk.", "Set to -1 for no timeout."
+ })
private long autoAFK = 300;
@Comment(
- {
- "Auto-AFK Kick", "After this timeout in seconds, the user will be kicked from the server.", "Set to -1 for no timeout."
- })
+ {
+ "Auto-AFK Kick", "After this timeout in seconds, the user will be kicked from the server.", "Set to -1 for no timeout."
+ })
private long autoAFKKick = -1;
@Comment(
- {
- "Set this to true, if you want to freeze the player, if he is afk.", "Other players or monsters can't push him out of afk mode then.",
- "This will also enable temporary god mode for the afk player.", "The player has to use the command /afk to leave the afk mode.",
- "You have to add a message to your welcome message or help page,", "since the player will not get a message, if he tries to move."
- })
+ {
+ "Set this to true, if you want to freeze the player, if he is afk.", "Other players or monsters can't push him out of afk mode then.",
+ "This will also enable temporary god mode for the afk player.", "The player has to use the command /afk to leave the afk mode.",
+ "You have to add a message to your welcome message or help page,", "since the player will not get a message, if he tries to move."
+ })
private boolean freezeAFKPlayers = false;
-
private boolean disableItemPickupWhileAfk = true;
}
diff --git a/Essentials/src/net/ess3/settings/commands/Back.java b/Essentials/src/net/ess3/settings/commands/Back.java
index c0e7ed7b6..e83c53860 100644
--- a/Essentials/src/net/ess3/settings/commands/Back.java
+++ b/Essentials/src/net/ess3/settings/commands/Back.java
@@ -11,9 +11,9 @@ import net.ess3.storage.StorageObject;
public class Back implements StorageObject
{
@Comment(
- {
- "Do you want essentials to keep track of previous location for /back in the teleport listener?",
- "If you set this to true any plugin that uses teleport will have the previous location registered."
- })
+ {
+ "Do you want essentials to keep track of previous location for /back in the teleport listener?",
+ "If you set this to true any plugin that uses teleport will have the previous location registered."
+ })
private boolean registerBackInListener = false;
}
diff --git a/Essentials/src/net/ess3/settings/commands/Help.java b/Essentials/src/net/ess3/settings/commands/Help.java
index 77eeacb55..585426dce 100644
--- a/Essentials/src/net/ess3/settings/commands/Help.java
+++ b/Essentials/src/net/ess3/settings/commands/Help.java
@@ -13,11 +13,11 @@ public class Help implements StorageObject
@Comment("Show other plugins commands in help")
private boolean showNonEssCommandsInHelp = true;
@Comment(
- {
- "Hide plugins which don't give a permission in their plugin.yml for each command.",
- "You can override a true value here for a single plugin by adding a permission to a user/group.",
- "The individual permission is: essentials.help., anyone with essentials.* or '*' will see all help this setting reguardless.",
- "You can use negative permissions to remove access to just a single plugins help if the following is enabled."
- })
+ {
+ "Hide plugins which don't give a permission in their plugin.yml for each command.",
+ "You can override a true value here for a single plugin by adding a permission to a user/group.",
+ "The individual permission is: essentials.help., anyone with essentials.* or '*' will see all help this setting reguardless.",
+ "You can use negative permissions to remove access to just a single plugins help if the following is enabled."
+ })
private boolean hidePermissionlessCommands = true;
}
diff --git a/Essentials/src/net/ess3/settings/commands/Home.java b/Essentials/src/net/ess3/settings/commands/Home.java
index 2ef08fe1f..8b4c7356b 100644
--- a/Essentials/src/net/ess3/settings/commands/Home.java
+++ b/Essentials/src/net/ess3/settings/commands/Home.java
@@ -13,11 +13,11 @@ public class Home implements StorageObject
@Comment("When players die, should they respawn at their homes, instead of the spawnpoint?")
private boolean respawnAtHome = false;
@Comment(
- {
- "When a player interacts with a bed, should their home be set to that location?",
- "If you enable this and remove default player access to the /sethome command, ",
- "you can make beds the only way for players to set their home location."
- })
+ {
+ "When a player interacts with a bed, should their home be set to that location?",
+ "If you enable this and remove default player access to the /sethome command, ",
+ "you can make beds the only way for players to set their home location."
+ })
private boolean bedSetsHome = false;
@Comment("If no home is set, should the player be send to spawn, when /home is used.")
private boolean spawnIfNoHome = false;
diff --git a/Essentials/src/net/ess3/settings/commands/List.java b/Essentials/src/net/ess3/settings/commands/List.java
index e2b869aaf..ea47d9115 100644
--- a/Essentials/src/net/ess3/settings/commands/List.java
+++ b/Essentials/src/net/ess3/settings/commands/List.java
@@ -1,6 +1,5 @@
package net.ess3.settings.commands;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.ess3.storage.Comment;
diff --git a/Essentials/src/net/ess3/settings/commands/SocialSpy.java b/Essentials/src/net/ess3/settings/commands/SocialSpy.java
index 4460c0cfd..9cb572689 100644
--- a/Essentials/src/net/ess3/settings/commands/SocialSpy.java
+++ b/Essentials/src/net/ess3/settings/commands/SocialSpy.java
@@ -21,7 +21,6 @@ public class SocialSpy implements StorageObject
socialspyCommands.addAll(Arrays.asList("msg", "r", "mail", "m", "t", "emsg", "tell", "er", "reply", "ereply", "email"));
}
}
-
@ListType
@Comment("Commands to listen for in socialspy")
private List socialspyCommands = new ArrayList();
diff --git a/Essentials/src/net/ess3/settings/commands/Speed.java b/Essentials/src/net/ess3/settings/commands/Speed.java
index 295a6a1b3..b9e7a8988 100644
--- a/Essentials/src/net/ess3/settings/commands/Speed.java
+++ b/Essentials/src/net/ess3/settings/commands/Speed.java
@@ -10,9 +10,14 @@ import net.ess3.storage.StorageObject;
@EqualsAndHashCode(callSuper = false)
public class Speed implements StorageObject
{
- @Comment({"Set the max fly speed, values range from 0.2 to 1.0"})
+ @Comment(
+ {
+ "Set the max fly speed, values range from 0.2 to 1.0"
+ })
private double maxFlySpeed = 1.0f;
-
- @Comment({"Set the max walk speed, values range from 0.1 to 1.0"})
+ @Comment(
+ {
+ "Set the max walk speed, values range from 0.1 to 1.0"
+ })
private double maxWalkSpeed = 0.8f;
}
diff --git a/Essentials/src/net/ess3/settings/commands/Teleport.java b/Essentials/src/net/ess3/settings/commands/Teleport.java
index ffa576410..71b41028d 100644
--- a/Essentials/src/net/ess3/settings/commands/Teleport.java
+++ b/Essentials/src/net/ess3/settings/commands/Teleport.java
@@ -11,17 +11,20 @@ import net.ess3.storage.StorageObject;
public class Teleport implements StorageObject
{
@Comment(
- {
- "Set timeout in seconds for players to accept tpa before request is cancelled.", "Set to 0 for no timeout."
- })
+ {
+ "Set timeout in seconds for players to accept tpa before request is cancelled.", "Set to 0 for no timeout."
+ })
private int requestTimeout = 120;
- @Comment({"Cancels a request made by tpa / tphere on world change to prevent cross world tp"})
+ @Comment(
+ {
+ "Cancels a request made by tpa / tphere on world change to prevent cross world tp"
+ })
private boolean cancelRequestsOnWorldChange = false;
@Comment(
- {
- "The delay, in seconds, a player can't be attacked by other players after he has been teleported by a command",
- "This will also prevent that the player can attack other players"
- })
+ {
+ "The delay, in seconds, a player can't be attacked by other players after he has been teleported by a command",
+ "This will also prevent that the player can attack other players"
+ })
private long invulnerability = 0;
public long getInvulnerability()
diff --git a/Essentials/src/net/ess3/settings/protect/Prevent.java b/Essentials/src/net/ess3/settings/protect/Prevent.java
index 553776c9d..524afe6f2 100644
--- a/Essentials/src/net/ess3/settings/protect/Prevent.java
+++ b/Essentials/src/net/ess3/settings/protect/Prevent.java
@@ -10,7 +10,6 @@ import net.ess3.storage.StorageObject;
@EqualsAndHashCode(callSuper = false)
public class Prevent implements StorageObject
{
-
private boolean lavaFlow = false;
private boolean waterFlow = false;
// private boolean waterbucketFlow = false; TODO: Test if this still works
@@ -30,8 +29,8 @@ public class Prevent implements StorageObject
private boolean endermanPickup = false;
private boolean villagerDeath = false;
@Comment(
- {
- "Monsters won't follow players", "permission essentials.protect.entitytarget.bypass disables this"
- })
+ {
+ "Monsters won't follow players", "permission essentials.protect.entitytarget.bypass disables this"
+ })
private boolean entitytarget = false;
}
\ No newline at end of file
diff --git a/Essentials/src/net/ess3/settings/protect/Protect.java b/Essentials/src/net/ess3/settings/protect/Protect.java
index ff4af10ff..420c5028e 100644
--- a/Essentials/src/net/ess3/settings/protect/Protect.java
+++ b/Essentials/src/net/ess3/settings/protect/Protect.java
@@ -13,15 +13,13 @@ public class Protect implements StorageObject
@Comment("General physics/behavior modifications")
private Prevent prevent = new Prevent();
@Comment(
- {
- "Maximum height the creeper should explode. -1 allows them to explode everywhere.",
- "Set prevent.creeper-explosion to true, if you want to disable creeper explosions."
- })
+ {
+ "Maximum height the creeper should explode. -1 allows them to explode everywhere.",
+ "Set prevent.creeper-explosion to true, if you want to disable creeper explosions."
+ })
private int creeperMaxHeight = -1;
-
@Comment("Disable weather options")
private boolean disableStorm = false;
private boolean disableThunder = false;
private boolean disableLighting = false;
-
}
diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java
index b38f5750b..714138349 100644
--- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java
+++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java
@@ -11,8 +11,8 @@ import org.bukkit.Bukkit;
public abstract class AbstractDelayedYamlFileReader implements Runnable
{
- private final transient Class clazz;
- private final transient IEssentials ess;
+ private final Class clazz;
+ private final IEssentials ess;
public AbstractDelayedYamlFileReader(final IEssentials ess, final Class clazz)
{
diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java
index 2a74c4cd5..ade8eeb93 100644
--- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java
+++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java
@@ -11,8 +11,8 @@ import org.bukkit.Bukkit;
public abstract class AbstractDelayedYamlFileWriter implements Runnable
{
- private final transient IEssentials ess;
- private final transient ReentrantLock lock = new ReentrantLock(); // TODO: Needed?
+ private final IEssentials ess;
+ private final ReentrantLock lock = new ReentrantLock(); // TODO: Needed?
public AbstractDelayedYamlFileWriter(final IEssentials ess)
{
diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
index d4239db8e..b4a82b2bc 100644
--- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
+++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
@@ -10,14 +10,14 @@ import org.bukkit.Bukkit;
public abstract class AsyncStorageObjectHolder implements IStorageObjectHolder
{
- private transient T data;
- private final transient Class clazz;
- protected final transient IEssentials ess;
- private final transient StorageObjectDataWriter writer;
- private final transient StorageObjectDataReader reader;
- private final transient AtomicBoolean loaded = new AtomicBoolean(false);
+ private T data;
+ private final Class clazz;
+ protected final IEssentials ess;
+ private final StorageObjectDataWriter writer;
+ private final StorageObjectDataReader reader;
+ private final AtomicBoolean loaded = new AtomicBoolean(false);
private volatile long savetime = 0;
- private final transient File file;
+ private final File file;
public AsyncStorageObjectHolder(final IEssentials ess, final Class clazz, final File file)
{
diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java
index 89f20cdf8..666c07931 100644
--- a/Essentials/src/net/ess3/storage/BukkitConstructor.java
+++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java
@@ -21,9 +21,9 @@ import org.yaml.snakeyaml.nodes.*;
public class BukkitConstructor extends Constructor
{
- private final transient Pattern DATAPATTERN = Pattern.compile("[:+',;.]");
- private final transient Pattern WORD = Pattern.compile("\\W");
- private final transient IPlugin plugin;
+ private final Pattern DATAPATTERN = Pattern.compile("[:+',;.]");
+ private final Pattern WORD = Pattern.compile("\\W");
+ private final IPlugin plugin;
public BukkitConstructor(final Class clazz, final IPlugin plugin)
{
diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java
index 0c3def687..90429968a 100644
--- a/Essentials/src/net/ess3/storage/ManagedFile.java
+++ b/Essentials/src/net/ess3/storage/ManagedFile.java
@@ -18,7 +18,7 @@ import org.bukkit.Bukkit;
public class ManagedFile
{
private final static int BUFFERSIZE = 1024 * 8;
- private final transient File file;
+ private final File file;
public ManagedFile(final String filename, final IEssentials ess)
{
diff --git a/Essentials/src/net/ess3/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java
index bb7894b51..aeaf14892 100644
--- a/Essentials/src/net/ess3/storage/StorageObjectMap.java
+++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java
@@ -26,11 +26,11 @@ import org.apache.commons.io.IOUtils;
public abstract class StorageObjectMap extends CacheLoader implements IStorageObjectMap
{
- protected final transient IEssentials ess;
- private final transient File folder;
- protected final transient Cache cache = CacheBuilder.newBuilder().softValues().build(this);
- protected final transient ConcurrentSkipListSet keys = new ConcurrentSkipListSet();
- protected final transient ConcurrentSkipListMap zippedfiles = new ConcurrentSkipListMap();
+ protected final IEssentials ess;
+ private final File folder;
+ protected final Cache cache = CacheBuilder.newBuilder().softValues().build(this);
+ protected final ConcurrentSkipListSet keys = new ConcurrentSkipListSet();
+ protected final ConcurrentSkipListMap zippedfiles = new ConcurrentSkipListMap();
private final Pattern zipCheck = Pattern.compile("^[a-zA-Z0-9]*-?[a-zA-Z0-9]+\\.yml$");
public StorageObjectMap(final IEssentials ess, final String folderName)
diff --git a/Essentials/src/net/ess3/storage/StorageQueue.java b/Essentials/src/net/ess3/storage/StorageQueue.java
index 5084ba82f..d602ad84e 100644
--- a/Essentials/src/net/ess3/storage/StorageQueue.java
+++ b/Essentials/src/net/ess3/storage/StorageQueue.java
@@ -15,7 +15,7 @@ public class StorageQueue implements Runnable
private DelayQueue queue = new DelayQueue();
public final static long DELAY = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
private final AtomicBoolean enabled = new AtomicBoolean(false);
- private final transient Object lock = new Object();
+ private final Object lock = new Object();
private final IPlugin plugin;
public StorageQueue(IPlugin plugin)
diff --git a/Essentials/src/net/ess3/storage/YamlStorageReader.java b/Essentials/src/net/ess3/storage/YamlStorageReader.java
index f49a0b5a2..0cb0197b0 100644
--- a/Essentials/src/net/ess3/storage/YamlStorageReader.java
+++ b/Essentials/src/net/ess3/storage/YamlStorageReader.java
@@ -13,10 +13,10 @@ import org.yaml.snakeyaml.introspector.BeanAccess;
public class YamlStorageReader implements IStorageReader
{
- private transient static final Map, Yaml> PREPARED_YAMLS = Collections.synchronizedMap(new HashMap, Yaml>());
- private transient static final Map, ReentrantLock> LOCKS = new HashMap, ReentrantLock>();
- private transient final Reader reader;
- private transient final IPlugin plugin;
+ private static final Map, Yaml> PREPARED_YAMLS = Collections.synchronizedMap(new HashMap, Yaml>());
+ private static final Map, ReentrantLock> LOCKS = new HashMap, ReentrantLock>();
+ private final Reader reader;
+ private final IPlugin plugin;
public YamlStorageReader(final Reader reader, final IPlugin plugin)
{
diff --git a/Essentials/src/net/ess3/storage/YamlStorageWriter.java b/Essentials/src/net/ess3/storage/YamlStorageWriter.java
index e5de1460b..2591af79c 100644
--- a/Essentials/src/net/ess3/storage/YamlStorageWriter.java
+++ b/Essentials/src/net/ess3/storage/YamlStorageWriter.java
@@ -20,9 +20,9 @@ import org.yaml.snakeyaml.Yaml;
public class YamlStorageWriter implements IStorageWriter
{
- private transient static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W");
- private transient final PrintWriter writer;
- private transient static final Yaml YAML = new Yaml();
+ private static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W");
+ private final PrintWriter writer;
+ private static final Yaml YAML = new Yaml();
public YamlStorageWriter(final PrintWriter writer)
{
@@ -51,7 +51,7 @@ public class YamlStorageWriter implements IStorageWriter
for (Field field : clazz.getDeclaredFields())
{
final int modifier = field.getModifiers();
- if (Modifier.isPrivate(modifier) && !Modifier.isTransient(modifier) && !Modifier.isStatic(modifier))
+ if (Modifier.isPrivate(modifier) && !Modifier.isStatic(modifier))
{
field.setAccessible(true);
diff --git a/Essentials/src/net/ess3/user/CooldownException.java b/Essentials/src/net/ess3/user/CooldownException.java
index 08e163522..2cd9ac543 100644
--- a/Essentials/src/net/ess3/user/CooldownException.java
+++ b/Essentials/src/net/ess3/user/CooldownException.java
@@ -3,12 +3,10 @@ package net.ess3.user;
public class CooldownException extends Exception
{
-
private static final long serialVersionUID = 913632836257457319L;
public CooldownException(String timeLeft)
{
super(timeLeft);
}
-
}
diff --git a/Essentials/src/net/ess3/user/IOfflinePlayer.java b/Essentials/src/net/ess3/user/IOfflinePlayer.java
index d520ce833..97a9ade5a 100644
--- a/Essentials/src/net/ess3/user/IOfflinePlayer.java
+++ b/Essentials/src/net/ess3/user/IOfflinePlayer.java
@@ -10,7 +10,6 @@ public interface IOfflinePlayer
String getDisplayName();
//Location getBedSpawnLocation();
-
void setBanned(boolean bln);
boolean hasPermission(Permission perm);
diff --git a/Essentials/src/net/ess3/user/IOfflineUser.java b/Essentials/src/net/ess3/user/IOfflineUser.java
index b5361da4f..237569825 100644
--- a/Essentials/src/net/ess3/user/IOfflineUser.java
+++ b/Essentials/src/net/ess3/user/IOfflineUser.java
@@ -5,5 +5,4 @@ import net.ess3.storage.IStorageObjectHolder;
public interface IOfflineUser extends IStorageObjectHolder//, IOfflinePlayer
{
-
}
diff --git a/Essentials/src/net/ess3/user/PlayerNotFoundException.java b/Essentials/src/net/ess3/user/PlayerNotFoundException.java
index 2c3c741c1..6817a7847 100644
--- a/Essentials/src/net/ess3/user/PlayerNotFoundException.java
+++ b/Essentials/src/net/ess3/user/PlayerNotFoundException.java
@@ -5,7 +5,6 @@ import static net.ess3.I18n._;
public class PlayerNotFoundException extends Exception
{
-
private static final long serialVersionUID = -510752839980332640L;
public PlayerNotFoundException()
diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index 4fce959bf..7a3aba0af 100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -31,22 +31,22 @@ public class User extends UserBase implements IUser
{
private CommandSender replyTo = null;
@Getter
- private transient IUser teleportRequester;
+ private IUser teleportRequester;
@Getter
- private transient boolean tpRequestHere;
+ private boolean tpRequestHere;
@Getter
- private transient final ITeleport teleport;
+ private final ITeleport teleport;
@Getter
- private transient long teleportRequestTime;
+ private long teleportRequestTime;
@Getter
@Setter
- private transient long lastOnlineActivity;
- private transient long lastActivity = System.currentTimeMillis();
+ private long lastOnlineActivity;
+ private long lastActivity = System.currentTimeMillis();
/*@Getter
@Setter
private boolean hidden = false;*/
@Getter
- private transient boolean vanished;
+ private boolean vanished;
@Getter
@Setter
private boolean invSee = false;
@@ -54,7 +54,7 @@ public class User extends UserBase implements IUser
@Setter
private boolean enderSee = false;
private long lastThrottledAction;
- private transient Location afkPosition;
+ private Location afkPosition;
private AtomicBoolean gotMailInfo = new AtomicBoolean(false);
private WeakReference playerCache;
@Getter
@@ -592,8 +592,7 @@ public class User extends UserBase implements IUser
{
return true;
}
-
- private transient long teleportInvulnerabilityTimestamp = 0;
+ private long teleportInvulnerabilityTimestamp = 0;
public void enableInvulnerabilityAfterTeleport()
{
@@ -635,7 +634,7 @@ public class User extends UserBase implements IUser
}
}
ess.getVanishedPlayers().add(getName());
- if(Permissions.VANISH_EFFECT.isAuthorized(this))
+ if (Permissions.VANISH_EFFECT.isAuthorized(this))
{
getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false));
}
@@ -647,7 +646,7 @@ public class User extends UserBase implements IUser
p.showPlayer(getPlayer());
}
ess.getVanishedPlayers().remove(getName());
- if(Permissions.VANISH_EFFECT.isAuthorized(this))
+ if (Permissions.VANISH_EFFECT.isAuthorized(this))
{
getPlayer().removePotionEffect(PotionEffectType.INVISIBILITY);
}
diff --git a/Essentials/src/net/ess3/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java
index b9d684930..9b63fab2f 100644
--- a/Essentials/src/net/ess3/user/UserData.java
+++ b/Essentials/src/net/ess3/user/UserData.java
@@ -6,6 +6,7 @@ import net.ess3.storage.*;
import org.bukkit.Location;
import org.bukkit.Material;
+
@Data
@EqualsAndHashCode(callSuper = false)
public class UserData implements StorageObject
@@ -14,8 +15,6 @@ public class UserData implements StorageObject
{
JAIL, MUTE, LASTHEAL, LASTTELEPORT, LOGIN, LOGOUT, KIT, COMMAND
}
-
-
private String nickname;
private Double money;
@MapValueType(StoredLocation.class)
@@ -27,7 +26,6 @@ public class UserData implements StorageObject
{
return homes == null ? Collections.emptyMap() : Collections.unmodifiableMap(homes);
}
-
@ListType(Material.class)
@Getter(AccessLevel.NONE)
@Setter(AccessLevel.NONE)
@@ -37,7 +35,6 @@ public class UserData implements StorageObject
{
return unlimited == null ? Collections.emptySet() : Collections.unmodifiableSet(unlimited);
}
-
@MapValueType(List.class)
@MapKeyType(Material.class)
@Getter(AccessLevel.NONE)
@@ -48,7 +45,6 @@ public class UserData implements StorageObject
{
return powerTools == null ? Collections.>emptyMap() : Collections.unmodifiableMap(powerTools);
}
-
private StoredLocation lastLocation;
@MapKeyType(String.class)
@MapValueType(Long.class)
@@ -60,7 +56,6 @@ public class UserData implements StorageObject
{
return timestamps == null ? Collections.emptyMap() : Collections.unmodifiableMap(timestamps);
}
-
private String jail;
@ListType
@Getter(AccessLevel.NONE)
@@ -71,7 +66,6 @@ public class UserData implements StorageObject
{
return mails == null ? Collections.emptyList() : Collections.unmodifiableList(mails);
}
-
private Inventory inventory;
private boolean teleportEnabled;
@ListType
@@ -83,7 +77,6 @@ public class UserData implements StorageObject
{
return ignore == null ? Collections.emptySet() : Collections.unmodifiableSet(ignore);
}
-
private boolean godmode;
private boolean muted;
private boolean jailed;
diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java
index c83047f0c..9df31e543 100644
--- a/Essentials/src/net/ess3/user/UserMap.java
+++ b/Essentials/src/net/ess3/user/UserMap.java
@@ -141,7 +141,6 @@ public class UserMap extends StorageObjectMap implements IUserMap
{
return matchUsers(name, false, false, requester);
}
-
private final Pattern comma = Pattern.compile(",");
public Set matchUsers(final String name, final boolean includeHidden, final boolean includeOffline, final Player requester)
diff --git a/Essentials/src/net/ess3/utils/DateUtil.java b/Essentials/src/net/ess3/utils/DateUtil.java
index 2a38fd7a4..baf850034 100644
--- a/Essentials/src/net/ess3/utils/DateUtil.java
+++ b/Essentials/src/net/ess3/utils/DateUtil.java
@@ -30,11 +30,13 @@ public class DateUtil
}
StringBuilder sb = new StringBuilder();
- int[] types = new int[]{
- Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH, Calendar.HOUR_OF_DAY, Calendar.MINUTE, Calendar.SECOND
+ int[] types = new int[]
+ {
+ Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH, Calendar.HOUR_OF_DAY, Calendar.MINUTE, Calendar.SECOND
};
- String[] names = new String[]{
- _("year"), _("years"), _("month"), _("months"), _("day"), _("days"), _("hour"), _("hours"), _("minute"), _("minutes"), _("second"), _("seconds")
+ String[] names = new String[]
+ {
+ _("year"), _("years"), _("month"), _("months"), _("day"), _("days"), _("hour"), _("hours"), _("minute"), _("minutes"), _("second"), _("seconds")
};
for (int i = 0; i < types.length; i++)
{
diff --git a/Essentials/src/net/ess3/utils/ExecuteTimer.java b/Essentials/src/net/ess3/utils/ExecuteTimer.java
index 012ab9296..97b4174d9 100644
--- a/Essentials/src/net/ess3/utils/ExecuteTimer.java
+++ b/Essentials/src/net/ess3/utils/ExecuteTimer.java
@@ -9,9 +9,8 @@ import java.util.Locale;
public class ExecuteTimer
{
- private final transient List times;
- private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
-
+ private final List times;
+ private final DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
public ExecuteTimer()
{
diff --git a/Essentials/src/net/ess3/utils/FormatUtil.java b/Essentials/src/net/ess3/utils/FormatUtil.java
index 4cba2a71b..bbc690e79 100644
--- a/Essentials/src/net/ess3/utils/FormatUtil.java
+++ b/Essentials/src/net/ess3/utils/FormatUtil.java
@@ -13,15 +13,15 @@ import net.ess3.permissions.DotStarPermission;
public class FormatUtil
{
- static final transient Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])");
- static final transient Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)");
- static final transient Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");
- static final transient Pattern VANILLA_PATTERN = Pattern.compile("\u00a7+[0-9A-FK-ORa-fk-or]");
- static final transient Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]");
- static final transient Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])");
- static final transient Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]");
- static final transient Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]");
- static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
+ static final Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])");
+ static final Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)");
+ static final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");
+ static final Pattern VANILLA_PATTERN = Pattern.compile("\u00a7+[0-9A-FK-ORa-fk-or]");
+ static final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]");
+ static final Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])");
+ static final Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]");
+ static final Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]");
+ static final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
static String stripColor(final String input, final Pattern pattern)
diff --git a/Essentials/src/net/ess3/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java
index 5d2af4000..64fa71f78 100644
--- a/Essentials/src/net/ess3/utils/LocationUtil.java
+++ b/Essentials/src/net/ess3/utils/LocationUtil.java
@@ -69,7 +69,6 @@ public class LocationUtil
}
return block.getLocation();
}
-
public final static int RADIUS = 3;
public final static Vector3D[] VOLUME;
@@ -82,13 +81,11 @@ public class LocationUtil
this.y = y;
this.z = z;
}
-
public int x;
public int y;
public int z;
}
-
static
{
List pos = new ArrayList();
@@ -213,7 +210,7 @@ public class LocationUtil
}
if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId())) || (!AIR_MATERIALS.contains(
- world.getBlockAt(x, y + 1, z).getType().getId())))
+ world.getBlockAt(x, y + 1, z).getType().getId())))
{
return true;
}
diff --git a/Essentials/src/net/ess3/utils/Target.java b/Essentials/src/net/ess3/utils/Target.java
index 6e871a051..04fa17e1f 100644
--- a/Essentials/src/net/ess3/utils/Target.java
+++ b/Essentials/src/net/ess3/utils/Target.java
@@ -30,4 +30,3 @@ public class Target
return location;
}
}
-
diff --git a/Essentials/src/net/ess3/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java
index 0817448bd..6f93b0909 100644
--- a/Essentials/src/net/ess3/utils/Util.java
+++ b/Essentials/src/net/ess3/utils/Util.java
@@ -16,7 +16,6 @@ public final class Util
private Util()
{
}
-
private final static Pattern INVALIDFILECHARS = Pattern.compile("[^\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
@@ -82,7 +81,7 @@ public final class Util
public static ItemStack convertBlockToItem(final Block block)
{
final ItemStack is = new ItemStack(block.getType(), 1, block.getData());
-
+
final short durability = 0;
switch (is.getType())
@@ -215,5 +214,4 @@ public final class Util
}
return buf.toString();
}
-
}
diff --git a/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java
index ee72d36df..c1946c84f 100644
--- a/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java
+++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java
@@ -2,38 +2,26 @@ package net.ess3.utils.gnu.inet.encoding;
/**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
*
* Author: Oliver Hitz
*
* This file is part of GNU Libidn.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
+ * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
+ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
/**
- * This class offers static methods for encoding/decoding strings
- * using the Punycode algorithm.
- *
- * Note that this implementation only supports 16-bit Unicode code
- * points.
+ * This class offers static methods for encoding/decoding strings using the Punycode algorithm. Note that this implementation only supports 16-bit Unicode code points.
*/
/*
* Changes by snowleo:
@@ -124,7 +112,7 @@ public class Punycode
{
int q = delta;
- for (int k = BASE; ; k += BASE)
+ for (int k = BASE;; k += BASE)
{
int t;
if (k <= bias)
@@ -203,7 +191,7 @@ public class Punycode
int oldi = i;
int w = 1;
- for (int k = BASE; ; k += BASE)
+ for (int k = BASE;; k += BASE)
{
if (d == input.length())
{
diff --git a/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java
index 7e4da7d79..fb1f3d0ce 100644
--- a/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java
+++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java
@@ -2,30 +2,23 @@ package net.ess3.utils.gnu.inet.encoding;
/**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
*
* Author: Oliver Hitz
*
* This file is part of GNU Libidn.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General
+ * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
+ * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
/**
* Exception handling for Punycode class.
*/
diff --git a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java
index 9fdc87c9b..31b1ac991 100644
--- a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java
@@ -8,7 +8,7 @@ import java.util.Map;
public class ArrayListInput implements IText
{
- private final transient List lines = new ArrayList();
+ private final List lines = new ArrayList();
@Override
public List getLines()
@@ -27,5 +27,4 @@ public class ArrayListInput implements IText
{
return Collections.emptyMap();
}
-
}
diff --git a/Essentials/src/net/ess3/utils/textreader/HelpInput.java b/Essentials/src/net/ess3/utils/textreader/HelpInput.java
index e6510a2e3..44215c17f 100644
--- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java
@@ -18,9 +18,9 @@ public class HelpInput implements IText
private static final String DESCRIPTION = "description";
private static final String PERMISSION = "permission";
private static final String PERMISSIONS = "permissions";
- private final transient List lines = new ArrayList();
- private final transient List chapters = new ArrayList();
- private final transient Map bookmarks = new HashMap();
+ private final List lines = new ArrayList();
+ private final List chapters = new ArrayList();
+ private final Map bookmarks = new HashMap();
private final static Logger logger = Logger.getLogger("Minecraft");
public HelpInput(final IUser user, final String match, final IEssentials ess) throws IOException
@@ -56,8 +56,8 @@ public class HelpInput implements IText
try
{
if (!match.equalsIgnoreCase("") && (!pluginNameLow.contains(match)) && (!k.getKey().toLowerCase(Locale.ENGLISH).contains(
- match)) && (!(k.getValue().get(DESCRIPTION) instanceof String && ((String)k.getValue().get(DESCRIPTION)).toLowerCase(
- Locale.ENGLISH).contains(match))))
+ match)) && (!(k.getValue().get(DESCRIPTION) instanceof String && ((String)k.getValue().get(DESCRIPTION)).toLowerCase(
+ Locale.ENGLISH).contains(match))))
{
continue;
}
diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
index 22466e0ac..1194aa266 100644
--- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
+++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
@@ -17,9 +17,9 @@ import org.bukkit.plugin.Plugin;
public class KeywordReplacer implements IText
{
- private final transient IText input;
- private final transient List replaced;
- private final transient IEssentials ess;
+ private final IText input;
+ private final List replaced;
+ private final IEssentials ess;
public KeywordReplacer(final IText input, final CommandSender sender, final IEssentials ess)
{
@@ -34,15 +34,15 @@ public class KeywordReplacer implements IText
String displayName, ipAddress, balance, mails, world;
String worlds, online, unique, playerlist, date, time;
String worldTime12, worldTime24, worldDate, plugins;
- String userName, address, version; //TODO: unused?
+ String version;
if (sender instanceof IUser)
{
final IUser user = (IUser)sender;
final Player player = user.getPlayer();
displayName = player.getDisplayName();
- userName = player.getName();
+ String userName = player.getName(); //TODO: unused
ipAddress = player.getAddress() == null || player.getAddress().getAddress() == null ? "" : player.getAddress().getAddress().toString();
- address = player.getAddress() == null ? "" : player.getAddress().toString();
+ String address = player.getAddress() == null ? "" : player.getAddress().toString(); // TODO: unused
balance = FormatUtil.displayCurrency(user.getMoney(), ess);
mails = Integer.toString(user.getData().getMails() == null ? 0 : user.getData().getMails().size());
world = player.getLocation() == null || player.getLocation().getWorld() == null ? "" : player.getLocation().getWorld().getName();
diff --git a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java
index 03405df29..6ef3731c1 100644
--- a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java
@@ -8,7 +8,7 @@ import java.util.Map;
public class SimpleTextInput implements IText
{
- private final transient List lines = new ArrayList();
+ private final List lines = new ArrayList();
public SimpleTextInput(final String input)
{
@@ -32,5 +32,4 @@ public class SimpleTextInput implements IText
{
return Collections.emptyMap();
}
-
}
diff --git a/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java
index ea70010b6..0b850b509 100644
--- a/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java
+++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextPager.java
@@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender;
public class SimpleTextPager
{
- private final transient IText text;
+ private final IText text;
public SimpleTextPager(final IText text)
{
diff --git a/Essentials/src/net/ess3/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java
index ca38cd528..090afd948 100644
--- a/Essentials/src/net/ess3/utils/textreader/TextInput.java
+++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java
@@ -13,10 +13,10 @@ import org.bukkit.command.CommandSender;
public class TextInput implements IText
{
- private final transient List lines;
- private final transient List chapters;
- private final transient Map bookmarks;
- private final transient long lastChange;
+ private final List lines;
+ private final List chapters;
+ private final Map bookmarks;
+ private final long lastChange;
private final static HashMap> cache = new HashMap>();
public TextInput(final CommandSender sender, final String filename, final boolean createFile, final IEssentials ess) throws IOException
diff --git a/Essentials/src/net/ess3/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java
index 88f00125c..965bb0d2f 100644
--- a/Essentials/src/net/ess3/utils/textreader/TextPager.java
+++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java
@@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender;
public class TextPager
{
- private final transient IText text;
- private final transient boolean onePage;
+ private final IText text;
+ private final boolean onePage;
public TextPager(final IText text)
{
diff --git a/Essentials/test/net/ess3/EssentialsTest.java b/Essentials/test/net/ess3/EssentialsTest.java
index 0daa06abf..cedfa3cb6 100644
--- a/Essentials/test/net/ess3/EssentialsTest.java
+++ b/Essentials/test/net/ess3/EssentialsTest.java
@@ -23,12 +23,12 @@ import org.mockito.stubbing.Answer;
public abstract class EssentialsTest extends TestCase
{
- protected final transient Server server;
- protected final transient IPlugin plugin;
- protected final transient World world;
- protected final transient Logger logger;
- protected final transient Essentials ess;
- protected final transient List playerList;
+ protected final Server server;
+ protected final IPlugin plugin;
+ protected final World world;
+ protected final Logger logger;
+ protected final Essentials ess;
+ protected final List playerList;
public EssentialsTest(final String testName)
{
diff --git a/Essentials/test/net/ess3/StorageTest.java b/Essentials/test/net/ess3/StorageTest.java
index 4ca05d9a8..4c96a165b 100644
--- a/Essentials/test/net/ess3/StorageTest.java
+++ b/Essentials/test/net/ess3/StorageTest.java
@@ -155,28 +155,28 @@ public class StorageTest extends EssentialsTest
}
/*@Test
- public void testOldUserdata()
- {
- ExecuteTimer ext = new ExecuteTimer();
- ext.start();
- OfflinePlayer base1 = server.createPlayer("testPlayer1", ess);
- server.addPlayer(base1);
- ext.mark("fake user created");
- UserData user = (UserData)ess.getUserMap().getUser(base1);
- ext.mark("load empty user");
- for (int j = 0; j < 1; j++)
- {
- user.setHome("home", new Location(world, j, j, j));
- }
- ext.mark("change home 1 times");
- user.save();
- ext.mark("write user");
- user.save();
- ext.mark("write user (cached)");
- user.reloadConfig();
- ext.mark("reloaded file");
- user.reloadConfig();
- ext.mark("reloaded file (cached)");
- System.out.println(ext.end());
- }*/
+ public void testOldUserdata()
+ {
+ ExecuteTimer ext = new ExecuteTimer();
+ ext.start();
+ OfflinePlayer base1 = server.createPlayer("testPlayer1", ess);
+ server.addPlayer(base1);
+ ext.mark("fake user created");
+ UserData user = (UserData)ess.getUserMap().getUser(base1);
+ ext.mark("load empty user");
+ for (int j = 0; j < 1; j++)
+ {
+ user.setHome("home", new Location(world, j, j, j));
+ }
+ ext.mark("change home 1 times");
+ user.save();
+ ext.mark("write user");
+ user.save();
+ ext.mark("write user (cached)");
+ user.reloadConfig();
+ ext.mark("reloaded file");
+ user.reloadConfig();
+ ext.mark("reloaded file (cached)");
+ System.out.println(ext.end());
+ }*/
}
diff --git a/Essentials/test/net/ess3/UserTest.java b/Essentials/test/net/ess3/UserTest.java
index ba26e1c6e..f4c58ad44 100644
--- a/Essentials/test/net/ess3/UserTest.java
+++ b/Essentials/test/net/ess3/UserTest.java
@@ -21,49 +21,48 @@ public class UserTest extends EssentialsTest
}
/*public void testUpdate()
- {
- OfflinePlayer base1alt = server.createPlayer(base1.getName(), ess);
- assertEquals(base1alt, ess.getUserMap().getUser(base1alt).getBase());
- }
+ {
+ OfflinePlayer base1alt = server.createPlayer(base1.getName(), ess);
+ assertEquals(base1alt, ess.getUserMap().getUser(base1alt).getBase());
+ }
- public void testHome()
- {
- IUser user = ess.getUserMap().getUser(base1);
- Location loc = base1.getLocation();
- user.setHome();
- OfflinePlayer base2 = server.createPlayer(base1.getName(), ess);
- IUser user2 = ess.getUserMap().getUser(base2);
+ public void testHome()
+ {
+ IUser user = ess.getUserMap().getUser(base1);
+ Location loc = base1.getLocation();
+ user.setHome();
+ OfflinePlayer base2 = server.createPlayer(base1.getName(), ess);
+ IUser user2 = ess.getUserMap().getUser(base2);
- Location home = user2.getHome(loc);
- assertNotNull(home);
- assertEquals(loc.getWorld().getName(), home.getWorld().getName());
- assertEquals(loc.getX(), home.getX());
- assertEquals(loc.getY(), home.getY());
- assertEquals(loc.getZ(), home.getZ());
- assertEquals(loc.getYaw(), home.getYaw());
- assertEquals(loc.getPitch(), home.getPitch());
- }*/
+ Location home = user2.getHome(loc);
+ assertNotNull(home);
+ assertEquals(loc.getWorld().getName(), home.getWorld().getName());
+ assertEquals(loc.getX(), home.getX());
+ assertEquals(loc.getY(), home.getY());
+ assertEquals(loc.getZ(), home.getZ());
+ assertEquals(loc.getYaw(), home.getYaw());
+ assertEquals(loc.getPitch(), home.getPitch());
+ }*/
/*public void testMoney()
- {
- should("properly set, take, give, and get money");
- IUser user = ess.getUserMap().getUser(base1);
- double i;
- user.setMoney(i = 100.5);
- user.takeMoney(50);
- i -= 50;
- user.giveMoney(25);
- i += 25;
- assertEquals(user.getMoney(), i);
- }*/
+ {
+ should("properly set, take, give, and get money");
+ IUser user = ess.getUserMap().getUser(base1);
+ double i;
+ user.setMoney(i = 100.5);
+ user.takeMoney(50);
+ i -= 50;
+ user.giveMoney(25);
+ i += 25;
+ assertEquals(user.getMoney(), i);
+ }*/
/*public void testGetGroup()
- {
- should("return the default group");
- IUser user = ess.getUserMap().getUser(base1);
- //assertEquals(user.getGroup(), "default");
- }*/
-
+ {
+ should("return the default group");
+ IUser user = ess.getUserMap().getUser(base1);
+ //assertEquals(user.getGroup(), "default");
+ }*/
public void testNoop()
{
assertTrue(true);
diff --git a/Essentials/test/net/ess3/UtilTest.java b/Essentials/test/net/ess3/UtilTest.java
index 0364b68aa..bfa3f1e51 100644
--- a/Essentials/test/net/ess3/UtilTest.java
+++ b/Essentials/test/net/ess3/UtilTest.java
@@ -11,7 +11,6 @@ import net.ess3.utils.Util;
public class UtilTest extends EssentialsTest
{
-
public UtilTest(String name)
{
super(name);
diff --git a/Essentials2Compat/pom.xml b/Essentials2Compat/pom.xml
index 81dc96ac8..74222b99e 100644
--- a/Essentials2Compat/pom.xml
+++ b/Essentials2Compat/pom.xml
@@ -1,20 +1,20 @@
- 4.0.0
+ 4.0.0
-
- net.essentials3
- BuildAll
- 3.0-SNAPSHOT
- ../pom.xml
-
+
+ net.essentials3
+ BuildAll
+ 3.0-SNAPSHOT
+ ../pom.xml
+
- Essentials2Compat
-
-
- ${project.groupId}
- Essentials
- ${project.version}
-
-
+ Essentials2Compat
+
+
+ ${project.groupId}
+ Essentials
+ ${project.version}
+
+
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Economy.java b/Essentials2Compat/src/com/earth2me/essentials/Economy.java
index 15f0045ac..2943fcf67 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Economy.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Economy.java
@@ -14,7 +14,6 @@ public final class Economy
private Economy()
{
}
-
private static IEssentials ess;
private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
@@ -38,11 +37,10 @@ public final class Economy
/**
* Sets the balance of a user
*
- * @param name Name of the user
+ * @param name Name of the user
* @param balance The balance you want to set
* @throws UserDoesNotExistException If a user by that name does not exists
- * @throws net.ess3.api.NoLoanPermittedException
- * If the user is not allowed to have a negative balance
+ * @throws net.ess3.api.NoLoanPermittedException If the user is not allowed to have a negative balance
*/
public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
{
@@ -56,10 +54,10 @@ public final class Economy
/**
* Adds money to the balance of a user
*
- * @param name Name of the user
+ * @param name Name of the user
* @param amount The money you want to add
* @throws UserDoesNotExistException If a user by that name does not exists
- * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+ * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
*/
public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
{
@@ -70,10 +68,10 @@ public final class Economy
/**
* Substracts money from the balance of a user
*
- * @param name Name of the user
+ * @param name Name of the user
* @param amount The money you want to substract
* @throws UserDoesNotExistException If a user by that name does not exists
- * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+ * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
*/
public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
{
@@ -84,10 +82,10 @@ public final class Economy
/**
* Divides the balance of a user by a value
*
- * @param name Name of the user
+ * @param name Name of the user
* @param value The balance is divided by this value
* @throws UserDoesNotExistException If a user by that name does not exists
- * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+ * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
*/
public static void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
{
@@ -98,10 +96,10 @@ public final class Economy
/**
* Multiplies the balance of a user by a value
*
- * @param name Name of the user
+ * @param name Name of the user
* @param value The balance is multiplied by this value
* @throws UserDoesNotExistException If a user by that name does not exists
- * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+ * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
*/
public static void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
{
@@ -114,7 +112,7 @@ public final class Economy
*
* @param name Name of the user
* @throws UserDoesNotExistException If a user by that name does not exists
- * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+ * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
*/
public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException
{
@@ -126,7 +124,7 @@ public final class Economy
}
/**
- * @param name Name of the user
+ * @param name Name of the user
* @param amount The amount of money the user should have
* @return true, if the user has more or an equal amount of money
* @throws UserDoesNotExistException If a user by that name does not exists
@@ -137,7 +135,7 @@ public final class Economy
}
/**
- * @param name Name of the user
+ * @param name Name of the user
* @param amount The amount of money the user should have
* @return true, if the user has more money
* @throws UserDoesNotExistException If a user by that name does not exists
@@ -148,7 +146,7 @@ public final class Economy
}
/**
- * @param name Name of the user
+ * @param name Name of the user
* @param amount The amount of money the user should not have
* @return true, if the user has less money
* @throws UserDoesNotExistException If a user by that name does not exists
diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
index 073f45bf5..a76ebbe6c 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
@@ -29,9 +29,9 @@ import net.ess3.storage.StoredLocation;
public class EssentialsConf extends YamlConfiguration
{
private static final Logger LOGGER = Logger.getLogger("Minecraft");
- private transient File configFile;
- private transient String templateName = null;
- private transient Class resourceClass = EssentialsConf.class;
+ private File configFile;
+ private String templateName = null;
+ private Class resourceClass = EssentialsConf.class;
private static final Charset UTF8 = Charset.forName("UTF-8");
public EssentialsConf(final File configFile)
diff --git a/Essentials2Compat/src/com/earth2me/essentials/ISettings.java b/Essentials2Compat/src/com/earth2me/essentials/ISettings.java
index 93fbd20b3..dfd68f467 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/ISettings.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/ISettings.java
@@ -1,6 +1,5 @@
package com.earth2me.essentials;
-
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -24,7 +23,6 @@ public interface ISettings
long getBackupInterval();
//MessageFormat getChatFormat(String group);
-
int getChatRadius();
double getCommandCost(String label);
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
index a5f454916..bd8671c7b 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
@@ -16,9 +16,9 @@ import org.bukkit.inventory.ItemStack;
public final class Settings implements ISettings
{
- private final transient EssentialsConf config;
+ private final EssentialsConf config;
private final static Logger logger = Logger.getLogger("Minecraft");
- private final transient IEssentials ess;
+ private final IEssentials ess;
private boolean metricsEnabled = true;
public Settings(IEssentials ess, File file)
@@ -52,7 +52,6 @@ public final class Settings implements ISettings
{
return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3));
}
-
private int chatRadius = 0;
private int _getChatRadius()
@@ -89,7 +88,6 @@ public final class Settings implements ISettings
{
return config.getInt("starting-balance", 0);
}
-
private Set disabledCommands = new HashSet();
@Override
@@ -142,10 +140,8 @@ public final class Settings implements ISettings
}
return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false);
}
-
private ConfigurationSection commandCosts;
-
public ConfigurationSection _getCommandCosts()
{
if (config.isConfigurationSection("command-costs"))
@@ -178,7 +174,6 @@ public final class Settings implements ISettings
}
return 0.0;
}
-
private String nicknamePrefix = "~";
private String _getNicknamePrefix()
@@ -203,7 +198,6 @@ public final class Settings implements ISettings
{
return config.getDouble("heal-cooldown", 0);
}
-
private ConfigurationSection kits;
public ConfigurationSection _getKits()
@@ -244,7 +238,6 @@ public final class Settings implements ISettings
}
return null;
}
-
private ChatColor operatorColor = null;
@Override
@@ -318,31 +311,29 @@ public final class Settings implements ISettings
{
return config.getString("backup.command", null);
}
-
private Map chatFormats = Collections.synchronizedMap(new HashMap());
/*@Override //TODO: implement this
- public MessageFormat getChatFormat(String group)
- {
- MessageFormat mFormat = chatFormats.get(group);
- if (mFormat == null)
- {
- String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
- config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
- format = Util.replaceFormat(format);
- format = format.replace("{DISPLAYNAME}", "%1$s");
- format = format.replace("{GROUP}", "{0}");
- format = format.replace("{MESSAGE}", "%2$s");
- format = format.replace("{WORLDNAME}", "{1}");
- format = format.replace("{SHORTWORLDNAME}", "{2}");
- format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
- format = "§r".concat(format);
- mFormat = new MessageFormat(format);
- chatFormats.put(group, mFormat);
- }
- return mFormat;
- }*/
-
+ public MessageFormat getChatFormat(String group)
+ {
+ MessageFormat mFormat = chatFormats.get(group);
+ if (mFormat == null)
+ {
+ String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
+ config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
+ format = Util.replaceFormat(format);
+ format = format.replace("{DISPLAYNAME}", "%1$s");
+ format = format.replace("{GROUP}", "{0}");
+ format = format.replace("{MESSAGE}", "%2$s");
+ format = format.replace("{WORLDNAME}", "{1}");
+ format = format.replace("{SHORTWORLDNAME}", "{2}");
+ format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+ format = "§r".concat(format);
+ mFormat = new MessageFormat(format);
+ chatFormats.put(group, mFormat);
+ }
+ return mFormat;
+ }*/
public String getDefaultChatformat()
{
return config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}");
@@ -384,7 +375,6 @@ public final class Settings implements ISettings
return config.getBoolean("sort-list-by-groups", true);
}
-
public void reloadConfig()
{
config.load();
@@ -415,7 +405,6 @@ public final class Settings implements ISettings
warnOnBuildDisallow = _warnOnBuildDisallow();
mailsPerMinute = _getMailsPerMinute();
}
-
private List itemSpawnBl = new ArrayList();
@Override
@@ -451,7 +440,6 @@ public final class Settings implements ISettings
}
return epItemSpwn;
}
-
private List enabledSigns = new ArrayList();
private boolean signsEnabled = false;
@@ -490,7 +478,6 @@ public final class Settings implements ISettings
}
return newSigns;
}
-
private boolean warnOnBuildDisallow;
private boolean _warnOnBuildDisallow()
@@ -503,7 +490,6 @@ public final class Settings implements ISettings
{
return warnOnBuildDisallow;
}
-
private boolean debug = false;
private boolean configDebug = false;
@@ -596,7 +582,6 @@ public final class Settings implements ISettings
{
return config.getBoolean(configName, def);
}
-
private final static double MAXMONEY = 10000000000000.0;
@Override
@@ -609,7 +594,6 @@ public final class Settings implements ISettings
}
return max;
}
-
private final static double MINMONEY = -10000000000000.0;
@Override
@@ -644,7 +628,6 @@ public final class Settings implements ISettings
{
return config.getBoolean("remove-god-on-disconnect", false);
}
-
private boolean changeDisplayName = true;
private boolean _changeDisplayName()
@@ -657,7 +640,6 @@ public final class Settings implements ISettings
{
return changeDisplayName;
}
-
private boolean changePlayerListName = false;
private boolean _changePlayerListName()
@@ -676,7 +658,6 @@ public final class Settings implements ISettings
{
return config.getBoolean("use-bukkit-permissions", false);
}
-
private boolean prefixsuffixconfigured = false;
private boolean addprefixsuffix = false;
private boolean essentialsChatActive = false;
@@ -702,7 +683,6 @@ public final class Settings implements ISettings
{
return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive;
}
-
private boolean disablePrefix = false;
private boolean _disablePrefix()
@@ -715,7 +695,6 @@ public final class Settings implements ISettings
{
return disablePrefix;
}
-
private boolean disableSuffix = false;
private boolean _disableSuffix()
@@ -740,7 +719,6 @@ public final class Settings implements ISettings
{
return config.getLong("auto-afk-kick", -1);
}
-
private boolean getFreezeAfkPlayers;
@Override
@@ -753,7 +731,6 @@ public final class Settings implements ISettings
{
return config.getBoolean("freeze-afk-players", false);
}
-
private boolean cancelAfkOnMove;
@Override
@@ -772,7 +749,6 @@ public final class Settings implements ISettings
{
return config.getBoolean("death-messages", true);
}
-
private Set noGodWorlds = new HashSet();
@Override
@@ -804,7 +780,6 @@ public final class Settings implements ISettings
{
return config.getBoolean("world-home-permissions", false);
}
-
private boolean registerBackInListener;
@Override
@@ -817,7 +792,6 @@ public final class Settings implements ISettings
{
return config.getBoolean("register-back-in-listener", false);
}
-
private boolean disableItemPickupWhileAfk;
@Override
@@ -875,7 +849,6 @@ public final class Settings implements ISettings
{
this.metricsEnabled = metricsEnabled;
}
-
private boolean teleportInvulnerability;
@Override
@@ -894,7 +867,6 @@ public final class Settings implements ISettings
{
return teleportInvulnerability;
}
-
private long loginAttackDelay;
private long _getLoginAttackDelay()
@@ -907,7 +879,6 @@ public final class Settings implements ISettings
{
return loginAttackDelay;
}
-
private int signUsePerSecond;
private int _getSignUsePerSecond()
@@ -937,7 +908,6 @@ public final class Settings implements ISettings
double maxSpeed = config.getDouble("max-walk-speed", 0.8);
return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
}
-
private int mailsPerMinute;
private int _getMailsPerMinute()
diff --git a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
index 040fdd875..a34734cf9 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
@@ -134,7 +134,6 @@ class UpdateUserFiles
String realname = getPlayer(name);
return realname == null ? BROKENNAME : realname;
}
-
private final Map players = new HashMap();
private String getPlayer(String check)
diff --git a/Essentials2Compat/src/com/earth2me/essentials/UserData.java b/Essentials2Compat/src/com/earth2me/essentials/UserData.java
index fdd16c495..2dc8d2cec 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/UserData.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/UserData.java
@@ -12,11 +12,10 @@ import org.bukkit.inventory.ItemStack;
public class UserData
{
- protected final transient IEssentials ess;
+ protected final IEssentials ess;
private EssentialsConf config;
private final File folder;
-
protected UserData(IEssentials ess, File file)
{
this.ess = ess;
@@ -59,7 +58,6 @@ public class UserData
kitTimestamps = _getKitTimestamps();
nickname = _getNickname();
}
-
private double money;
private double _getMoney()
@@ -91,7 +89,6 @@ public class UserData
config.setProperty("money", value);
config.save();
}
-
private Map homes;
private Map _getHomes()
@@ -124,7 +121,6 @@ public class UserData
return config.getLocation("homes." + search, ess.getServer());
}
-
public List getHomes()
{
return new ArrayList(homes.keySet());
@@ -166,7 +162,6 @@ public class UserData
}
return false;
}
-
private String nickname;
public String _getNickname()
@@ -185,7 +180,6 @@ public class UserData
config.setProperty("nickname", nick);
config.save();
}
-
private List unlimited;
private List _getUnlimited()
@@ -216,7 +210,6 @@ public class UserData
config.setProperty("unlimited", unlimited);
config.save();
}
-
private Map powertools;
private Map _getPowertools()
@@ -270,7 +263,6 @@ public class UserData
{
return !powertools.isEmpty();
}
-
private StoredLocation lastLocation;
private StoredLocation _getLastLocation()
@@ -289,8 +281,6 @@ public class UserData
{
return lastLocation;
}
-
-
private long lastTeleportTimestamp;
private long _getLastTeleportTimestamp()
@@ -309,7 +299,6 @@ public class UserData
config.setProperty("timestamps.lastteleport", time);
config.save();
}
-
private long lastHealTimestamp;
private long _getLastHealTimestamp()
@@ -328,7 +317,6 @@ public class UserData
config.setProperty("timestamps.lastheal", time);
config.save();
}
-
private String jail;
private String _getJail()
@@ -355,7 +343,6 @@ public class UserData
}
config.save();
}
-
private List mails;
private List _getMails()
@@ -388,7 +375,6 @@ public class UserData
mails.add(mail);
setMails(mails);
}
-
private boolean teleportEnabled;
private boolean getTeleportEnabled()
@@ -421,7 +407,6 @@ public class UserData
setSocialSpyEnabled(ret);
return ret;
}
-
private List ignoredPlayers;
public List getIgnoredPlayers()
@@ -443,8 +428,6 @@ public class UserData
}
config.save();
}
-
-
private boolean godmode;
private boolean _getGodModeEnabled()
@@ -463,7 +446,6 @@ public class UserData
config.setProperty("godmode", set);
config.save();
}
-
private boolean muted;
public boolean getMuted()
@@ -482,7 +464,6 @@ public class UserData
config.setProperty("muted", set);
config.save();
}
-
private long muteTimeout;
private long _getMuteTimeout()
@@ -501,7 +482,6 @@ public class UserData
config.setProperty("timestamps.mute", time);
config.save();
}
-
private boolean jailed;
private boolean getJailed()
@@ -527,7 +507,6 @@ public class UserData
setJailed(ret);
return ret;
}
-
private long jailTimeout;
private long _getJailTimeout()
@@ -568,7 +547,6 @@ public class UserData
config.setProperty("ban.timeout", time);
config.save();
}
-
private long lastLogin;
private long _getLastLogin()
@@ -586,8 +564,6 @@ public class UserData
lastLogin = time;
config.setProperty("timestamps.login", time);
}
-
-
private long lastLogout;
private long _getLastLogout()
@@ -606,7 +582,6 @@ public class UserData
config.setProperty("timestamps.logout", time);
config.save();
}
-
private String lastLoginAddress;
private String _getLastLoginAddress()
@@ -624,7 +599,6 @@ public class UserData
lastLoginAddress = address;
config.setProperty("ipAddress", address);
}
-
private boolean afk;
private boolean getAfk()
@@ -650,7 +624,6 @@ public class UserData
setAfk(ret);
return ret;
}
-
private boolean newplayer; //TODO: unused variable?
private String geolocation;
@@ -678,7 +651,6 @@ public class UserData
}
config.save();
}
-
private boolean isSocialSpyEnabled;
private boolean _isSocialSpyEnabled()
@@ -697,7 +669,6 @@ public class UserData
config.setProperty("socialspy", status);
config.save();
}
-
private boolean isNPC;
private boolean _isNPC()
@@ -716,7 +687,6 @@ public class UserData
config.setProperty("npc", set);
config.save();
}
-
private boolean arePowerToolsEnabled;
public boolean arePowerToolsEnabled()
@@ -742,7 +712,6 @@ public class UserData
{
return config.getBoolean("powertoolsenabled", true);
}
-
private ConfigurationSection kitTimestamps;
private ConfigurationSection _getKitTimestamps()
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Util.java b/Essentials2Compat/src/com/earth2me/essentials/Util.java
index 0500df536..b6f051328 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Util.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Util.java
@@ -12,7 +12,6 @@ public class Util
private Util()
{
}
-
private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]");
private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
@@ -33,8 +32,6 @@ public class Util
{
return INVALIDCHARS.matcher(string).replaceAll("");
}
-
-
private static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
public static String formatAsCurrency(final double value)
diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml
index 0db30ef3b..b99f53c5d 100644
--- a/EssentialsAntiBuild/pom.xml
+++ b/EssentialsAntiBuild/pom.xml
@@ -1,20 +1,20 @@
- 4.0.0
+ 4.0.0
-
- net.essentials3
- BuildAll
- 3.0-SNAPSHOT
- ../pom.xml
-
+
+ net.essentials3
+ BuildAll
+ 3.0-SNAPSHOT
+ ../pom.xml
+
- EssentialsAntiBuild
-
-
- ${project.groupId}
- Essentials
- ${project.version}
-
-
+ EssentialsAntiBuild
+
+
+ ${project.groupId}
+ Essentials
+ ${project.version}
+
+
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java
index 2edb98da0..1e54f114a 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java
@@ -7,8 +7,8 @@ import org.bukkit.plugin.java.JavaPlugin;
public class EssentialsAntiBuild extends JavaPlugin implements IAntiBuild
{
- private transient EssentialsConnect ess = null;
- private transient AntiBuildHolder settings = null;
+ private EssentialsConnect ess = null;
+ private AntiBuildHolder settings = null;
@Override
public void onEnable()
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java
index 52d34c47a..6c5c30b81 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java
@@ -26,8 +26,8 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsAntiBuildListener implements Listener
{
- final private transient IAntiBuild antib;
- final private transient IEssentials ess;
+ final private IAntiBuild antib;
+ final private IEssentials ess;
public EssentialsAntiBuildListener(final IAntiBuild parent)
{
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java
index 40d760b66..a58f18dcc 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java
@@ -13,8 +13,8 @@ import org.bukkit.plugin.Plugin;
public class EssentialsConnect
{
private static final Logger LOGGER = Logger.getLogger("Minecraft");
- private final transient IEssentials ess;
- private final transient IAntiBuild antib;
+ private final IEssentials ess;
+ private final IAntiBuild antib;
public EssentialsConnect(Plugin essPlugin, Plugin essProtect)
{
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java b/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java
index 51e49c463..1cbd4df6e 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java
@@ -1,6 +1,5 @@
package net.ess3.antibuild;
-
import org.bukkit.plugin.Plugin;
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java b/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java
index 96cdf63ac..eb980a2b2 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java
@@ -19,7 +19,7 @@ public enum Permissions implements IPermission
private static final String defaultBase = "essentials.build.";
private final String permission;
private final PermissionDefault defaultPerm;
- private transient String parent = null;
+ private String parent = null;
private Permissions()
{
@@ -67,12 +67,10 @@ public enum Permissions implements IPermission
{
return PermissionFactory.checkPermission(sender, this);
}
-
public static MaterialDotStarPermission PLACEMENT = new MaterialDotStarPermission("essentials.build.place");
public static MaterialDotStarPermission BREAK = new MaterialDotStarPermission("essentials.build.break");
public static MaterialDotStarPermission INTERACT = new MaterialDotStarPermission("essentials.build.interact");
public static MaterialDotStarPermission CRAFT = new MaterialDotStarPermission("essentials.build.craft");
public static MaterialDotStarPermission PICKUP = new MaterialDotStarPermission("essentials.build.pickup");
public static MaterialDotStarPermission DROP = new MaterialDotStarPermission("essentials.build.drop");
-
}
diff --git a/EssentialsChat/pom.xml b/EssentialsChat/pom.xml
index e59886710..6be18a14c 100644
--- a/EssentialsChat/pom.xml
+++ b/EssentialsChat/pom.xml
@@ -1,20 +1,20 @@
- 4.0.0
+ 4.0.0
-
- net.essentials3
- BuildAll
- 3.0-SNAPSHOT
- ../pom.xml
-
+
+ net.essentials3
+ BuildAll
+ 3.0-SNAPSHOT
+ ../pom.xml
+
- EssentialsChat
-
-
- ${project.groupId}
- Essentials
- ${project.version}
-
-
+ EssentialsChat
+
+
+ ${project.groupId}
+ Essentials
+ ${project.version}
+
+
diff --git a/EssentialsChat/src/net/ess3/chat/ChatStore.java b/EssentialsChat/src/net/ess3/chat/ChatStore.java
index 4d696fb36..d099a3e04 100644
--- a/EssentialsChat/src/net/ess3/chat/ChatStore.java
+++ b/EssentialsChat/src/net/ess3/chat/ChatStore.java
@@ -7,9 +7,9 @@ import net.ess3.economy.Trade;
public class ChatStore
{
- private final transient IUser user;
- private final transient String type;
- private final transient Trade charge;
+ private final IUser user;
+ private final String type;
+ private final Trade charge;
public ChatStore(final IEssentials ess, final IUser user, final String type)
{
diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java
index e358cf9e1..15e2d3b8b 100644
--- a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java
+++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java
@@ -17,10 +17,10 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
public abstract class EssentialsChatPlayer implements Listener
{
- protected transient IEssentials ess;
+ protected IEssentials ess;
protected final static Logger LOGGER = Logger.getLogger("Minecraft");
- protected final transient Server server;
- protected final transient Map chatStorage;
+ protected final Server server;
+ protected final Map chatStorage;
public EssentialsChatPlayer(
final Server server, final IEssentials ess, final Map chatStorage)
@@ -83,9 +83,10 @@ public abstract class EssentialsChatPlayer implements Listener
{
event.setFormat(
format.format(
- new Object[]{
- group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH)
- }));
+ new Object[]
+ {
+ group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH)
+ }));
}
}
diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java
index b6b93c0bf..568657907 100644
--- a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java
+++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java
@@ -14,8 +14,8 @@ import org.bukkit.event.Listener;
public class EssentialsLocalChatEventListener implements Listener
{
- protected transient IEssentials ess;
- protected final transient Server server;
+ protected IEssentials ess;
+ protected final Server server;
public EssentialsLocalChatEventListener(final Server server, final IEssentials ess)
{
diff --git a/EssentialsExtra/pom.xml b/EssentialsExtra/pom.xml
index fc2f8e23f..0caa52250 100644
--- a/EssentialsExtra/pom.xml
+++ b/EssentialsExtra/pom.xml
@@ -1,20 +1,20 @@
- 4.0.0
+ 4.0.0
-
- net.essentials3
- BuildAll
- 3.0-SNAPSHOT
- ../pom.xml
-
+
+ net.essentials3
+ BuildAll
+ 3.0-SNAPSHOT
+ ../pom.xml
+
- EssentialsExtra
-
-
- ${project.groupId}
- Essentials
- ${project.version}
-
-
+ EssentialsExtra
+
+
+ ${project.groupId}
+ Essentials
+ ${project.version}
+
+
diff --git a/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java b/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java
index 05418e9d8..258b53bb5 100644
--- a/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java
+++ b/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java
@@ -14,6 +14,7 @@ public @interface AnnotatedCommand
String usage() default "";
- String[] aliases() default {
+ String[] aliases() default
+ {
};
}
diff --git a/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java b/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java
index 4445dbd11..90cfb85aa 100644
--- a/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java
+++ b/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java
@@ -68,8 +68,9 @@ public class EssentialsExtra extends JavaPlugin
}
}
}
- urls = new URL[]{
- commandDir.toURI().toURL()
+ urls = new URL[]
+ {
+ commandDir.toURI().toURL()
};
}
catch (Exception ex)
diff --git a/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java b/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java
index a6173a243..36ee400e0 100644
--- a/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java
+++ b/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java
@@ -1,6 +1,5 @@
package net.ess3.extra.commands;
-
import java.util.Random;
import net.ess3.api.IUser;
import net.ess3.commands.EssentialsCommand;
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
index c535ed4a0..07e68c3ee 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
@@ -9,8 +9,8 @@ import org.bukkit.plugin.Plugin;
public class ConfigHolder extends AsyncStorageObjectHolder
{
- private final transient Plugin geoip;
-
+ private final Plugin geoip;
+
public ConfigHolder(final IEssentials ess, final Plugin geoip)
{
super(ess, GeoIP.class, new File(geoip.getDataFolder(), "config.yml"));
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
index d899ed972..c305c024f 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
@@ -26,12 +26,12 @@ import org.bukkit.plugin.Plugin;
public class EssentialsGeoIPPlayerListener implements Listener, IReload
{
- private transient LookupService ls = null;
+ private LookupService ls = null;
private static final Logger LOGGER = Logger.getLogger("Minecraft");
- private transient File databaseFile;
- private final transient ConfigHolder config;
- private final transient IEssentials ess;
- private final transient Plugin geoip;
+ private File databaseFile;
+ private final ConfigHolder config;
+ private final IEssentials ess;
+ private final Plugin geoip;
public EssentialsGeoIPPlayerListener(final Plugin geoip, final IEssentials ess)
{
diff --git a/EssentialsGroupBridge/pom.xml b/EssentialsGroupBridge/pom.xml
index ef9144d1b..9be873ec1 100644
--- a/EssentialsGroupBridge/pom.xml
+++ b/EssentialsGroupBridge/pom.xml
@@ -1,20 +1,20 @@
- 4.0.0
+ 4.0.0
-
- net.essentials3
- BuildAll
- 3.0-SNAPSHOT
- ../pom.xml
-
+
+ net.essentials3
+ BuildAll
+ 3.0-SNAPSHOT
+ ../pom.xml
+
- EssentialsGroupBridge
-
-
- ${project.groupId}
- EssentialsGroupManager
- ${project.version}
-
-
+ EssentialsGroupBridge
+
+
+ ${project.groupId}
+ EssentialsGroupManager
+ ${project.version}
+
+
diff --git a/EssentialsGroupBridge/src/com/nijiko/permissions/Entry.java b/EssentialsGroupBridge/src/com/nijiko/permissions/Entry.java
index 913c7f51e..a0c369aca 100644
--- a/EssentialsGroupBridge/src/com/nijiko/permissions/Entry.java
+++ b/EssentialsGroupBridge/src/com/nijiko/permissions/Entry.java
@@ -1,5 +1,6 @@
package com.nijiko.permissions;
-public class Entry {
-
+
+public class Entry
+{
}
diff --git a/EssentialsGroupBridge/src/com/nijiko/permissions/Group.java b/EssentialsGroupBridge/src/com/nijiko/permissions/Group.java
index 0d070c207..aa5a39d3c 100644
--- a/EssentialsGroupBridge/src/com/nijiko/permissions/Group.java
+++ b/EssentialsGroupBridge/src/com/nijiko/permissions/Group.java
@@ -1,6 +1,6 @@
package com.nijiko.permissions;
-public class Group extends Entry {
-
+public class Group extends Entry
+{
}
\ No newline at end of file
diff --git a/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.java b/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.java
index 3b7181d03..f09da5d65 100644
--- a/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.java
+++ b/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.java
@@ -7,430 +7,508 @@ import java.util.Set;
import org.bukkit.entity.Player;
+
/**
- * Permissions 3.0
- * Copyright (C) 2011 Matt 'The Yeti' Burnett
- * Original Credit & Copyright (C) 2010 Nijikokun
+ * Permissions 3.0 Copyright (C) 2011 Matt 'The Yeti' Burnett Original Credit & Copyright (C)
+ * 2010 Nijikokun
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Permissions Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Permissions Public
+ * License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later
+ * version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Permissions Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Permissions Public License for more
+ * details.
*
- * You should have received a copy of the GNU Permissions Public License
- * along with this program. If not, see .
+ * You should have received a copy of the GNU Permissions Public License along with this program. If not, see
+ * .
*/
+public abstract class PermissionHandler
+{
+ //World config manipulation methods
+ /**
+ * Sets the default world that is loaded on startup.
+ *
+ * @param world World to load on startup
+ */
+ public abstract void setDefaultWorld(String world);
-public abstract class PermissionHandler {
- //World config manipulation methods
-
- /**
- * Sets the default world that is loaded on startup.
- * @param world World to load on startup
- */
- public abstract void setDefaultWorld(String world);
- /**
- * Check if world is loaded.
- * A world is considered as loaded if there exists a user/group storage for it or it mirrors another world.
- * @param world Target world
- * @return Whether the world is loaded.
- */
- public abstract boolean checkWorld(String world);
-
- /**
- * Attempts to load a world. If the world is already loaded, nothing happens.
- * @param world World to load
- * @return Whether world isn't already loaded
- * @throws Exception Any exception that may occur when loading the world.
- */
- public abstract boolean loadWorld(String world) throws Exception;
- /**
- * Forces a load of the world.
- * @param world World to load
- * @throws Exception Any exception that may occur when loading the world.
- */
- public abstract void forceLoadWorld(String world) throws Exception;
- /**
- * Returns a set of the names all loaded worlds.
- * A world is considered as loaded if there exists a user/group storage for it or it mirrors another world.
- * @return Set of the names all loaded worlds.
- */
- public abstract Set getWorlds();
- /**
- * Loads the default world and global permissions.
- * @throws Exception Any exception that may occur when loading the worlds.
- */
- public abstract void load() throws Exception;
- /**
- * Reloads all worlds
- */
- public abstract void reload();
- /**
- * Reloads the specified world
- * @param world Name of target world
- * @return False if world is not loaded, true otherwise
- */
- public abstract boolean reload(String world);
- /**
- * Forces all storages to save,
- */
- public abstract void saveAll();
- /**
- * This method forces a save of the specified world
- * @param world Name of target world
- */
- public abstract void save(String world);
- /**
- * Forces all storages to close.
- */
- public abstract void closeAll();
+ /**
+ * Check if world is loaded. A world is considered as loaded if there exists a user/group storage for it or it
+ * mirrors another world.
+ *
+ * @param world Target world
+ * @return Whether the world is loaded.
+ */
+ public abstract boolean checkWorld(String world);
- //Permission-checking methods
- /**
- * This is an alias for permission(Player, String).
- * @param player Target player
- * @param node Permission node
- * @return True if the player has the specified node, false otherwise
- */
- public abstract boolean has(Player player, String node);
- /**
- * This is an alias for permission(String, String, String).
- * @param worldName Target world (may be different from player's current world)
- * @param playerName Player's name
- * @param node Permission node
- * @return True if the player has the specified node, false otherwise
- */
- public abstract boolean has(String worldName, String playerName, String node);
- /**
- * This method checks if the player has the given permissions in his/her current world.
- * In other words, this calls permissions(player.getWorld().getName(), player.getName(), node).
- * @param player Target player
- * @param node Permission node
- * @return True if the player has the specified node, false otherwise
- */
- public abstract boolean permission(Player player, String node);
- /**
- * This method checks if the player has the given permissions in the given world.
- * @param worldName Target world (may be different from player's current world)
- * @param playerName Player's name
- * @param node Permission node
- * @return True if the player has the specified node, false otherwise
- */
- public abstract boolean permission(String worldName, String playerName, String node);
+ /**
+ * Attempts to load a world. If the world is already loaded, nothing happens.
+ *
+ * @param world World to load
+ * @return Whether world isn't already loaded
+ * @throws Exception Any exception that may occur when loading the world.
+ */
+ public abstract boolean loadWorld(String world) throws Exception;
- //Permission-manipulation methods
- /**
- * Adds the given permission to the targeted player.
- * @param world Target world (may be different from player's current world)
- * @param user Player's name
- * @param node Permission node
- */
- public abstract void addUserPermission(String world, String user, String node);
- /**
- * Removes the given permission from the targeted player.
- * @param world Target world (may be different from player's current world)
- * @param user Player's name
- * @param node Permission node
- */
- public abstract void removeUserPermission(String world, String user, String node);
- /**
- * Adds the given permission to the targeted group.
- * @param world Target world
- * @param user Group's name
- * @param node Permission node
- */
- public abstract void addGroupPermission(String world, String user, String node);
- /**
- * Removes the given permission from the targeted group.
- * @param world Target world
- * @param user Group's name
- * @param node Permission node
- */
- public abstract void removeGroupPermission(String world, String user, String node);
+ /**
+ * Forces a load of the world.
+ *
+ * @param world World to load
+ * @throws Exception Any exception that may occur when loading the world.
+ */
+ public abstract void forceLoadWorld(String world) throws Exception;
- //Chat, prefix, suffix, build methods
- /**
- * Retrieves the properly-capitalised version of the given group's name.
- * Returns an empty string if group does not exist.
- * @param world Group's world
- * @param group Group's name (any capitalisation)
- * @return Group's properly-capitalised name.
- */
- public abstract String getGroupProperName(String world, String group);
- /**
- * Gets the appropriate prefix for the user.
- * This method is a utility method for chat plugins to get the user's prefix
- * without having to look at every one of the user's ancestors.
- * Returns an empty string if user has no parent groups.
- * @param world Player's world
- * @param user Player's name
- * @return Player's prefix
- */
- public abstract String getUserPrefix(String world, String user);
- /**
- * Gets the appropriate suffix for the user.
- * This method is a utility method for chat plugins to get the user's suffix
- * without having to look at every one of the user's ancestors.
- * Returns an empty string if user has no parent groups.
- * @param world Player's world
- * @param user Player's name
- * @return Player's suffix
- */
- public abstract String getUserSuffix(String world, String user);
- /**
- * Gets the primary group of the user.
- * Returns the default group if user has no parent groups,
- * or null if there is no default group for that world.
- * @param world Player's world
- * @param user Player's name
- * @return Player's primary group
- */
- public abstract Group getPrimaryGroupObject(String world, String user);
- /**
- * Gets name of the primary group of the user.
- * Returns the name of the default group if user has no parent groups,
- * or "Default" if there is no default group for that world.
- * @param world Player's world
- * @param user Player's name
- * @return Name of player's primary group
- */
- public abstract String getPrimaryGroup(String world, String user);
- /**
- * Check if user can build.
- * @param world Player's world
- * @param user Player's name
- * @return Whether the user can build
- */
- public abstract boolean canUserBuild(String world, String user);
-
- /**
- * Retrieves group's raw prefix, inheritance not included.
- * Will return an empty string if no prefix is defined for the group.
- * @param world Group's world
- * @param group Group's name
- * @return The prefix defined for the group, empty string if prefix is not defined.
- */
- public abstract String getGroupRawPrefix(String world, String group);
- /**
- * Retrieves group's raw suffix, inheritance not included.
- * Will return an empty string if no suffix is defined for the group.
- * @param world Group's world
- * @param group Group's name
- * @return The suffix defined for the group, empty string if suffix is not defined.
- */
- public abstract String getGroupRawSuffix(String world, String group);
- /**
- * Retrieves group's build setting, inheritance not included.
- * @param world Group's world
- * @param group Group's name
- * @return Returns group's build setting.
- */
- public abstract boolean canGroupRawBuild(String world, String group);
+ /**
+ * Returns a set of the names all loaded worlds. A world is considered as loaded if there exists a user/group
+ * storage for it or it mirrors another world.
+ *
+ * @return Set of the names all loaded worlds.
+ */
+ public abstract Set getWorlds();
- //Entry methods
- /**
- * Returns the user object defined by the given world and name.
- * This method attempts to create the object if it does not exist.
- * @param world User's world
- * @param name User's name
- * @return User object
- * @throws Exception An exception when creating the user object
- */
- public abstract User safeGetUser(String world, String name) throws Exception;
- /**
- * Returns the group object defined by the given world and name.
- * This method attempts to create the object if it does not exist.
- * @param world Group's world
- * @param name Group's name
- * @return Group object
- * @throws Exception An exception when creating the group object
- */
- public abstract Group safeGetGroup(String world, String name) throws Exception;
- /**
- * Returns the user object defined by the given world and name.
- * This method will return null if the object does not exist.
- * @param world User's world
- * @param name User's name
- * @return User object, or null if it doesn't exist
- */
- public abstract User getUserObject(String world, String name);
- /**
- * Returns the group object defined by the given world and name.
- * This method will return null if the object does not exist.
- * @param world Group's world
- * @param name Group's name
- * @return Group object, or null if it doesn't exist
- */
- public abstract Group getGroupObject(String world, String name);
+ /**
+ * Loads the default world and global permissions.
+ *
+ * @throws Exception Any exception that may occur when loading the worlds.
+ */
+ public abstract void load() throws Exception;
- /**
- * Returns the group object representing the default group of the given world.
- * This method will return null if the object does not exist or the world has no default group.
- * @param world Target world
- * @return Group object representing default world, or null if it doesn't exist or is not defined.
- */
- public abstract Group getDefaultGroup(String world);
- /**
- * Returns all the user objects in the world.
- * Will return null if world does not exist.
- * @param world Target world
- * @return Collection of all user objects belonging to the world.
- */
- public abstract Collection getUsers(String world);
- /**
- * Returns all the group objects in the world.
- * Will return null if world does not exist.
- * @param world Target world
- * @return Collection of all group objects belonging to the world.
- */
- public abstract Collection getGroups(String world);
+ /**
+ * Reloads all worlds
+ */
+ public abstract void reload();
- //Parent-related methods
- public abstract Set getTracks(String world);
- /**
- * Checks if user is in specified group. Includes inherited groups.
- * @param world World of both the user and the group
- * @param user User's name
- * @param group Parent group's name
- * @return Whether user is a child of the specified group
- */
- public abstract boolean inGroup(String world, String user, String group);
- /**
- * Checks if user is in specified group. Includes inherited groups.
- * @param world User's world
- * @param user User's name
- * @param groupWorld Parent group's world
- * @param group Parent group's name
- * @return Whether user is a child of the specified group
- */
- public abstract boolean inGroup(String world, String user, String groupWorld, String group);
- /**
- * Checks if user is in specified group, not counting inherited parents.
- * @param world World of both the user and the group
- * @param user User's name
- * @param group Parent group's name
- * @return Whether user is a child of the specified group
- */
- public abstract boolean inSingleGroup(String world, String user, String group);
- /**
- * Checks if user is in specified group, not counting inherited parents.
- * @param world User's world
- * @param user User's name
- * @param groupWorld Parent group's world
- * @param group Parent group's name
- * @return Whether user is a child of the specified group
- */
- public abstract boolean inSingleGroup(String world, String user, String groupWorld, String group);
- /**
- * Gets a array of the names of all parent groups in the same world.
- * @param world Target user's world
- * @param name Target user's name
- * @return An array containing the names of all parent groups (including ancestors) that are in the same world
- */
- public abstract String[] getGroups(String world, String name);
- /**
- * Gets a map of world name to all parent groups of the target user in that world.
- * @param world Target user's world
- * @param name Target user's name
- * @return Map of world name to set of groups that the user inherits from in the world.
- */
- public abstract Map> getAllGroups(String world, String name);
+ /**
+ * Reloads the specified world
+ *
+ * @param world Name of target world
+ * @return False if world is not loaded, true otherwise
+ */
+ public abstract boolean reload(String world);
- //Weight-related methods
- /**
- * Compare the weights of two users.
- * This method is for plugin devs to compare whether a user can do an action to another user.
- * For example, SlapPlugin can compare the weights of two users when one of them wants to /slap the other.
- * It can decide whether to allow the slap using the result of this function.
- * @param firstWorld First user's world
- * @param first First user's name
- * @param secondWorld Second user's world
- * @param second Second user's name
- * @return -1 if firstWeight < secondWeight, 0 if firstWeight == secondWeight, 1 if firstWeight > secondWeight
- */
- public abstract int compareWeights(String firstWorld, String first, String secondWorld, String second);
- /**
- * Alias for compareWeights(world, first, world, second).
- * @param world World
- * @param first First user's name
- * @param second Second user's name
- * @return -1 if firstWeight < secondWeight, 0 if firstWeight == secondWeight, 1 if firstWeight > secondWeight
- */
- public abstract int compareWeights(String world, String first, String second);
-
- //Data-related methods
- public abstract String getRawInfoString(String world, String entryName, String path,boolean isGroup);
-
- public abstract Integer getRawInfoInteger(String world, String entryName, String path, boolean isGroup);
-
- public abstract Double getRawInfoDouble(String world, String entryName, String path, boolean isGroup);
-
- public abstract Boolean getRawInfoBoolean(String world, String entryName, String path, boolean isGroup);
+ /**
+ * Forces all storages to save,
+ */
+ public abstract void saveAll();
+ /**
+ * This method forces a save of the specified world
+ *
+ * @param world Name of target world
+ */
+ public abstract void save(String world);
- public abstract String getInfoString(String world, String entryName, String path,boolean isGroup);
- public abstract String getInfoString(String world, String entryName, String path, boolean isGroup, Comparator comparator);
-
- public abstract Integer getInfoInteger(String world, String entryName, String path, boolean isGroup);
- public abstract Integer getInfoInteger(String world, String entryName, String path, boolean isGroup, Comparator comparator);
-
- public abstract Double getInfoDouble(String world, String entryName, String path, boolean isGroup);
- public abstract Double getInfoDouble(String world, String entryName, String path, boolean isGroup, Comparator comparator);
-
- public abstract Boolean getInfoBoolean(String world, String entryName, String path, boolean isGroup);
- public abstract Boolean getInfoBoolean(String world, String entryName, String path, boolean isGroup, Comparator comparator);
-
-
- public abstract void addUserInfo(String world, String name, String path, Object data);
- public abstract void removeUserInfo(String world, String name, String path);
- public abstract void addGroupInfo(String world, String name, String path, Object data);
- public abstract void removeGroupInfo(String world, String name, String path);
-
- //Legacy methods
- @Deprecated
- public abstract String getGroupPermissionString(String world, String group, String path);
- @Deprecated
- public abstract int getGroupPermissionInteger(String world, String group, String path);
- @Deprecated
- public abstract boolean getGroupPermissionBoolean(String world, String group, String path);
- @Deprecated
- public abstract double getGroupPermissionDouble(String world, String group, String path);
-
- @Deprecated
- public abstract String getUserPermissionString(String world, String group, String path);
- @Deprecated
- public abstract int getUserPermissionInteger(String world, String group, String path);
- @Deprecated
- public abstract boolean getUserPermissionBoolean(String world, String group, String path);
- @Deprecated
- public abstract double getUserPermissionDouble(String world, String group, String path);
-
- @Deprecated
- public abstract String getPermissionString(String world, String group, String path);
- @Deprecated
- public abstract int getPermissionInteger(String world, String group, String path);
- @Deprecated
- public abstract boolean getPermissionBoolean(String world, String group, String path);
- @Deprecated
- public abstract double getPermissionDouble(String world, String group, String path);
-
+ /**
+ * Forces all storages to close.
+ */
+ public abstract void closeAll();
- @Deprecated
- public abstract String getGroup(String world, String group);
+ //Permission-checking methods
+ /**
+ * This is an alias for permission(Player, String).
+ *
+ * @param player Target player
+ * @param node Permission node
+ * @return True if the player has the specified node, false otherwise
+ */
+ public abstract boolean has(Player player, String node);
- @Deprecated
- public abstract String getGroupPrefix(String world, String group);
- @Deprecated
- public abstract String getGroupSuffix(String world, String group);
- @Deprecated
- public abstract boolean canGroupBuild(String world, String group);
-
- //Cache methods are no longer available
+ /**
+ * This is an alias for permission(String, String, String).
+ *
+ * @param worldName Target world (may be different from player's current world)
+ * @param playerName Player's name
+ * @param node Permission node
+ * @return True if the player has the specified node, false otherwise
+ */
+ public abstract boolean has(String worldName, String playerName, String node);
+
+ /**
+ * This method checks if the player has the given permissions in his/her current world. In other words, this calls
+ * permissions(player.getWorld().getName(), player.getName(), node).
+ *
+ * @param player Target player
+ * @param node Permission node
+ * @return True if the player has the specified node, false otherwise
+ */
+ public abstract boolean permission(Player player, String node);
+
+ /**
+ * This method checks if the player has the given permissions in the given world.
+ *
+ * @param worldName Target world (may be different from player's current world)
+ * @param playerName Player's name
+ * @param node Permission node
+ * @return True if the player has the specified node, false otherwise
+ */
+ public abstract boolean permission(String worldName, String playerName, String node);
+
+ //Permission-manipulation methods
+ /**
+ * Adds the given permission to the targeted player.
+ *
+ * @param world Target world (may be different from player's current world)
+ * @param user Player's name
+ * @param node Permission node
+ */
+ public abstract void addUserPermission(String world, String user, String node);
+
+ /**
+ * Removes the given permission from the targeted player.
+ *
+ * @param world Target world (may be different from player's current world)
+ * @param user Player's name
+ * @param node Permission node
+ */
+ public abstract void removeUserPermission(String world, String user, String node);
+
+ /**
+ * Adds the given permission to the targeted group.
+ *
+ * @param world Target world
+ * @param user Group's name
+ * @param node Permission node
+ */
+ public abstract void addGroupPermission(String world, String user, String node);
+
+ /**
+ * Removes the given permission from the targeted group.
+ *
+ * @param world Target world
+ * @param user Group's name
+ * @param node Permission node
+ */
+ public abstract void removeGroupPermission(String world, String user, String node);
+
+ //Chat, prefix, suffix, build methods
+ /**
+ * Retrieves the properly-capitalised version of the given group's name. Returns an empty string if group does not
+ * exist.
+ *
+ * @param world Group's world
+ * @param group Group's name (any capitalisation)
+ * @return Group's properly-capitalised name.
+ */
+ public abstract String getGroupProperName(String world, String group);
+
+ /**
+ * Gets the appropriate prefix for the user. This method is a utility method for chat plugins to get the user's
+ * prefix without having to look at every one of the user's ancestors. Returns an empty string if user has no parent
+ * groups.
+ *
+ * @param world Player's world
+ * @param user Player's name
+ * @return Player's prefix
+ */
+ public abstract String getUserPrefix(String world, String user);
+
+ /**
+ * Gets the appropriate suffix for the user. This method is a utility method for chat plugins to get the user's
+ * suffix without having to look at every one of the user's ancestors. Returns an empty string if user has no parent
+ * groups.
+ *
+ * @param world Player's world
+ * @param user Player's name
+ * @return Player's suffix
+ */
+ public abstract String getUserSuffix(String world, String user);
+
+ /**
+ * Gets the primary group of the user. Returns the default group if user has no parent groups, or null if there is
+ * no default group for that world.
+ *
+ * @param world Player's world
+ * @param user Player's name
+ * @return Player's primary group
+ */
+ public abstract Group getPrimaryGroupObject(String world, String user);
+
+ /**
+ * Gets name of the primary group of the user. Returns the name of the default group if user has no parent groups,
+ * or "Default" if there is no default group for that world.
+ *
+ * @param world Player's world
+ * @param user Player's name
+ * @return Name of player's primary group
+ */
+ public abstract String getPrimaryGroup(String world, String user);
+
+ /**
+ * Check if user can build.
+ *
+ * @param world Player's world
+ * @param user Player's name
+ * @return Whether the user can build
+ */
+ public abstract boolean canUserBuild(String world, String user);
+
+ /**
+ * Retrieves group's raw prefix, inheritance not included. Will return an empty string if no prefix is defined for
+ * the group.
+ *
+ * @param world Group's world
+ * @param group Group's name
+ * @return The prefix defined for the group, empty string if prefix is not defined.
+ */
+ public abstract String getGroupRawPrefix(String world, String group);
+
+ /**
+ * Retrieves group's raw suffix, inheritance not included. Will return an empty string if no suffix is defined for
+ * the group.
+ *
+ * @param world Group's world
+ * @param group Group's name
+ * @return The suffix defined for the group, empty string if suffix is not defined.
+ */
+ public abstract String getGroupRawSuffix(String world, String group);
+
+ /**
+ * Retrieves group's build setting, inheritance not included.
+ *
+ * @param world Group's world
+ * @param group Group's name
+ * @return Returns group's build setting.
+ */
+ public abstract boolean canGroupRawBuild(String world, String group);
+
+ //Entry methods
+ /**
+ * Returns the user object defined by the given world and name. This method attempts to create the object if it does
+ * not exist.
+ *
+ * @param world User's world
+ * @param name User's name
+ * @return User object
+ * @throws Exception An exception when creating the user object
+ */
+ public abstract User safeGetUser(String world, String name) throws Exception;
+
+ /**
+ * Returns the group object defined by the given world and name. This method attempts to create the object if it
+ * does not exist.
+ *
+ * @param world Group's world
+ * @param name Group's name
+ * @return Group object
+ * @throws Exception An exception when creating the group object
+ */
+ public abstract Group safeGetGroup(String world, String name) throws Exception;
+
+ /**
+ * Returns the user object defined by the given world and name. This method will return null if the object does not
+ * exist.
+ *
+ * @param world User's world
+ * @param name User's name
+ * @return User object, or null if it doesn't exist
+ */
+ public abstract User getUserObject(String world, String name);
+
+ /**
+ * Returns the group object defined by the given world and name. This method will return null if the object does not
+ * exist.
+ *
+ * @param world Group's world
+ * @param name Group's name
+ * @return Group object, or null if it doesn't exist
+ */
+ public abstract Group getGroupObject(String world, String name);
+
+ /**
+ * Returns the group object representing the default group of the given world. This method will return null if the
+ * object does not exist or the world has no default group.
+ *
+ * @param world Target world
+ * @return Group object representing default world, or null if it doesn't exist or is not defined.
+ */
+ public abstract Group getDefaultGroup(String world);
+
+ /**
+ * Returns all the user objects in the world. Will return null if world does not exist.
+ *
+ * @param world Target world
+ * @return Collection of all user objects belonging to the world.
+ */
+ public abstract Collection getUsers(String world);
+
+ /**
+ * Returns all the group objects in the world. Will return null if world does not exist.
+ *
+ * @param world Target world
+ * @return Collection of all group objects belonging to the world.
+ */
+ public abstract Collection getGroups(String world);
+
+ //Parent-related methods
+ public abstract Set getTracks(String world);
+
+ /**
+ * Checks if user is in specified group. Includes inherited groups.
+ *
+ * @param world World of both the user and the group
+ * @param user User's name
+ * @param group Parent group's name
+ * @return Whether user is a child of the specified group
+ */
+ public abstract boolean inGroup(String world, String user, String group);
+
+ /**
+ * Checks if user is in specified group. Includes inherited groups.
+ *
+ * @param world User's world
+ * @param user User's name
+ * @param groupWorld Parent group's world
+ * @param group Parent group's name
+ * @return Whether user is a child of the specified group
+ */
+ public abstract boolean inGroup(String world, String user, String groupWorld, String group);
+
+ /**
+ * Checks if user is in specified group, not counting inherited parents.
+ *
+ * @param world World of both the user and the group
+ * @param user User's name
+ * @param group Parent group's name
+ * @return Whether user is a child of the specified group
+ */
+ public abstract boolean inSingleGroup(String world, String user, String group);
+
+ /**
+ * Checks if user is in specified group, not counting inherited parents.
+ *
+ * @param world User's world
+ * @param user User's name
+ * @param groupWorld Parent group's world
+ * @param group Parent group's name
+ * @return Whether user is a child of the specified group
+ */
+ public abstract boolean inSingleGroup(String world, String user, String groupWorld, String group);
+
+ /**
+ * Gets a array of the names of all parent groups in the same world.
+ *
+ * @param world Target user's world
+ * @param name Target user's name
+ * @return An array containing the names of all parent groups (including ancestors) that are in the same world
+ */
+ public abstract String[] getGroups(String world, String name);
+
+ /**
+ * Gets a map of world name to all parent groups of the target user in that world.
+ *
+ * @param world Target user's world
+ * @param name Target user's name
+ * @return Map of world name to set of groups that the user inherits from in the world.
+ */
+ public abstract Map> getAllGroups(String world, String name);
+
+ //Weight-related methods
+ /**
+ * Compare the weights of two users. This method is for plugin devs to compare whether a user can do an action to
+ * another user. For example, SlapPlugin can compare the weights of two users when one of them wants to /slap the
+ * other. It can decide whether to allow the slap using the result of this function.
+ *
+ * @param firstWorld First user's world
+ * @param first First user's name
+ * @param secondWorld Second user's world
+ * @param second Second user's name
+ * @return -1 if firstWeight < secondWeight, 0 if firstWeight == secondWeight, 1 if firstWeight > secondWeight
+ */
+ public abstract int compareWeights(String firstWorld, String first, String secondWorld, String second);
+
+ /**
+ * Alias for compareWeights(world, first, world, second).
+ *
+ * @param world World
+ * @param first First user's name
+ * @param second Second user's name
+ * @return -1 if firstWeight < secondWeight, 0 if firstWeight == secondWeight, 1 if firstWeight > secondWeight
+ */
+ public abstract int compareWeights(String world, String first, String second);
+
+ //Data-related methods
+ public abstract String getRawInfoString(String world, String entryName, String path, boolean isGroup);
+
+ public abstract Integer getRawInfoInteger(String world, String entryName, String path, boolean isGroup);
+
+ public abstract Double getRawInfoDouble(String world, String entryName, String path, boolean isGroup);
+
+ public abstract Boolean getRawInfoBoolean(String world, String entryName, String path, boolean isGroup);
+
+ public abstract String getInfoString(String world, String entryName, String path, boolean isGroup);
+
+ public abstract String getInfoString(String world, String entryName, String path, boolean isGroup, Comparator comparator);
+
+ public abstract Integer getInfoInteger(String world, String entryName, String path, boolean isGroup);
+
+ public abstract Integer getInfoInteger(String world, String entryName, String path, boolean isGroup, Comparator comparator);
+
+ public abstract Double getInfoDouble(String world, String entryName, String path, boolean isGroup);
+
+ public abstract Double getInfoDouble(String world, String entryName, String path, boolean isGroup, Comparator comparator);
+
+ public abstract Boolean getInfoBoolean(String world, String entryName, String path, boolean isGroup);
+
+ public abstract Boolean getInfoBoolean(String world, String entryName, String path, boolean isGroup, Comparator comparator);
+
+ public abstract void addUserInfo(String world, String name, String path, Object data);
+
+ public abstract void removeUserInfo(String world, String name, String path);
+
+ public abstract void addGroupInfo(String world, String name, String path, Object data);
+
+ public abstract void removeGroupInfo(String world, String name, String path);
+
+ //Legacy methods
+ @Deprecated
+ public abstract String getGroupPermissionString(String world, String group, String path);
+
+ @Deprecated
+ public abstract int getGroupPermissionInteger(String world, String group, String path);
+
+ @Deprecated
+ public abstract boolean getGroupPermissionBoolean(String world, String group, String path);
+
+ @Deprecated
+ public abstract double getGroupPermissionDouble(String world, String group, String path);
+
+ @Deprecated
+ public abstract String getUserPermissionString(String world, String group, String path);
+
+ @Deprecated
+ public abstract int getUserPermissionInteger(String world, String group, String path);
+
+ @Deprecated
+ public abstract boolean getUserPermissionBoolean(String world, String group, String path);
+
+ @Deprecated
+ public abstract double getUserPermissionDouble(String world, String group, String path);
+
+ @Deprecated
+ public abstract String getPermissionString(String world, String group, String path);
+
+ @Deprecated
+ public abstract int getPermissionInteger(String world, String group, String path);
+
+ @Deprecated
+ public abstract boolean getPermissionBoolean(String world, String group, String path);
+
+ @Deprecated
+ public abstract double getPermissionDouble(String world, String group, String path);
+
+ @Deprecated
+ public abstract String getGroup(String world, String group);
+
+ @Deprecated
+ public abstract String getGroupPrefix(String world, String group);
+
+ @Deprecated
+ public abstract String getGroupSuffix(String world, String group);
+
+ @Deprecated
+ public abstract boolean canGroupBuild(String world, String group);
+ //Cache methods are no longer available
// @Deprecated
// public void setCache(String world, Map Cache) {
// }
@@ -454,5 +532,4 @@ public abstract class PermissionHandler {
// @Deprecated
// public void clearAllCache(){
// }
-
}
\ No newline at end of file
diff --git a/EssentialsGroupBridge/src/com/nijiko/permissions/User.java b/EssentialsGroupBridge/src/com/nijiko/permissions/User.java
index 9e93d850a..3bdea431f 100644
--- a/EssentialsGroupBridge/src/com/nijiko/permissions/User.java
+++ b/EssentialsGroupBridge/src/com/nijiko/permissions/User.java
@@ -1,5 +1,6 @@
package com.nijiko.permissions;
-public class User extends Entry {
-
+
+public class User extends Entry
+{
}
diff --git a/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/OverrideListener.java b/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/OverrideListener.java
index 762e42b49..9260c9859 100644
--- a/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/OverrideListener.java
+++ b/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/OverrideListener.java
@@ -6,20 +6,21 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.Listener;
-
-public class OverrideListener implements Listener {
-
+public class OverrideListener implements Listener
+{
Permissions permClass;
-
- OverrideListener(Permissions instance) {
+
+ OverrideListener(Permissions instance)
+ {
this.permClass = instance;
}
-
+
@EventHandler(priority = EventPriority.NORMAL)
- public void onPluginEnable(PluginEnableEvent event) {
- if (event.getPlugin().getDescription().getName().equals("GroupManager")) {
- permClass.setGM(event.getPlugin());
- }
- }
-
+ public void onPluginEnable(PluginEnableEvent event)
+ {
+ if (event.getPlugin().getDescription().getName().equals("GroupManager"))
+ {
+ permClass.setGM(event.getPlugin());
+ }
+ }
}
\ No newline at end of file
diff --git a/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java b/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java
index 99fd18ce8..7115bb04c 100644
--- a/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java
+++ b/EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java
@@ -8,68 +8,80 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
-public class Permissions extends JavaPlugin {
- public static final Logger log = Logger.getLogger("Fake Permissions");
- public static String name = "Permissions";
- public static String codename = "Hacked Permissions by AnjoCaido";
- public static String version = "2.0";
- public static PermissionHandler Security = null;
+public class Permissions extends JavaPlugin
+{
+ public static final Logger log = Logger.getLogger("Fake Permissions");
+ public static String name = "Permissions";
+ public static String codename = "Hacked Permissions by AnjoCaido";
+ public static String version = "2.0";
+ public static PermissionHandler Security = null;
- @Override
- public void onDisable() {
- PluginDescriptionFile pdfFile = this.getDescription();
- System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!");
- }
+ @Override
+ public void onDisable()
+ {
+ PluginDescriptionFile pdfFile = this.getDescription();
+ System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!");
+ }
- @Override
- public void onEnable() {
- PluginDescriptionFile pdfFile = this.getDescription();
+ @Override
+ public void onEnable()
+ {
+ PluginDescriptionFile pdfFile = this.getDescription();
- if (Security == null) {
- //make sure we have only one instance
- Security = new NijikoPermissionsProxy(null);
- }
+ if (Security == null)
+ {
+ //make sure we have only one instance
+ Security = new NijikoPermissionsProxy(null);
+ }
- Plugin p = (this.getServer() == null) ? null : this.getServer().getPluginManager().getPlugin("GroupManager");
- if (p != null) {
- if (p.isEnabled()) {
- setGM(p);
- } else {
- if (this.getServer() != null) {
- this.getServer().getPluginManager().registerEvents(new OverrideListener(this), this);
- }
- }
- } else {
- System.err.println("OOOPS! Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " couldn't find GroupManager!");
- this.getPluginLoader().disablePlugin(this);
- }
+ Plugin p = (this.getServer() == null) ? null : this.getServer().getPluginManager().getPlugin("GroupManager");
+ if (p != null)
+ {
+ if (p.isEnabled())
+ {
+ setGM(p);
+ }
+ else
+ {
+ if (this.getServer() != null)
+ {
+ this.getServer().getPluginManager().registerEvents(new OverrideListener(this), this);
+ }
+ }
+ }
+ else
+ {
+ System.err.println("OOOPS! Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " couldn't find GroupManager!");
+ this.getPluginLoader().disablePlugin(this);
+ }
- if (pdfFile != null) {
- System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
- }
- }
+ if (pdfFile != null)
+ {
+ System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
+ }
+ }
- public void setGM(final Plugin p) {
- //GroupManager groupManager = (GroupManager) p;
- ((NijikoPermissionsProxy) Security).setGM(p);
- }
+ public void setGM(final Plugin p)
+ {
+ //GroupManager groupManager = (GroupManager) p;
+ ((NijikoPermissionsProxy)Security).setGM(p);
+ }
- public PermissionHandler getHandler() {
- if (Security == null) {
- Security = new NijikoPermissionsProxy(null);
- }
- return Security;
- }
+ public PermissionHandler getHandler()
+ {
+ if (Security == null)
+ {
+ Security = new NijikoPermissionsProxy(null);
+ }
+ return Security;
+ }
- public void setupPermissions() {
- if (Security == null) {
- Security = new NijikoPermissionsProxy(null);
- }
- }
-
-
-
+ public void setupPermissions()
+ {
+ if (Security == null)
+ {
+ Security = new NijikoPermissionsProxy(null);
+ }
+ }
}
-
-
diff --git a/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java b/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java
index cac98e554..3b5b564fb 100644
--- a/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java
+++ b/EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java
@@ -18,570 +18,680 @@ import org.anjocaido.groupmanager.GroupManager;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
+
/**
* Everything here maintains the model created by Nijikokun
*
- * But implemented to use GroupManager system. Which provides instant changes,
- * without file access.
+ * But implemented to use GroupManager system. Which provides instant changes, without file access.
*
* @author gabrielcouto
*/
-public class NijikoPermissionsProxy extends PermissionHandler {
-
- GroupManager plugin;
-
- public NijikoPermissionsProxy(GroupManager plugin) {
- super();
- this.plugin = plugin;
- }
-
- @Override
- public void addGroupPermission(String world, String group, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void removeGroupPermission(String world, String group, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void addGroupInfo(String world, String group, String node, Object data) {
- plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addGroupInfo(group, node, data);
- }
-
- @Override
- public void removeGroupInfo(String world, String group, String node) {
- plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeGroupInfo(group, node);
- }
-
- @Override
- public void addUserPermission(String world, String user, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void removeUserPermission(String world, String user, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void addUserInfo(String world, String user, String node, Object data) {
- plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addUserInfo(user, node, data);
- }
-
- @Override
- public void removeUserInfo(String world, String user, String node) {
- plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeUserInfo(user, node);
- }
-
- @Deprecated
- public void removeUserInfo(String user, String node) {
- plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeUserInfo(user, node);
- }
-
- @Deprecated
- public void addGroupPermission(String group, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Deprecated
- public void removeGroupPermission(String group, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Deprecated
- public void addGroupInfo(String group, String node, Object data) {
- plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addGroupInfo(group, node, data);
- }
-
- @Deprecated
- public void removeGroupInfo(String group, String node) {
- plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeGroupInfo(group, node);
- }
-
- @Deprecated
- public void addUserPermission(String user, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Deprecated
- public void removeUserPermission(String user, String node) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Deprecated
- public void addUserInfo(String user, String node, Object data) {
- plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addUserInfo(user, node, data);
- }
-
- @Override
- public void setDefaultWorld(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Deprecated
- public void setDirectory(File directory) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean loadWorld(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void forceLoadWorld(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean checkWorld(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void load() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void reload() {
- plugin.getWorldsHolder().reloadAll();
- //throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean reload(String world) {
- plugin.getWorldsHolder().reloadWorld(world);
- return true;
- }
-
- @Override
- public boolean has(Player player, String permission) {
- //throw new UnsupportedOperationException("Not supported yet.");
- return permission(player, permission);
- }
-
- @Override
- public boolean permission(Player player, String permission) {
- //throw new UnsupportedOperationException("Not supported yet.");
- if (permission == null || permission.equals("")) {
- return false;
- }
- if (player == null) {
- GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
- return false;
- }
- if (player.getWorld() == null) {
- GroupManager.logger.warning("The player " + player.getName() + " has a null world? Treating as default world!");
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().has(player, permission);
- }
- return plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getPermissionsHandler().has(player, permission);
- }
-
- @Override
- public String getGroupRawPrefix(String world, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
- }
-
- @Override
- public String getGroupRawSuffix(String world, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
- }
-
- @Override
- public String getUserPrefix(String world, String user) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPrefix(user);
- }
-
- @Override
- public String getUserSuffix(String world, String user) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserSuffix(user);
- }
-
- @Override
- public String getGroup(String world, String user) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
- }
-
- @Override
- public String getPrimaryGroup(String world, String user) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
- }
-
- @Override
- public boolean canUserBuild(String world, String user) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canUserBuild(user);
- }
-
- @Deprecated
- public String getGroup(String name) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroup(name);
- }
-
- @Override
- public String[] getGroups(String world, String name) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroups(name);
- }
-
- @Override
- public boolean inGroup(String world, String name, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(name, group);
- }
-
- @Deprecated
- public boolean inGroup(String name, String group) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().inGroup(name, group);
- }
-
- @Override
- public String getGroupPrefix(String world, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
- }
-
- @Deprecated
- public String getGroupPrefix(String group) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPrefix(group);
- }
-
- @Override
- public String getGroupSuffix(String world, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
- }
-
- @Deprecated
- public String getGroupSuffix(String group) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupSuffix(group);
- }
-
- @Override
- public boolean canGroupBuild(String world, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canGroupBuild(group);
- }
-
- @Deprecated
- public boolean canGroupBuild(String group) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().canGroupBuild(group);
- }
-
- @Override
- public String getGroupPermissionString(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionString(group, permission);
- }
-
- @Deprecated
- public String getGroupPermissionString(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionString(group, permission);
- }
-
- @Override
- public int getGroupPermissionInteger(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionInteger(group, permission);
- }
-
- @Deprecated
- public int getGroupPermissionInteger(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionInteger(group, permission);
- }
-
- @Override
- public boolean getGroupPermissionBoolean(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionBoolean(group, permission);
- }
-
- @Deprecated
- public boolean getGroupPermissionBoolean(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionBoolean(group, permission);
- }
-
- @Override
- public double getGroupPermissionDouble(String world, String group, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionDouble(group, permission);
- }
-
- @Deprecated
- public double getGroupPermissionDouble(String group, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionDouble(group, permission);
- }
-
- @Override
- public String getUserPermissionString(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionString(name, permission);
- }
-
- @Deprecated
- public String getUserPermissionString(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionString(name, permission);
- }
-
- @Override
- public int getUserPermissionInteger(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionInteger(name, permission);
- }
-
- @Deprecated
- public int getUserPermissionInteger(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionInteger(name, permission);
- }
-
- @Override
- public boolean getUserPermissionBoolean(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionBoolean(name, permission);
- }
-
- @Deprecated
- public boolean getUserPermissionBoolean(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionBoolean(name, permission);
- }
-
- @Override
- public double getUserPermissionDouble(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionDouble(name, permission);
- }
-
- @Deprecated
- public double getUserPermissionDouble(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionDouble(name, permission);
- }
-
- @Override
- public String getPermissionString(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionString(name, permission);
- }
-
- @Deprecated
- public String getPermissionString(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionString(name, permission);
- }
-
- @Override
- public int getPermissionInteger(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionInteger(name, permission);
- }
-
- @Deprecated
- public int getPermissionInteger(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionInteger(name, permission);
- }
-
- @Override
- public boolean getPermissionBoolean(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionBoolean(name, permission);
- }
-
- @Deprecated
- public boolean getPermissionBoolean(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionBoolean(name, permission);
- }
-
- @Override
- public double getPermissionDouble(String world, String name, String permission) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionDouble(name, permission);
- }
-
- @Deprecated
- public double getPermissionDouble(String name, String permission) {
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionDouble(name, permission);
- }
-
- public void setGM(Plugin p) {
- this.plugin = (GroupManager) p;
- }
-
- @Override
- public boolean canGroupRawBuild(String world, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canGroupBuild(group);
- }
-
- @Override
- public void closeAll() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public int compareWeights(String firstWorld, String first, String secondWorld, String second) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public int compareWeights(String world, String first, String second) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Map> getAllGroups(String world, String name) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Group getDefaultGroup(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Group getGroupObject(String world, String group) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public String getGroupProperName(String world, String group) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Boolean getInfoBoolean(String world, String entryName, String path,
- boolean isGroup) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoBoolean(entryName, path, isGroup);
- }
-
- @Override
- public Boolean getInfoBoolean(String world, String entryName, String path,
- boolean isGroup, Comparator comparator) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Double getInfoDouble(String world, String entryName, String path, boolean isGroup) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoDouble(entryName, path, isGroup);
- }
-
- @Override
- public Double getInfoDouble(String world, String entryName, String path,
- boolean isGroup, Comparator comparator) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Integer getInfoInteger(String world, String entryName, String path,
- boolean isGroup) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoInteger(entryName, path, isGroup);
- }
-
- @Override
- public Integer getInfoInteger(String world, String entryName, String path,
- boolean isGroup, Comparator comparator) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public String getInfoString(String world, String entryName, String path, boolean isGroup) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoString(entryName, path, isGroup);
- }
-
- @Override
- public String getInfoString(String world, String entryName, String path,
- boolean isGroup, Comparator comparator) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Boolean getRawInfoBoolean(String world, String entryName, String path,
- boolean isGroup) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Double getRawInfoDouble(String world, String entryName, String path,
- boolean isGroup) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Integer getRawInfoInteger(String world, String entryName, String path,
- boolean isGroup) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public String getRawInfoString(String world, String entryName, String path,
- boolean isGroup) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Set getTracks(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public User getUserObject(String world, String name) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Collection getUsers(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Set getWorlds() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean has(String world, String playerName, String permission) {
- if (permission == null || permission.isEmpty()) {
- return false;
- }
- if (playerName == null || playerName.isEmpty()) {
- GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
- return false;
- }
- if (world == null) {
- GroupManager.logger.warning("The player " + playerName + " has a null world? Treating as default world!");
- return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().permission(playerName, permission);
- }
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().permission(playerName, permission);
- }
-
- @Override
- public boolean inGroup(String world, String user, String groupWorld, String group) {
- return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(user, group);
- }
-
- @Override
- public boolean inSingleGroup(String world, String user, String group) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean inSingleGroup(String world, String user, String groupWorld, String group) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean permission(String world, String name, String node) {
- return has(world, name, node);
- }
-
- @Override
- public Group safeGetGroup(String world, String name) throws Exception {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public User safeGetUser(String world, String name) throws Exception {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void save(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public void saveAll() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public Collection getGroups(String world) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- //@Override
- public Group getPrimaryGroupObject(String arg0, String arg1) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
+public class NijikoPermissionsProxy extends PermissionHandler
+{
+ GroupManager plugin;
+
+ public NijikoPermissionsProxy(GroupManager plugin)
+ {
+ super();
+ this.plugin = plugin;
+ }
+
+ @Override
+ public void addGroupPermission(String world, String group, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void removeGroupPermission(String world, String group, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addGroupInfo(String world, String group, String node, Object data)
+ {
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addGroupInfo(group, node, data);
+ }
+
+ @Override
+ public void removeGroupInfo(String world, String group, String node)
+ {
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeGroupInfo(group, node);
+ }
+
+ @Override
+ public void addUserPermission(String world, String user, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void removeUserPermission(String world, String user, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addUserInfo(String world, String user, String node, Object data)
+ {
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addUserInfo(user, node, data);
+ }
+
+ @Override
+ public void removeUserInfo(String world, String user, String node)
+ {
+ plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeUserInfo(user, node);
+ }
+
+ @Deprecated
+ public void removeUserInfo(String user, String node)
+ {
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeUserInfo(user, node);
+ }
+
+ @Deprecated
+ public void addGroupPermission(String group, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Deprecated
+ public void removeGroupPermission(String group, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Deprecated
+ public void addGroupInfo(String group, String node, Object data)
+ {
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addGroupInfo(group, node, data);
+ }
+
+ @Deprecated
+ public void removeGroupInfo(String group, String node)
+ {
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeGroupInfo(group, node);
+ }
+
+ @Deprecated
+ public void addUserPermission(String user, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Deprecated
+ public void removeUserPermission(String user, String node)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Deprecated
+ public void addUserInfo(String user, String node, Object data)
+ {
+ plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addUserInfo(user, node, data);
+ }
+
+ @Override
+ public void setDefaultWorld(String world)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Deprecated
+ public void setDirectory(File directory)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean loadWorld(String world)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void forceLoadWorld(String world)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean checkWorld(String world)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void load()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void reload()
+ {
+ plugin.getWorldsHolder().reloadAll();
+ //throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean reload(String world)
+ {
+ plugin.getWorldsHolder().reloadWorld(world);
+ return true;
+ }
+
+ @Override
+ public boolean has(Player player, String permission)
+ {
+ //throw new UnsupportedOperationException("Not supported yet.");
+ return permission(player, permission);
+ }
+
+ @Override
+ public boolean permission(Player player, String permission)
+ {
+ //throw new UnsupportedOperationException("Not supported yet.");
+ if (permission == null || permission.equals(""))
+ {
+ return false;
+ }
+ if (player == null)
+ {
+ GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
+ return false;
+ }
+ if (player.getWorld() == null)
+ {
+ GroupManager.logger.warning("The player " + player.getName() + " has a null world? Treating as default world!");
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().has(player, permission);
+ }
+ return plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getPermissionsHandler().has(player, permission);
+ }
+
+ @Override
+ public String getGroupRawPrefix(String world, String group)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
+ }
+
+ @Override
+ public String getGroupRawSuffix(String world, String group)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
+ }
+
+ @Override
+ public String getUserPrefix(String world, String user)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPrefix(user);
+ }
+
+ @Override
+ public String getUserSuffix(String world, String user)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserSuffix(user);
+ }
+
+ @Override
+ public String getGroup(String world, String user)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
+ }
+
+ @Override
+ public String getPrimaryGroup(String world, String user)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
+ }
+
+ @Override
+ public boolean canUserBuild(String world, String user)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canUserBuild(user);
+ }
+
+ @Deprecated
+ public String getGroup(String name)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroup(name);
+ }
+
+ @Override
+ public String[] getGroups(String world, String name)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroups(name);
+ }
+
+ @Override
+ public boolean inGroup(String world, String name, String group)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(name, group);
+ }
+
+ @Deprecated
+ public boolean inGroup(String name, String group)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().inGroup(name, group);
+ }
+
+ @Override
+ public String getGroupPrefix(String world, String group)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
+ }
+
+ @Deprecated
+ public String getGroupPrefix(String group)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPrefix(group);
+ }
+
+ @Override
+ public String getGroupSuffix(String world, String group)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
+ }
+
+ @Deprecated
+ public String getGroupSuffix(String group)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupSuffix(group);
+ }
+
+ @Override
+ public boolean canGroupBuild(String world, String group)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canGroupBuild(group);
+ }
+
+ @Deprecated
+ public boolean canGroupBuild(String group)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().canGroupBuild(group);
+ }
+
+ @Override
+ public String getGroupPermissionString(String world, String group, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionString(group, permission);
+ }
+
+ @Deprecated
+ public String getGroupPermissionString(String group, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionString(group, permission);
+ }
+
+ @Override
+ public int getGroupPermissionInteger(String world, String group, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionInteger(group, permission);
+ }
+
+ @Deprecated
+ public int getGroupPermissionInteger(String group, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionInteger(group, permission);
+ }
+
+ @Override
+ public boolean getGroupPermissionBoolean(String world, String group, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionBoolean(group, permission);
+ }
+
+ @Deprecated
+ public boolean getGroupPermissionBoolean(String group, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionBoolean(group, permission);
+ }
+
+ @Override
+ public double getGroupPermissionDouble(String world, String group, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionDouble(group, permission);
+ }
+
+ @Deprecated
+ public double getGroupPermissionDouble(String group, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionDouble(group, permission);
+ }
+
+ @Override
+ public String getUserPermissionString(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionString(name, permission);
+ }
+
+ @Deprecated
+ public String getUserPermissionString(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionString(name, permission);
+ }
+
+ @Override
+ public int getUserPermissionInteger(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionInteger(name, permission);
+ }
+
+ @Deprecated
+ public int getUserPermissionInteger(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionInteger(name, permission);
+ }
+
+ @Override
+ public boolean getUserPermissionBoolean(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionBoolean(name, permission);
+ }
+
+ @Deprecated
+ public boolean getUserPermissionBoolean(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionBoolean(name, permission);
+ }
+
+ @Override
+ public double getUserPermissionDouble(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionDouble(name, permission);
+ }
+
+ @Deprecated
+ public double getUserPermissionDouble(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionDouble(name, permission);
+ }
+
+ @Override
+ public String getPermissionString(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionString(name, permission);
+ }
+
+ @Deprecated
+ public String getPermissionString(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionString(name, permission);
+ }
+
+ @Override
+ public int getPermissionInteger(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionInteger(name, permission);
+ }
+
+ @Deprecated
+ public int getPermissionInteger(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionInteger(name, permission);
+ }
+
+ @Override
+ public boolean getPermissionBoolean(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionBoolean(name, permission);
+ }
+
+ @Deprecated
+ public boolean getPermissionBoolean(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionBoolean(name, permission);
+ }
+
+ @Override
+ public double getPermissionDouble(String world, String name, String permission)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionDouble(name, permission);
+ }
+
+ @Deprecated
+ public double getPermissionDouble(String name, String permission)
+ {
+ return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionDouble(name, permission);
+ }
+
+ public void setGM(Plugin p)
+ {
+ this.plugin = (GroupManager)p;
+ }
+
+ @Override
+ public boolean canGroupRawBuild(String world, String group)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canGroupBuild(group);
+ }
+
+ @Override
+ public void closeAll()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int compareWeights(String firstWorld, String first, String secondWorld, String second)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int compareWeights(String world, String first, String second)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Map> getAllGroups(String world, String name)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Group getDefaultGroup(String world)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Group getGroupObject(String world, String group)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getGroupProperName(String world, String group)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Boolean getInfoBoolean(String world, String entryName, String path,
+ boolean isGroup)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoBoolean(entryName, path, isGroup);
+ }
+
+ @Override
+ public Boolean getInfoBoolean(String world, String entryName, String path,
+ boolean isGroup, Comparator comparator)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Double getInfoDouble(String world, String entryName, String path, boolean isGroup)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoDouble(entryName, path, isGroup);
+ }
+
+ @Override
+ public Double getInfoDouble(String world, String entryName, String path,
+ boolean isGroup, Comparator comparator)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Integer getInfoInteger(String world, String entryName, String path,
+ boolean isGroup)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoInteger(entryName, path, isGroup);
+ }
+
+ @Override
+ public Integer getInfoInteger(String world, String entryName, String path,
+ boolean isGroup, Comparator comparator)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getInfoString(String world, String entryName, String path, boolean isGroup)
+ {
+ return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoString(entryName, path, isGroup);
+ }
+
+ @Override
+ public String getInfoString(String world, String entryName, String path,
+ boolean isGroup, Comparator