diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-12-31 02:28:52 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-12-31 02:28:52 +0000 |
| commit | 86619275992b4b29bfac91897986b10f2ef863cb (patch) | |
| tree | c46ac4dd7fb3a7d7dde90d508e3b123efd09def7 | |
| parent | a6b83ca260386fbafb24473aca5f95dc2d5c284b (diff) | |
| download | Essentials-86619275992b4b29bfac91897986b10f2ef863cb.tar Essentials-86619275992b4b29bfac91897986b10f2ef863cb.tar.gz Essentials-86619275992b4b29bfac91897986b10f2ef863cb.tar.lz Essentials-86619275992b4b29bfac91897986b10f2ef863cb.tar.xz Essentials-86619275992b4b29bfac91897986b10f2ef863cb.zip | |
Merge gravy's pull and reformat code
322 files changed, 2633 insertions, 2753 deletions
diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 75b7823be..e98a39882 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -1,109 +1,108 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <artifactId>Essentials</artifactId> + <dependencies> + <!-- Internal Depends --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>EssentialsGroupManager</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>0.11.6</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.4.1</version> + </dependency> + <!-- Test Depends --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <!-- External Plugin Depends --> + <dependency> + <groupId>cosine</groupId> + <artifactId>BOSEconomy</artifactId> + <version>0.7</version> + </dependency> + <dependency> + <groupId>com.iConomy</groupId> + <artifactId>iConomy</artifactId> + <version>5.0</version> + </dependency> + <dependency> + <groupId>com.iCo6</groupId> + <artifactId>iConomy</artifactId> + <version>6.0</version> + </dependency> + <dependency> + <groupId>me.ashtheking</groupId> + <artifactId>MultiCurrency</artifactId> + <version>0.05</version> + </dependency> + <dependency> + <groupId>net.milkbowl</groupId> + <artifactId>Vault</artifactId> + <version>1.2</version> + </dependency> + </dependencies> - <artifactId>Essentials</artifactId> - <dependencies> - <!-- Internal Depends --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>EssentialsGroupManager</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>0.11.6</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.4.1</version> - </dependency> - <!-- Test Depends --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <!-- External Plugin Depends --> - <dependency> - <groupId>cosine</groupId> - <artifactId>BOSEconomy</artifactId> - <version>0.7</version> - </dependency> - <dependency> - <groupId>com.iConomy</groupId> - <artifactId>iConomy</artifactId> - <version>5.0</version> - </dependency> - <dependency> - <groupId>com.iCo6</groupId> - <artifactId>iConomy</artifactId> - <version>6.0</version> - </dependency> - <dependency> - <groupId>me.ashtheking</groupId> - <artifactId>MultiCurrency</artifactId> - <version>0.05</version> - </dependency> - <dependency> - <groupId>net.milkbowl</groupId> - <artifactId>Vault</artifactId> - <version>1.2</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.0</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <includes> - <include>commons-io:*</include> - <include>org.apache.commons:*</include> - </includes> - </artifactSet> - <minimizeJar>true</minimizeJar> - <relocations> - <relocation> - <pattern>org.apache.commons</pattern> - <shadedPattern>net.ess3.commons</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.0</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>commons-io:*</include> + <include>org.apache.commons:*</include> + </includes> + </artifactSet> + <minimizeJar>true</minimizeJar> + <relocations> + <relocation> + <pattern>org.apache.commons</pattern> + <shadedPattern>net.ess3.commons</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/Essentials/src/net/ess3/Console.java b/Essentials/src/net/ess3/Console.java index 93c638a77..02c77b253 100644 --- a/Essentials/src/net/ess3/Console.java +++ b/Essentials/src/net/ess3/Console.java @@ -1,7 +1,7 @@ package net.ess3; -import net.ess3.api.IReplyTo; import org.bukkit.command.CommandSender; +import net.ess3.api.IReplyTo; public final class Console implements IReplyTo diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java index 3bbe79411..f5a8752d8 100644 --- a/Essentials/src/net/ess3/Essentials.java +++ b/Essentials/src/net/ess3/Essentials.java @@ -17,15 +17,19 @@ */ package net.ess3; +import static net.ess3.I18n._; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.bukkit.Server; +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.bukkit.plugin.InvalidDescriptionException; import lombok.Getter; import lombok.Setter; -import static net.ess3.I18n._; import net.ess3.api.*; import net.ess3.backup.Backup; import net.ess3.commands.EssentialsCommandHandler; @@ -40,10 +44,6 @@ import net.ess3.settings.SpawnsHolder; import net.ess3.storage.StorageQueue; import net.ess3.user.UserMap; import net.ess3.utils.ExecuteTimer; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.plugin.InvalidDescriptionException; public class Essentials implements IEssentials diff --git a/Essentials/src/net/ess3/EssentialsTimer.java b/Essentials/src/net/ess3/EssentialsTimer.java index 0bd902b17..87e872fcf 100644 --- a/Essentials/src/net/ess3/EssentialsTimer.java +++ b/Essentials/src/net/ess3/EssentialsTimer.java @@ -2,12 +2,12 @@ package net.ess3; import java.util.*; import java.util.logging.Level; +import org.bukkit.entity.Player; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; -import org.bukkit.entity.Player; public class EssentialsTimer implements Runnable diff --git a/Essentials/src/net/ess3/I18n.java b/Essentials/src/net/ess3/I18n.java index d52842d81..8f31963eb 100644 --- a/Essentials/src/net/ess3/I18n.java +++ b/Essentials/src/net/ess3/I18n.java @@ -66,7 +66,9 @@ public class I18n implements II18n } catch (MissingResourceException ex) { - Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex); + Logger.getLogger("Minecraft").log( + Level.WARNING, String.format( + "Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex); return defaultBundle.getString(string); } } @@ -98,6 +100,7 @@ public class I18n implements II18n } return messageFormat.format(objects); } + private final Pattern partSplit = Pattern.compile("[_\\.]"); public void updateLocale(final String loc) @@ -127,10 +130,7 @@ public class I18n implements II18n public static String capitalCase(final String input) { - return input == null || input.length() == 0 - ? input - : input.toUpperCase(Locale.ENGLISH).charAt(0) - + input.toLowerCase(Locale.ENGLISH).substring(1); + return input == null || input.length() == 0 ? input : input.toUpperCase(Locale.ENGLISH).charAt(0) + input.toLowerCase(Locale.ENGLISH).substring(1); } diff --git a/Essentials/src/net/ess3/ItemDb.java b/Essentials/src/net/ess3/ItemDb.java index 6866215bd..85636546f 100644 --- a/Essentials/src/net/ess3/ItemDb.java +++ b/Essentials/src/net/ess3/ItemDb.java @@ -1,18 +1,18 @@ package net.ess3; +import static net.ess3.I18n._; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; -import static net.ess3.I18n._; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IEssentials; import net.ess3.api.IItemDb; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.storage.ManagedFile; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; public class ItemDb implements IItemDb @@ -24,6 +24,7 @@ public class ItemDb implements IItemDb this.ess = ess; file = new ManagedFile("items.csv", ess); } + private final transient Map<String, Long> items = new HashMap<String, Long>(); private final transient ManagedFile file; private static final Pattern SPLIT = Pattern.compile("[^a-zA-Z0-9]"); @@ -91,6 +92,7 @@ public class ItemDb implements IItemDb retval.setAmount(quantity); return retval; } + private final Pattern idMatch = Pattern.compile("^\\d+[:+',;.]\\d+$"); private final Pattern metaSplit = Pattern.compile("[:+',;.]"); private final Pattern number = Pattern.compile("^\\d+$"); diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java index bc89e4b23..b7df33da5 100644 --- a/Essentials/src/net/ess3/Jails.java +++ b/Essentials/src/net/ess3/Jails.java @@ -1,14 +1,13 @@ package net.ess3; +import static net.ess3.I18n._; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.IJails; -import net.ess3.api.IUser; -import net.ess3.storage.AsyncStorageObjectHolder; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.event.EventHandler; @@ -23,6 +22,10 @@ import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.PluginManager; +import net.ess3.api.IEssentials; +import net.ess3.api.IJails; +import net.ess3.api.IUser; +import net.ess3.storage.AsyncStorageObjectHolder; public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails @@ -48,8 +51,7 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp @Override public Location getJail(final String jailName) throws Exception { - if (getData().getJails() == null || jailName == null - || !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH))) + if (getData().getJails() == null || jailName == null || !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH))) { throw new Exception(_("jailNotExist")); } diff --git a/Essentials/src/net/ess3/Kits.java b/Essentials/src/net/ess3/Kits.java index b0cc0ebb3..b68b3ccd0 100644 --- a/Essentials/src/net/ess3/Kits.java +++ b/Essentials/src/net/ess3/Kits.java @@ -1,8 +1,9 @@ package net.ess3; +import static net.ess3.I18n._; import java.io.File; import java.util.*; -import static net.ess3.I18n._; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IEssentials; import net.ess3.api.IKits; import net.ess3.api.IUser; @@ -11,7 +12,6 @@ import net.ess3.settings.Kit; import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import org.bukkit.inventory.ItemStack; public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> implements IKits @@ -25,8 +25,7 @@ public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> imple @Override public Kit getKit(String kitName) throws Exception { - if (getData().getKits() == null || kitName == null - || !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH))) + if (getData().getKits() == null || kitName == null || !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH))) { throw new Exception(_("kitError2")); } diff --git a/Essentials/src/net/ess3/SpawnMob.java b/Essentials/src/net/ess3/SpawnMob.java index b68c1b622..42ee5a3fb 100644 --- a/Essentials/src/net/ess3/SpawnMob.java +++ b/Essentials/src/net/ess3/SpawnMob.java @@ -1,16 +1,6 @@ package net.ess3; import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.bukkit.LivingEntities; -import net.ess3.bukkit.LivingEntities.MobException; -import net.ess3.commands.NotEnoughArgumentsException; -import net.ess3.permissions.Permissions; -import net.ess3.user.User; -import net.ess3.utils.LocationUtil; -import net.ess3.utils.Util; import java.util.*; import java.util.regex.Pattern; import org.bukkit.DyeColor; @@ -21,6 +11,17 @@ import org.bukkit.block.Block; import org.bukkit.command.CommandSender; import org.bukkit.entity.*; import org.bukkit.material.Colorable; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.bukkit.LivingEntities; +import net.ess3.bukkit.LivingEntities.MobException; +import net.ess3.commands.NotEnoughArgumentsException; +import net.ess3.permissions.Permissions; +import net.ess3.user.User; +import net.ess3.utils.LocationUtil; +import net.ess3.utils.Util; + public class SpawnMob { @@ -149,7 +150,7 @@ public class SpawnMob private static void spawnMob(final IEssentials ess, final Server server, final CommandSender sender, final IUser target, final Location sloc, EntityType mob, String mobData, EntityType mobMount, String mountData) throws Exception { - + final World spawningWorld = sloc.getWorld(); final Entity spawnedMob = spawningWorld.spawn(sloc, (Class<? extends LivingEntity>)mob.getEntityClass()); Entity spawnedMount = null; diff --git a/Essentials/src/net/ess3/Teleport.java b/Essentials/src/net/ess3/Teleport.java index 9c5d954df..81272069b 100644 --- a/Essentials/src/net/ess3/Teleport.java +++ b/Essentials/src/net/ess3/Teleport.java @@ -1,8 +1,11 @@ package net.ess3; +import static net.ess3.I18n._; import java.util.Calendar; import java.util.GregorianCalendar; -import static net.ess3.I18n._; +import org.bukkit.Location; +import org.bukkit.entity.Entity; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IEssentials; import net.ess3.api.ITeleport; import net.ess3.api.IUser; @@ -13,9 +16,6 @@ import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; import net.ess3.utils.LocationUtil; import net.ess3.utils.Target; -import org.bukkit.Location; -import org.bukkit.entity.Entity; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Teleport implements Runnable, ITeleport @@ -25,8 +25,8 @@ public class Teleport implements Runnable, ITeleport private IUser user; private IUser teleportUser; private int teleTimer = -1; - private long started; // time this task was initiated - private long tpDelay; // how long to delay the teleport + private long started; // time this task was initiated + private long tpDelay; // how long to delay the teleport private int health; // note that I initially stored a clone of the location for reference, but... // when comparing locations, I got incorrect mismatches (rounding errors, looked like) @@ -43,7 +43,7 @@ public class Teleport implements Runnable, ITeleport { initTimer(delay, user, target, chargeFor, cause); } - + private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause) { this.started = System.currentTimeMillis(); @@ -67,19 +67,18 @@ public class Teleport implements Runnable, ITeleport cancel(); return; } - + if (teleportUser == null || !teleportUser.isOnline() || teleportUser.getPlayer().getLocation() == null) { cancel(false); return; } - - if (!Permissions.TELEPORT_TIMER_MOVE.isAuthorized(user) - &&(Math.round(teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX - || Math.round(teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY - || Math.round(teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ - || teleportUser.getPlayer().getHealth() < health)) - { // user moved, cancel teleport + + if (!Permissions.TELEPORT_TIMER_MOVE.isAuthorized(user) && (Math.round( + teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX || Math.round( + teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY || Math.round( + teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ || teleportUser.getPlayer().getHealth() < health)) + { // user moved, cancel teleport cancel(true); return; } @@ -124,7 +123,6 @@ public class Teleport implements Runnable, ITeleport this.ess = ess; } - public void cooldown(boolean check) throws Exception { @@ -168,7 +166,7 @@ public class Teleport implements Runnable, ITeleport { cancel(false); } - + @Override public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception { @@ -214,14 +212,15 @@ public class Teleport implements Runnable, ITeleport cancel(); user.setLastLocation(); final Location loc = LocationUtil.getSafeDestination(target.getLocation()); - ess.getPlugin().scheduleSyncDelayedTask(new Runnable() - { - @Override - public void run() - { - user.getPlayer().teleport(loc, cause); - } - }); + ess.getPlugin().scheduleSyncDelayedTask( + new Runnable() + { + @Override + public void run() + { + user.getPlayer().teleport(loc, cause); + } + }); } @Override @@ -234,7 +233,7 @@ public class Teleport implements Runnable, ITeleport now(new Target(loc), cause); } - + @Override //The now function is used when you want to skip tp delay when teleporting someone to a location or player. public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception @@ -245,14 +244,14 @@ public class Teleport implements Runnable, ITeleport } now(new Target(entity), cause); } - + public void now(Location loc, Trade chargeFor, TeleportCause cause) throws Exception { cooldown(false); chargeFor.charge(user); now(new Target(loc), cause); } - + //The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere public void teleportToMe(IUser otherUser, Trade chargeFor, TeleportCause cause) throws Exception { @@ -273,7 +272,8 @@ public class Teleport implements Runnable, ITeleport { chargeFor.charge(user); } - return; } + return; + } cancel(false); warnUser(otherUser, delay); @@ -281,7 +281,7 @@ public class Teleport implements Runnable, ITeleport teleTimer = ess.getPlugin().scheduleSyncRepeatingTask(this, 10, 10); } - + private void warnUser(final IUser user, final double delay) { final Calendar c = new GregorianCalendar(); @@ -289,19 +289,20 @@ public class Teleport implements Runnable, ITeleport c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0)); user.sendMessage(_("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis()))); } - + @Override public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception { final Location bed = user.getBedSpawnLocation(); - final Location respawnLoc = ess.getPlugin().callRespawnEvent(user.getPlayer(), bed == null ? user.getPlayer().getWorld().getSpawnLocation() : bed, bed != null); + final Location respawnLoc = ess.getPlugin().callRespawnEvent( + user.getPlayer(), bed == null ? user.getPlayer().getWorld().getSpawnLocation() : bed, bed != null); teleport(new Target(respawnLoc), chargeFor, cause); } @Override public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception { - final Location loc = ess.getWarps().getWarp(warp); + final Location loc = ess.getWarps().getWarp(warp); user.sendMessage(_("warpingTo", warp)); teleport(new Target(loc), chargeFor, cause); } diff --git a/Essentials/src/net/ess3/Warps.java b/Essentials/src/net/ess3/Warps.java index 2b3002e0b..55bfbff1e 100644 --- a/Essentials/src/net/ess3/Warps.java +++ b/Essentials/src/net/ess3/Warps.java @@ -1,8 +1,9 @@ package net.ess3; +import static net.ess3.I18n._; import java.io.File; import java.util.*; -import static net.ess3.I18n._; +import org.bukkit.Location; import net.ess3.api.IEssentials; import net.ess3.api.IWarp; import net.ess3.api.IWarps; @@ -10,7 +11,6 @@ import net.ess3.api.InvalidNameException; import net.ess3.commands.WarpNotFoundException; import net.ess3.settings.WarpHolder; import net.ess3.storage.StorageObjectMap; -import org.bukkit.Location; public class Warps extends StorageObjectMap<IWarp> implements IWarps diff --git a/Essentials/src/net/ess3/api/ChargeException.java b/Essentials/src/net/ess3/api/ChargeException.java index 07a3a9ce6..8b76f76bb 100644 --- a/Essentials/src/net/ess3/api/ChargeException.java +++ b/Essentials/src/net/ess3/api/ChargeException.java @@ -4,9 +4,9 @@ package net.ess3.api; public class ChargeException extends Exception { /** - * Allow for serialization of the ChargeException class - */ - private static final long serialVersionUID = 200058474023860487L; + * Allow for serialization of the ChargeException class + */ + private static final long serialVersionUID = 200058474023860487L; public ChargeException(final String message) { diff --git a/Essentials/src/net/ess3/api/Economy.java b/Essentials/src/net/ess3/api/Economy.java index 627c0c746..046c6e1f6 100644 --- a/Essentials/src/net/ess3/api/Economy.java +++ b/Essentials/src/net/ess3/api/Economy.java @@ -12,14 +12,16 @@ public final class Economy private Economy() { } + private static IEssentials ess; private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded."; /** * Returns the balance of a user + * * @param name Name of the user * @return balance - * @throws UserDoesNotExistException + * @throws UserDoesNotExistException */ public static double getMoney(String name) throws UserDoesNotExistException { @@ -32,10 +34,11 @@ 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 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 setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException { @@ -48,10 +51,11 @@ 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 { @@ -61,10 +65,11 @@ 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 { @@ -74,10 +79,11 @@ 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 { @@ -87,10 +93,11 @@ 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 { @@ -100,9 +107,10 @@ public final class Economy /** * Resets the balance of a user to the starting balance + * * @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 { @@ -114,7 +122,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 @@ -125,7 +133,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 @@ -136,7 +144,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 @@ -148,6 +156,7 @@ public final class Economy /** * Test if the user has a negative balance + * * @param name Name of the user * @return true, if the user has a negative balance * @throws UserDoesNotExistException If a user by that name does not exists @@ -160,6 +169,7 @@ public final class Economy /** * Formats the amount of money like all other Essentials functions. * Example: $100000 or $12345.67 + * * @param amount The amount of money * @return Formatted money */ @@ -174,6 +184,7 @@ public final class Economy /** * Test if a player exists to avoid the UserDoesNotExistException + * * @param name Name of the user * @return true, if the user exists */ @@ -188,9 +199,10 @@ public final class Economy /** * Test if a player is a npc + * * @param name Name of the player * @return true, if it's a npc - * @throws UserDoesNotExistException + * @throws UserDoesNotExistException */ public static boolean isNPC(String name) throws UserDoesNotExistException { @@ -203,6 +215,7 @@ public final class Economy /** * Creates dummy files for a npc, if there is no player yet with that name. + * * @param name Name of the player * @return true, if a new npc was created */ @@ -216,9 +229,10 @@ public final class Economy } /** - * Deletes a user, if it is marked as npc. + * Deletes a user, if it is marked as npc. + * * @param name Name of the player - * @throws UserDoesNotExistException + * @throws UserDoesNotExistException */ public static void removeNPC(String name) throws UserDoesNotExistException { diff --git a/Essentials/src/net/ess3/api/IComponent.java b/Essentials/src/net/ess3/api/IComponent.java index a25a19f81..5cdee2b16 100644 --- a/Essentials/src/net/ess3/api/IComponent.java +++ b/Essentials/src/net/ess3/api/IComponent.java @@ -1,11 +1,12 @@ package net.ess3.api; -public interface IComponent extends IReload { +public interface IComponent extends IReload +{ /** * Enable the component. */ void onEnable(); - + /** * Disable the component. */ diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java index 6350257e0..47cdb805a 100644 --- a/Essentials/src/net/ess3/api/IEssentials.java +++ b/Essentials/src/net/ess3/api/IEssentials.java @@ -2,13 +2,13 @@ package net.ess3.api; import java.util.List; import java.util.logging.Logger; +import org.bukkit.Server; +import org.bukkit.World; import net.ess3.EssentialsTimer; import net.ess3.economy.register.Methods; import net.ess3.metrics.Metrics; import net.ess3.settings.SpawnsHolder; import net.ess3.storage.StorageQueue; -import org.bukkit.Server; -import org.bukkit.World; public interface IEssentials extends IComponent @@ -64,7 +64,7 @@ public interface IEssentials extends IComponent void setMetrics(Metrics metrics); SpawnsHolder getSpawns(); - + StorageQueue getStorageQueue(); - + } diff --git a/Essentials/src/net/ess3/api/IItemDb.java b/Essentials/src/net/ess3/api/IItemDb.java index 8738b1bab..8a20c85a1 100644 --- a/Essentials/src/net/ess3/api/IItemDb.java +++ b/Essentials/src/net/ess3/api/IItemDb.java @@ -3,7 +3,6 @@ package net.ess3.api; import org.bukkit.inventory.ItemStack; - public interface IItemDb extends IReload { ItemStack get(final String name, final IUser user) throws Exception; diff --git a/Essentials/src/net/ess3/api/IKits.java b/Essentials/src/net/ess3/api/IKits.java index 03919f40d..089e77cb7 100644 --- a/Essentials/src/net/ess3/api/IKits.java +++ b/Essentials/src/net/ess3/api/IKits.java @@ -16,6 +16,6 @@ public interface IKits extends IReload Collection<String> getList() throws Exception; boolean isEmpty(); - + void checkTime(final IUser user, Kit kit) throws NoChargeException; } diff --git a/Essentials/src/net/ess3/api/IPermission.java b/Essentials/src/net/ess3/api/IPermission.java index 43a50af76..01e1a729a 100644 --- a/Essentials/src/net/ess3/api/IPermission.java +++ b/Essentials/src/net/ess3/api/IPermission.java @@ -10,6 +10,7 @@ public interface IPermission /** * Checks to see if a user can use this permission + * * @param sender - CommandSender to check on * @return - True if they have that permission */ diff --git a/Essentials/src/net/ess3/api/IPlugin.java b/Essentials/src/net/ess3/api/IPlugin.java index 4a08f1545..9a248438b 100644 --- a/Essentials/src/net/ess3/api/IPlugin.java +++ b/Essentials/src/net/ess3/api/IPlugin.java @@ -6,16 +6,20 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; -public interface IPlugin extends Plugin { - + +public interface IPlugin extends Plugin +{ + /** * Get an instance of essentials + * * @return */ IEssentials getEssentials(); - + /** - * Schedule an a-sync task + * Schedule an a-sync task + * * @param run - Code to call later * @return - BukkitTask for the task created */ @@ -23,14 +27,16 @@ public interface IPlugin extends Plugin { /** * Schedule a sync task (ran in main thread) to be run + * * @param run - Code to be run later * @return - Integer for the task id */ int scheduleSyncDelayedTask(final Runnable run); - + /** * Call an a-sync task to be run with a given delay - * @param run - Code to be run + * + * @param run - Code to be run * @param delay - Long that represents how long to wait * @return - BukkitTask for the task created */ @@ -38,7 +44,8 @@ public interface IPlugin extends Plugin { /** * Schedule a sync (ran in main thread) delayed task - * @param run - Code to run + * + * @param run - Code to run * @param delay - Long that represents how long to wait * @return - Integer of the task ID */ @@ -46,9 +53,9 @@ public interface IPlugin extends Plugin { /** * Schedule a sync (in the main thread) repeating task - * - * @param run - Code to run - * @param delay - Delay for the first run + * + * @param run - Code to run + * @param delay - Delay for the first run * @param period - Time to wait between every run after the first * @return - int of the task ID */ @@ -56,8 +63,9 @@ public interface IPlugin extends Plugin { /** * Schedule an a-sync repeating task - * @param run - Code to run - * @param delay - Delay for the first run + * + * @param run - Code to run + * @param delay - Delay for the first run * @param period - Time to wait between every run after the first * @return - int of the task ID */ @@ -66,27 +74,29 @@ public interface IPlugin extends Plugin { File getRootFolder(); /** - * * Stop a running task from a task id - * - * @param taskId + * + * @param taskId */ void cancelTask(final int taskId); - + /** * Stop a running task from a bukkit task + * * @param taskId */ void cancelTask(final BukkitTask taskId); /** * Get the essentials version + * * @return */ String getVersion(); /** * Load a class, currently needs updating + * * @param name - class name * @return - loaded class */ @@ -94,8 +104,9 @@ public interface IPlugin extends Plugin { /** * Call a re-spawn event on a player - * @param player - Player to re-spawn - * @param loc - Location to send + * + * @param player - Player to re-spawn + * @param loc - Location to send * @param bedSpawn - do you use bed? * @return - Location after event called */ @@ -103,12 +114,14 @@ public interface IPlugin extends Plugin { /** * Call a suicide event on a player + * * @param player - Player to kill */ void callSuicideEvent(Player player); /** * Finds if an essentials module is loaded + * * @param name * @return */ @@ -117,11 +130,12 @@ public interface IPlugin extends Plugin { public void onPluginEnable(Plugin plugin); public void onPluginDisable(Plugin plugin); - + /** * Register a module with Essentils + * * @param module - Your plugin instance */ void registerModule(Plugin module); - + } diff --git a/Essentials/src/net/ess3/api/IRanks.java b/Essentials/src/net/ess3/api/IRanks.java index d3c68bf43..bfa0ec470 100644 --- a/Essentials/src/net/ess3/api/IRanks.java +++ b/Essentials/src/net/ess3/api/IRanks.java @@ -3,6 +3,7 @@ package net.ess3.api; import java.text.MessageFormat; import org.bukkit.command.CommandSender; + /** * CommandSender object can be either IUser or Player */ diff --git a/Essentials/src/net/ess3/api/IReplyTo.java b/Essentials/src/net/ess3/api/IReplyTo.java index 7d232c709..b1393d22f 100644 --- a/Essentials/src/net/ess3/api/IReplyTo.java +++ b/Essentials/src/net/ess3/api/IReplyTo.java @@ -3,7 +3,6 @@ package net.ess3.api; import org.bukkit.command.CommandSender; - public interface IReplyTo { void setReplyTo(CommandSender user); diff --git a/Essentials/src/net/ess3/api/ITeleport.java b/Essentials/src/net/ess3/api/ITeleport.java index fdf2bc313..7922e0db5 100644 --- a/Essentials/src/net/ess3/api/ITeleport.java +++ b/Essentials/src/net/ess3/api/ITeleport.java @@ -1,33 +1,34 @@ package net.ess3.api; -import net.ess3.economy.Trade; -import net.ess3.utils.Target; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import net.ess3.economy.Trade; +import net.ess3.utils.Target; public interface ITeleport { /** * Teleport to a location now - * @param loc - location to send to + * + * @param loc - location to send to * @param cooldown - To check cooldown - * @param cause - Why was the send caused? Use a {@link TeleportCause} + * @param cause - Why was the send caused? Use a {@link TeleportCause} * @throws Exception */ void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception; void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception; - - void now(final Target target, final TeleportCause cause) throws Exception; + + void now(final Target target, final TeleportCause cause) throws Exception; void back(Trade chargeFor) throws Exception; void teleport(Location bed, Trade charge, TeleportCause teleportCause) throws Exception; void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception; - + void teleportToMe(IUser otherUser, Trade chargeFor, TeleportCause cause) throws Exception; void home(Location loc, Trade chargeFor) throws Exception; diff --git a/Essentials/src/net/ess3/api/IUser.java b/Essentials/src/net/ess3/api/IUser.java index 74dd932e5..80ed02702 100755 --- a/Essentials/src/net/ess3/api/IUser.java +++ b/Essentials/src/net/ess3/api/IUser.java @@ -2,26 +2,28 @@ package net.ess3.api; import java.util.List; import java.util.Set; -import net.ess3.storage.IStorageObjectHolder; -import net.ess3.user.CooldownException; -import net.ess3.user.UserData; import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import net.ess3.storage.IStorageObjectHolder; +import net.ess3.user.CooldownException; +import net.ess3.user.UserData; public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolder<UserData>, IReload, IReplyTo, Comparable<IUser> { /** * Get the ammount of money in a users account + * * @return */ double getMoney(); /** * Remove money from the account + * * @param value */ void takeMoney(double value); @@ -131,9 +133,9 @@ public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolde boolean checkSignThrottle(int throttle); - public boolean isRecipeSee(); + public boolean isRecipeSee(); - public void setRecipeSee(boolean recipeSee); + public void setRecipeSee(boolean recipeSee); /** * Since the Player object should not be stored for a long time, this method should be called again with a null @@ -145,7 +147,7 @@ public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolde /** * If this is not cached using the setPlayerCache method, this call is slow and should not be called often. - * + * <p/> * It iterates over all players, that are online and does a equal check on their names. * * @return diff --git a/Essentials/src/net/ess3/api/IUserMap.java b/Essentials/src/net/ess3/api/IUserMap.java index 0a027e5ae..692170fb9 100644 --- a/Essentials/src/net/ess3/api/IUserMap.java +++ b/Essentials/src/net/ess3/api/IUserMap.java @@ -2,9 +2,9 @@ package net.ess3.api; import java.io.File; import java.util.Set; +import org.bukkit.entity.Player; import net.ess3.user.PlayerNotFoundException; import net.ess3.user.TooManyMatchesException; -import org.bukkit.entity.Player; public interface IUserMap extends IReload diff --git a/Essentials/src/net/ess3/api/IWarp.java b/Essentials/src/net/ess3/api/IWarp.java index 286299ef3..3d6fffbd3 100644 --- a/Essentials/src/net/ess3/api/IWarp.java +++ b/Essentials/src/net/ess3/api/IWarp.java @@ -3,6 +3,7 @@ package net.ess3.api; import net.ess3.settings.Warp; import net.ess3.storage.IStorageObjectHolder; + /** * Warp interface */ diff --git a/Essentials/src/net/ess3/api/IWarps.java b/Essentials/src/net/ess3/api/IWarps.java index de9758702..48bc6cd61 100644 --- a/Essentials/src/net/ess3/api/IWarps.java +++ b/Essentials/src/net/ess3/api/IWarps.java @@ -9,6 +9,7 @@ public interface IWarps extends IReload { /** * Get a warp by name + * * @param warp - Warp name * @return - Location the warp is set to * @throws Exception @@ -17,12 +18,14 @@ public interface IWarps extends IReload /** * Gets a list of warps + * * @return - A {@link Collection} of warps */ Collection<String> getList(); /** * Delete a warp from the warp DB + * * @param name - Name of warp * @throws Exception */ @@ -30,23 +33,25 @@ public interface IWarps extends IReload /** * Set a warp + * * @param name - Name of warp - * @param loc - Location of warp - * @throws Exception + * @param loc - Location of warp + * @throws Exception */ void setWarp(String name, Location loc) throws Exception; - + /** * Check to see if the file is empty - * + * * @return */ public boolean isEmpty(); /** * Get a warp file + * * @param name - name of file - * @return - an instance of the file + * @return - an instance of the file * @throws InvalidNameException - When the file is not found */ public File getWarpFile(String name) throws InvalidNameException; diff --git a/Essentials/src/net/ess3/api/IWorth.java b/Essentials/src/net/ess3/api/IWorth.java index c0778a32c..1cec6b6f1 100644 --- a/Essentials/src/net/ess3/api/IWorth.java +++ b/Essentials/src/net/ess3/api/IWorth.java @@ -7,15 +7,17 @@ public interface IWorth extends IReload { /** * Get the price of an ItemStack + * * @param itemStack - ItemStack to check * @return - double marking price */ double getPrice(ItemStack itemStack); - + /** * Set the price of an ItemStack + * * @param itemStack - ItemStack to set price for - * @param price - Price to set on item + * @param price - Price to set on item */ void setPrice(ItemStack itemStack, double price); } diff --git a/Essentials/src/net/ess3/api/InvalidNameException.java b/Essentials/src/net/ess3/api/InvalidNameException.java index 34940ab1c..b4ea12674 100644 --- a/Essentials/src/net/ess3/api/InvalidNameException.java +++ b/Essentials/src/net/ess3/api/InvalidNameException.java @@ -4,9 +4,9 @@ package net.ess3.api; public class InvalidNameException extends Exception { /** - * Allow serialization of the InvalidNameException exception - */ - private static final long serialVersionUID = 1485321420293663139L; + * Allow serialization of the InvalidNameException exception + */ + private static final long serialVersionUID = 1485321420293663139L; public InvalidNameException(Throwable thrwbl) { diff --git a/Essentials/src/net/ess3/api/NoLoanPermittedException.java b/Essentials/src/net/ess3/api/NoLoanPermittedException.java index 7868e152c..970630af6 100644 --- a/Essentials/src/net/ess3/api/NoLoanPermittedException.java +++ b/Essentials/src/net/ess3/api/NoLoanPermittedException.java @@ -6,9 +6,9 @@ import static net.ess3.I18n._; public class NoLoanPermittedException extends Exception { /** - * Allow serialization of the NoLoanPermittedException exception - */ - private static final long serialVersionUID = 1897047051293914036L; + * Allow serialization of the NoLoanPermittedException exception + */ + private static final long serialVersionUID = 1897047051293914036L; public NoLoanPermittedException() { diff --git a/Essentials/src/net/ess3/api/UserDoesNotExistException.java b/Essentials/src/net/ess3/api/UserDoesNotExistException.java index 3febbe797..9fd9886ab 100644 --- a/Essentials/src/net/ess3/api/UserDoesNotExistException.java +++ b/Essentials/src/net/ess3/api/UserDoesNotExistException.java @@ -6,9 +6,9 @@ import static net.ess3.I18n._; public class UserDoesNotExistException extends Exception { /** - * Allow serialization of the UserDefinedFileAttributeView exception - */ - private static final long serialVersionUID = -6540804196206916310L; + * Allow serialization of the UserDefinedFileAttributeView exception + */ + private static final long serialVersionUID = -6540804196206916310L; public UserDoesNotExistException(String name) { diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index 3743f636b..35d3cd3cb 100644 --- a/Essentials/src/net/ess3/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -1,16 +1,16 @@ package net.ess3.backup; +import static net.ess3.I18n._; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; -import static net.ess3.I18n._; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; import net.ess3.api.IBackup; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; public class Backup implements Runnable, IBackup @@ -54,28 +54,28 @@ public class Backup implements Runnable, IBackup { return; } - + final ISettings settings = ess.getSettings(); - + final net.ess3.settings.Backup backupSettings = settings.getData().getGeneral().getBackup(); - - String backupCommand = backupSettings.getCommand() == null || backupSettings.getCommand().isEmpty() - ? ("NORUN") : backupSettings.getCommand(); + + String backupCommand = backupSettings.getCommand() == null || backupSettings.getCommand().isEmpty() ? ("NORUN") : backupSettings.getCommand(); /*if (backupCommand.equals("NORUN")) { TODO: Un-comment if you do not want commands to be run if there is no backup command return; }*/ - + ess.getLogger().log(Level.INFO, _("backupStarted")); - - if (!backupSettings.getCommandsBeforeBackup().isEmpty()) + + if (!backupSettings.getCommandsBeforeBackup().isEmpty()) { final CommandSender consoleSender = server.getConsoleSender(); - for (String command : backupSettings.getCommandsBeforeBackup()) { + for (String command : backupSettings.getCommandsBeforeBackup()) + { server.dispatchCommand(consoleSender, command); } } - + ess.getPlugin().scheduleAsyncDelayedTask(new BackupRunner(backupCommand)); } diff --git a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java index f787dcdcd..ce831d010 100644 --- a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java +++ b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java @@ -1,21 +1,12 @@ package net.ess3.bukkit; +import static net.ess3.I18n._; import java.io.File; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; -import net.ess3.Essentials; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.IPlugin; -import net.ess3.listener.EssentialsBlockListener; -import net.ess3.listener.EssentialsEntityListener; -import net.ess3.listener.EssentialsPlayerListener; -import net.ess3.listener.EssentialsPluginListener; -import net.ess3.metrics.MetricsListener; -import net.ess3.metrics.MetricsStarter; import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -31,6 +22,15 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.scheduler.BukkitTask; +import net.ess3.Essentials; +import net.ess3.api.IEssentials; +import net.ess3.api.IPlugin; +import net.ess3.listener.EssentialsBlockListener; +import net.ess3.listener.EssentialsEntityListener; +import net.ess3.listener.EssentialsPlayerListener; +import net.ess3.listener.EssentialsPluginListener; +import net.ess3.metrics.MetricsListener; +import net.ess3.metrics.MetricsStarter; public class BukkitPlugin extends JavaPlugin implements IPlugin @@ -62,14 +62,15 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin getLogger().log(Level.SEVERE, _("essentialsHelp2")); } getLogger().log(Level.SEVERE, ex.toString()); - pm.registerEvents(new Listener() - { - @EventHandler(priority = EventPriority.LOW) - public void onPlayerJoin(final PlayerJoinEvent event) - { - event.getPlayer().sendMessage("Essentials failed to load, read the log file."); - } - }, this); + pm.registerEvents( + new Listener() + { + @EventHandler(priority = EventPriority.LOW) + public void onPlayerJoin(final PlayerJoinEvent event) + { + event.getPlayer().sendMessage("Essentials failed to load, read the log file."); + } + }, this); for (Player player : getServer().getOnlinePlayers()) { player.sendMessage("Essentials failed to load, read the log file."); @@ -178,13 +179,13 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin { getServer().getScheduler().cancelTask(taskId); } - + @Override - public void cancelTask(BukkitTask taskId) + public void cancelTask(BukkitTask taskId) { getServer().getScheduler().cancelTask(taskId.getTaskId()); } - + @Override public String getVersion() { @@ -228,17 +229,16 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin @Override public void onPluginEnable(final Plugin plugin) { - if (plugin.getName().equals(this.getName()) - || !plugin.getName().startsWith("Essentials")) + if (plugin.getName().equals(this.getName()) || !plugin.getName().startsWith("Essentials")) { return; } // Remove "Essentials" from name modules.put(plugin.getName().substring(10), plugin); } - + @Override - public void registerModule(Plugin module) + public void registerModule(Plugin module) { // TODO: Use, solution for L231 modules.put(module.getName().substring(10), module); } @@ -246,8 +246,7 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin @Override public void onPluginDisable(final Plugin plugin) { - if (plugin.getName().equals(this.getName()) - || !plugin.getName().startsWith("Essentials")) + if (plugin.getName().equals(this.getName()) || !plugin.getName().startsWith("Essentials")) { return; } diff --git a/Essentials/src/net/ess3/bukkit/Enchantments.java b/Essentials/src/net/ess3/bukkit/Enchantments.java index b577f06e3..51d93915d 100644 --- a/Essentials/src/net/ess3/bukkit/Enchantments.java +++ b/Essentials/src/net/ess3/bukkit/Enchantments.java @@ -15,7 +15,7 @@ public final class Enchantments private Enchantments() { } - + private static final transient Pattern NUMPATTERN = Pattern.compile("\\d+"); private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>(); @@ -112,12 +112,16 @@ public final class Enchantments ENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE); ENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE); } - - public static Enchantment getByName(final String name) { + + public static Enchantment getByName(final String name) + { Enchantment enchantment; - if (NUMPATTERN.matcher(name).matches()) { + if (NUMPATTERN.matcher(name).matches()) + { enchantment = Enchantment.getById(Integer.parseInt(name)); - } else { + } + else + { enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH)); } if (enchantment == null) diff --git a/Essentials/src/net/ess3/bukkit/LivingEntities.java b/Essentials/src/net/ess3/bukkit/LivingEntities.java index ee52c158e..81ad2f1f5 100644 --- a/Essentials/src/net/ess3/bukkit/LivingEntities.java +++ b/Essentials/src/net/ess3/bukkit/LivingEntities.java @@ -1,19 +1,14 @@ package net.ess3.bukkit; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Set; import static net.ess3.I18n._; +import java.util.*; import org.bukkit.entity.EntityType; public class LivingEntities { final private static Map<String, EntityType> entities = new HashMap<String, EntityType>(); - + final private static EnumMap<EntityType, String> entityI18n = new EnumMap<EntityType, String>(EntityType.class); final private static EnumMap<EntityType, String> entityI18nPlural = new EnumMap<EntityType, String>(EntityType.class); @@ -26,7 +21,7 @@ public class LivingEntities String entityName = entityType.name().toLowerCase(Locale.ENGLISH).replace("_", ""); entities.put(entityName, entityType); entityI18n.put(entityType, entityName); - entityI18nPlural.put(entityType,entityName+"Plural"); + entityI18nPlural.put(entityType, entityName + "Plural"); } } } @@ -41,10 +36,11 @@ public class LivingEntities return entities.get(name.toLowerCase(Locale.ENGLISH)); } - public static String getName(int count, EntityType type) { - return count == 1? _(entityI18n.get(type)):_(entityI18nPlural.get(type)); + public static String getName(int count, EntityType type) + { + return count == 1 ? _(entityI18n.get(type)) : _(entityI18nPlural.get(type)); } - + public static class MobException extends Exception { private static final long serialVersionUID = 1L; diff --git a/Essentials/src/net/ess3/bukkit/PermissionFactory.java b/Essentials/src/net/ess3/bukkit/PermissionFactory.java index f3e84b54b..b8a96b409 100644 --- a/Essentials/src/net/ess3/bukkit/PermissionFactory.java +++ b/Essentials/src/net/ess3/bukkit/PermissionFactory.java @@ -1,12 +1,12 @@ package net.ess3.bukkit; import java.util.StringTokenizer; -import net.ess3.api.IPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.PluginManager; +import net.ess3.api.IPermission; public class PermissionFactory diff --git a/Essentials/src/net/ess3/bukkit/VersionCheck.java b/Essentials/src/net/ess3/bukkit/VersionCheck.java index 4cf396c4c..17144ae00 100644 --- a/Essentials/src/net/ess3/bukkit/VersionCheck.java +++ b/Essentials/src/net/ess3/bukkit/VersionCheck.java @@ -1,17 +1,18 @@ package net.ess3.bukkit; +import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static net.ess3.I18n._; import org.bukkit.plugin.PluginManager; public class VersionCheck { public static final int BUKKIT_VERSION = 2015; - private static final Pattern bukkitVersionPattern = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*"); + private static final Pattern bukkitVersionPattern = Pattern.compile( + "git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*"); public static boolean checkVersion(final org.bukkit.plugin.Plugin plugin) { @@ -20,8 +21,7 @@ public class VersionCheck final Logger log = plugin.getLogger(); for (org.bukkit.plugin.Plugin p : pm.getPlugins()) { - if (p.getDescription().getName().startsWith("Essentials") - && !p.getDescription().getVersion().equals(pluginVersion)) + if (p.getDescription().getName().startsWith("Essentials") && !p.getDescription().getVersion().equals(pluginVersion)) { p.getLogger().log(Level.WARNING, _("versionMismatch", p.getDescription().getName())); } diff --git a/Essentials/src/net/ess3/commands/Commandafk.java b/Essentials/src/net/ess3/commands/Commandafk.java index 58a3e72a1..282da59a4 100644 --- a/Essentials/src/net/ess3/commands/Commandafk.java +++ b/Essentials/src/net/ess3/commands/Commandafk.java @@ -37,5 +37,5 @@ public class Commandafk extends EssentialsCommand //user.sendMessage(_("markedAsAway")); ess.broadcastMessage(user, _("userIsAway", user.getPlayer().getDisplayName())); } - } + } } diff --git a/Essentials/src/net/ess3/commands/Commandbackup.java b/Essentials/src/net/ess3/commands/Commandbackup.java index 85f423c6f..0e3c841e7 100644 --- a/Essentials/src/net/ess3/commands/Commandbackup.java +++ b/Essentials/src/net/ess3/commands/Commandbackup.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IBackup; import org.bukkit.command.CommandSender; +import net.ess3.api.IBackup; public class Commandbackup extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbalance.java b/Essentials/src/net/ess3/commands/Commandbalance.java index 6c7bd941a..2fb325ab9 100644 --- a/Essentials/src/net/ess3/commands/Commandbalance.java +++ b/Essentials/src/net/ess3/commands/Commandbalance.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; -import org.bukkit.command.CommandSender; public class Commandbalance extends EssentialsCommand @@ -22,10 +22,7 @@ public class Commandbalance extends EssentialsCommand @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception { - final double bal = (args.length < 1 - || !Permissions.BALANCE_OTHERS.isAuthorized(user) - ? user - : ess.getUserMap().matchUser(args[0], true)).getMoney(); + final double bal = (args.length < 1 || !Permissions.BALANCE_OTHERS.isAuthorized(user) ? user : ess.getUserMap().matchUser(args[0], true)).getMoney(); user.sendMessage(_("balance", FormatUtil.displayCurrency(bal, ess))); } } diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index bc4c5de38..dd5712f13 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -1,17 +1,17 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.text.DateFormat; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData; import net.ess3.utils.FormatUtil; import net.ess3.utils.textreader.ArrayListInput; import net.ess3.utils.textreader.TextPager; -import org.bukkit.command.CommandSender; public class Commandbalancetop extends EssentialsCommand @@ -43,9 +43,7 @@ public class Commandbalancetop extends EssentialsCommand user.getData().setBalancetopHide(!user.getData().isBalancetopHide()); user.queueSave(); sender.sendMessage( - user.getData().isBalancetopHide() - ? _("baltopHidden") - : _("baltopShown")); + user.getData().isBalancetopHide() ? _("baltopHidden") : _("baltopShown")); } else if (args.length == 2 && Permissions.BALANCETOP_HIDE_OTHERS.isAuthorized(sender)) { @@ -54,9 +52,7 @@ public class Commandbalancetop extends EssentialsCommand userData.setBalancetopHide(!userData.isBalancetopHide()); user.queueSave(); sender.sendMessage( - userData.isBalancetopHide() - ? user.getName() + _("userBaltopHidden") - : user.getName() + _("userBaltopShown")); + userData.isBalancetopHide() ? user.getName() + _("userBaltopHidden") : user.getName() + _("userBaltopShown")); } else { @@ -149,7 +145,8 @@ public class Commandbalancetop extends EssentialsCommand } final List<Map.Entry<String, Double>> sortedEntries = new ArrayList<Map.Entry<String, Double>>(balances.entrySet()); - Collections.sort(sortedEntries, new Comparator<Map.Entry<String, Double>>() + Collections.sort( + sortedEntries, new Comparator<Map.Entry<String, Double>>() { @Override public int compare(final Entry<String, Double> entry1, final Entry<String, Double> entry2) diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java index f495d10fc..d00cdb449 100644 --- a/Essentials/src/net/ess3/commands/Commandban.java +++ b/Essentials/src/net/ess3/commands/Commandban.java @@ -1,15 +1,14 @@ package net.ess3.commands; -import net.ess3.Console; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import net.ess3.Console; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.Ban; import net.ess3.user.UserData; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - public class Commandban extends EssentialsCommand { @@ -44,7 +43,7 @@ public class Commandban extends EssentialsCommand userData.setBan(new Ban()); if (args.length > 1) { - + banReason = _("banFormat", getFinalArg(args, 1), senderName); userData.getBan().setReason(banReason); } @@ -53,7 +52,7 @@ public class Commandban extends EssentialsCommand banReason = _("banFormat", _("defaultBanReason"), senderName); userData.getBan().setReason(""); } - + user.setBanned(true); user.queueSave(); user.getPlayer().kickPlayer(banReason); diff --git a/Essentials/src/net/ess3/commands/Commandbanip.java b/Essentials/src/net/ess3/commands/Commandbanip.java index 21bbc4889..ee5defa95 100644 --- a/Essentials/src/net/ess3/commands/Commandbanip.java +++ b/Essentials/src/net/ess3/commands/Commandbanip.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; +import net.ess3.api.IUser; public class Commandbanip extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbigtree.java b/Essentials/src/net/ess3/commands/Commandbigtree.java index e89d20f43..612c19008 100644 --- a/Essentials/src/net/ess3/commands/Commandbigtree.java +++ b/Essentials/src/net/ess3/commands/Commandbigtree.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.TreeType; +import net.ess3.api.IUser; +import net.ess3.utils.LocationUtil; public class Commandbigtree extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandbreak.java b/Essentials/src/net/ess3/commands/Commandbreak.java index 404d73d59..22331f2de 100644 --- a/Essentials/src/net/ess3/commands/Commandbreak.java +++ b/Essentials/src/net/ess3/commands/Commandbreak.java @@ -1,11 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.block.BlockBreakEvent; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; + public class Commandbreak extends EssentialsCommand { diff --git a/Essentials/src/net/ess3/commands/Commandbroadcast.java b/Essentials/src/net/ess3/commands/Commandbroadcast.java index 87c21a674..f47e2068b 100644 --- a/Essentials/src/net/ess3/commands/Commandbroadcast.java +++ b/Essentials/src/net/ess3/commands/Commandbroadcast.java @@ -1,9 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.utils.FormatUtil; import org.bukkit.command.CommandSender; - +import net.ess3.utils.FormatUtil; public class Commandbroadcast extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandburn.java b/Essentials/src/net/ess3/commands/Commandburn.java index 4f0e90478..d30ddc7aa 100644 --- a/Essentials/src/net/ess3/commands/Commandburn.java +++ b/Essentials/src/net/ess3/commands/Commandburn.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; public class Commandburn extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java index 70f8e4773..0f8424d3d 100644 --- a/Essentials/src/net/ess3/commands/Commandclearinventory.java +++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import java.util.List; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; +import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandclearinventory extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java index 53955aaa2..3bde21493 100644 --- a/Essentials/src/net/ess3/commands/Commanddelhome.java +++ b/Essentials/src/net/ess3/commands/Commanddelhome.java @@ -1,11 +1,11 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; -import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import org.bukkit.command.CommandSender; public class Commanddelhome extends EssentialsCommand @@ -48,10 +48,10 @@ public class Commanddelhome extends EssentialsCommand { name = expandedArg[0]; } - if (name.equalsIgnoreCase("bed")) - { - throw new Exception (_("vanillaHome")); - } + if (name.equalsIgnoreCase("bed")) + { + throw new Exception(_("vanillaHome")); + } user.getData().removeHome(name.toLowerCase(Locale.ENGLISH)); user.queueSave(); sender.sendMessage(_("deleteHome", name)); diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java index f61898d91..7176c16d9 100644 --- a/Essentials/src/net/ess3/commands/Commandeco.java +++ b/Essentials/src/net/ess3/commands/Commandeco.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; +import java.util.Locale; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; public class Commandeco extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java index 73b85eacc..dbb58f0a5 100644 --- a/Essentials/src/net/ess3/commands/Commandenchant.java +++ b/Essentials/src/net/ess3/commands/Commandenchant.java @@ -1,17 +1,17 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import static net.ess3.I18n._; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IUser; import net.ess3.bukkit.Enchantments; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; public class Commandenchant extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandenderchest.java b/Essentials/src/net/ess3/commands/Commandenderchest.java index f66975a65..2ab3ed61f 100644 --- a/Essentials/src/net/ess3/commands/Commandenderchest.java +++ b/Essentials/src/net/ess3/commands/Commandenderchest.java @@ -1,7 +1,6 @@ package net.ess3.commands; import org.bukkit.entity.Player; - import net.ess3.api.IUser; import net.ess3.permissions.Permissions; @@ -11,7 +10,7 @@ public class Commandenderchest extends EssentialsCommand @Override protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception - { + { final Player player = user.getPlayer(); if (args.length > 0 && Permissions.ENDERCHEST_OTHERS.isAuthorized(user)) { diff --git a/Essentials/src/net/ess3/commands/Commandessentials.java b/Essentials/src/net/ess3/commands/Commandessentials.java index 28d76fe47..873977aa8 100644 --- a/Essentials/src/net/ess3/commands/Commandessentials.java +++ b/Essentials/src/net/ess3/commands/Commandessentials.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import java.util.Map; import static net.ess3.I18n._; +import java.util.Map; import org.bukkit.command.CommandSender; public class Commandessentials extends EssentialsCommand { private transient int taskid; // TODO: Needed? - + @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { diff --git a/Essentials/src/net/ess3/commands/Commandexp.java b/Essentials/src/net/ess3/commands/Commandexp.java index 74751e531..210eb59b6 100644 --- a/Essentials/src/net/ess3/commands/Commandexp.java +++ b/Essentials/src/net/ess3/commands/Commandexp.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.craftbukkit.SetExpFix; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import org.bukkit.command.CommandSender; public class Commandexp extends EssentialsCommand @@ -13,7 +13,7 @@ public class Commandexp extends EssentialsCommand @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception { - + if (args.length == 0) { showExp(user, user); @@ -89,7 +89,7 @@ public class Commandexp extends EssentialsCommand boolean foundUser = false; for (IUser matchPlayer : ess.getUserMap().matchUsersExcludingHidden(match, getPlayerOrNull(sender))) { - foundUser = true; + foundUser = true; showExp(sender, matchPlayer); } if (!foundUser) @@ -102,7 +102,7 @@ public class Commandexp extends EssentialsCommand { boolean foundUser = false; for (IUser matchPlayer : ess.getUserMap().matchUsersExcludingHidden(match, getPlayerOrNull(sender))) - { + { setExp(sender, matchPlayer, amount, toggle); foundUser = true; } @@ -115,8 +115,10 @@ public class Commandexp extends EssentialsCommand private void showExp(final CommandSender sender, final IUser target) { final int totalExp = SetExpFix.getTotalExperience(target.getPlayer()); - final int expLeft = (int)Util.roundDouble(((((3.5 * target.getPlayer().getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getPlayer().getLevel() * target.getPlayer().getLevel())) + (5.00 * target.getPlayer().getLevel())))) + 1)); - sender.sendMessage(_("exp", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft)); + final int expLeft = (int)Util.roundDouble( + ((((3.5 * target.getPlayer().getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getPlayer().getLevel() * target.getPlayer().getLevel())) + (5.00 * target.getPlayer().getLevel())))) + 1)); + sender.sendMessage( + _("exp", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft)); } private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give) diff --git a/Essentials/src/net/ess3/commands/Commandext.java b/Essentials/src/net/ess3/commands/Commandext.java index 47c355c3a..25d2a5a04 100644 --- a/Essentials/src/net/ess3/commands/Commandext.java +++ b/Essentials/src/net/ess3/commands/Commandext.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; public class Commandext extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandfeed.java b/Essentials/src/net/ess3/commands/Commandfeed.java index b5fac3644..aa2e881d4 100644 --- a/Essentials/src/net/ess3/commands/Commandfeed.java +++ b/Essentials/src/net/ess3/commands/Commandfeed.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import java.util.Set; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; +import java.util.Set; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandfeed extends EssentialsCommand @@ -35,7 +35,7 @@ public class Commandfeed extends EssentialsCommand return; } for (IUser player : users) - { + { final Player realPlayer = player.getPlayer(); realPlayer.setFoodLevel(20); realPlayer.setSaturation(10); diff --git a/Essentials/src/net/ess3/commands/Commandfireball.java b/Essentials/src/net/ess3/commands/Commandfireball.java index 6f05484a1..4a6079d9b 100644 --- a/Essentials/src/net/ess3/commands/Commandfireball.java +++ b/Essentials/src/net/ess3/commands/Commandfireball.java @@ -1,10 +1,10 @@ package net.ess3.commands; -import net.ess3.api.IUser; import org.bukkit.entity.Fireball; import org.bukkit.entity.Player; import org.bukkit.entity.SmallFireball; import org.bukkit.util.Vector; +import net.ess3.api.IUser; public class Commandfireball extends EssentialsCommand @@ -17,11 +17,12 @@ public class Commandfireball extends EssentialsCommand { small = true; } - + final Player player = user.getPlayer(); - + final Vector direction = player.getEyeLocation().getDirection().multiply(2); - final Fireball fireball = player.getWorld().spawn(player.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class); + final Fireball fireball = player.getWorld().spawn( + player.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class); fireball.setShooter(player); } } diff --git a/Essentials/src/net/ess3/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java index ceaf439fc..caf2ae767 100644 --- a/Essentials/src/net/ess3/commands/Commandgamemode.java +++ b/Essentials/src/net/ess3/commands/Commandgamemode.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; +import java.util.Locale; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandgamemode extends EssentialsSettingsCommand @@ -13,7 +13,8 @@ public class Commandgamemode extends EssentialsSettingsCommand protected void setValue(final IUser player, GameMode value) { - if (value == null) { + if (value == null) + { value = rotateGameMode(player); } player.getPlayer().setGameMode(value); @@ -26,10 +27,12 @@ public class Commandgamemode extends EssentialsSettingsCommand protected void informSender(final CommandSender sender, final boolean value, final IUser player) { - if (value) { - sender.sendMessage( _("gameMode", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName())); + if (value) + { + sender.sendMessage(_("gameMode", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName())); } - else { + else + { sender.sendMessage(_("gamemodeFailed", player.getName())); } } @@ -57,11 +60,13 @@ public class Commandgamemode extends EssentialsSettingsCommand protected boolean canMatch(final String arg) { - try { + try + { matchGameMode(arg); return true; } - catch (NotEnoughArgumentsException ex) { + catch (NotEnoughArgumentsException ex) + { return false; } } @@ -72,35 +77,37 @@ public class Commandgamemode extends EssentialsSettingsCommand { setValue(player, null); } - else { + else + { setValue(player, matchGameMode(arg)); } } - private GameMode rotateGameMode(final IUser player) { + private GameMode rotateGameMode(final IUser player) + { return getValue(player) == GameMode.SURVIVAL ? GameMode.CREATIVE : getValue(player) == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL; } private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException { final GameMode mode; - if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc") - || modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c")) + if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc") || modeString.contains("creat") || modeString.equalsIgnoreCase( + "1") || modeString.equalsIgnoreCase("c")) { mode = GameMode.CREATIVE; } - else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms") - || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s")) + else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms") || modeString.contains("survi") || modeString.equalsIgnoreCase( + "0") || modeString.equalsIgnoreCase("s")) { mode = GameMode.SURVIVAL; } - else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma") - || modeString.contains("advent") || modeString.equalsIgnoreCase("2") || modeString.equalsIgnoreCase("a")) + else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma") || modeString.contains("advent") || modeString.equalsIgnoreCase( + "2") || modeString.equalsIgnoreCase("a")) { mode = GameMode.ADVENTURE; } - else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt") - || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t")) + else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt") || modeString.contains("toggle") || modeString.contains( + "cycle") || modeString.equalsIgnoreCase("t")) { mode = null; } diff --git a/Essentials/src/net/ess3/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java index 292047a98..36092eb8b 100644 --- a/Essentials/src/net/ess3/commands/Commandgc.java +++ b/Essentials/src/net/ess3/commands/Commandgc.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import java.lang.management.ManagementFactory; import static net.ess3.I18n._; -import net.ess3.utils.DateUtil; +import java.lang.management.ManagementFactory; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.CommandSender; +import net.ess3.utils.DateUtil; public class Commandgc extends EssentialsCommand @@ -33,7 +33,7 @@ public class Commandgc extends EssentialsCommand sender.sendMessage(_("gcmax", (runtime.maxMemory() / 1024 / 1024))); sender.sendMessage(_("gctotal", (runtime.totalMemory() / 1024 / 1024))); sender.sendMessage(_("gcfree", (runtime.freeMemory() / 1024 / 1024))); - sender.sendMessage(_("gcquene", (ess.getStorageQueue().getQueueSize()))); + sender.sendMessage(_("gcquene", (ess.getStorageQueue().getQueueSize()))); for (World w : server.getWorlds()) { @@ -49,13 +49,11 @@ public class Commandgc extends EssentialsCommand default: worldType = "World"; break; - + } sender.sendMessage( - worldType + " \"" + w.getName() + "\": " - + w.getLoadedChunks().length + _("gcchunks") - + w.getEntities().size() + _("gcentities")); + worldType + " \"" + w.getName() + "\": " + w.getLoadedChunks().length + _("gcchunks") + w.getEntities().size() + _("gcentities")); } } } diff --git a/Essentials/src/net/ess3/commands/Commandgetpos.java b/Essentials/src/net/ess3/commands/Commandgetpos.java index 439655776..03c0bbce6 100644 --- a/Essentials/src/net/ess3/commands/Commandgetpos.java +++ b/Essentials/src/net/ess3/commands/Commandgetpos.java @@ -1,14 +1,12 @@ package net.ess3.commands; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; +import static net.ess3.I18n._; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; - -import static net.ess3.I18n._; - +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandgetpos extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandgive.java b/Essentials/src/net/ess3/commands/Commandgive.java index 826681a0c..090b4ef27 100644 --- a/Essentials/src/net/ess3/commands/Commandgive.java +++ b/Essentials/src/net/ess3/commands/Commandgive.java @@ -1,14 +1,14 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; -import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; -import net.ess3.utils.Util; import org.bukkit.command.CommandSender; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; public class Commandgive extends EssentialsCommand @@ -81,7 +81,7 @@ public class Commandgive extends EssentialsCommand giveTo.giveItems(stack, false); final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' '); - sender.sendMessage( _("give", stack.getAmount(), itemName, giveTo.getPlayer().getDisplayName())); + sender.sendMessage(_("give", stack.getAmount(), itemName, giveTo.getPlayer().getDisplayName())); } } diff --git a/Essentials/src/net/ess3/commands/Commandhat.java b/Essentials/src/net/ess3/commands/Commandhat.java index a9d22a438..5a0d5bd19 100644 --- a/Essentials/src/net/ess3/commands/Commandhat.java +++ b/Essentials/src/net/ess3/commands/Commandhat.java @@ -1,13 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.craftbukkit.InventoryWorkaround; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; - +import net.ess3.api.IUser; +import net.ess3.craftbukkit.InventoryWorkaround; public class Commandhat extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandheal.java b/Essentials/src/net/ess3/commands/Commandheal.java index fe6a07de9..88670ec5d 100644 --- a/Essentials/src/net/ess3/commands/Commandheal.java +++ b/Essentials/src/net/ess3/commands/Commandheal.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import java.util.Set; import static net.ess3.I18n._; +import java.util.Set; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandheal extends EssentialsCommand @@ -24,7 +24,7 @@ public class Commandheal extends EssentialsCommand } user.checkCooldown(TimestampType.LASTHEAL, ess.getRanks().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS); - + final Player player = user.getPlayer(); player.setHealth(20); player.setFireTicks(0); @@ -52,7 +52,7 @@ public class Commandheal extends EssentialsCommand return; } for (IUser p : users) - { + { final Player player = p.getPlayer(); player.setHealth(20); player.setFoodLevel(20); diff --git a/Essentials/src/net/ess3/commands/Commandhelp.java b/Essentials/src/net/ess3/commands/Commandhelp.java index dd3cb96fe..a7cfc5c99 100644 --- a/Essentials/src/net/ess3/commands/Commandhelp.java +++ b/Essentials/src/net/ess3/commands/Commandhelp.java @@ -1,12 +1,11 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.utils.Util; import net.ess3.utils.textreader.*; -import org.bukkit.command.CommandSender; - public class Commandhelp extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandhelpop.java b/Essentials/src/net/ess3/commands/Commandhelpop.java index 55bdd77e4..303b46981 100644 --- a/Essentials/src/net/ess3/commands/Commandhelpop.java +++ b/Essentials/src/net/ess3/commands/Commandhelpop.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import java.util.logging.Level; import static net.ess3.I18n._; +import java.util.logging.Level; +import org.bukkit.entity.Player; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; -import org.bukkit.entity.Player; public class Commandhelpop extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java index 8ac404be2..05c02e805 100644 --- a/Essentials/src/net/ess3/commands/Commandhome.java +++ b/Essentials/src/net/ess3/commands/Commandhome.java @@ -1,16 +1,16 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.Set; import java.util.regex.Pattern; -import static net.ess3.I18n._; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandhome extends EssentialsCommand @@ -99,8 +99,8 @@ public class Commandhome extends EssentialsCommand { throw new NotEnoughArgumentsException(); } - if (user.getPlayer().getWorld() != loc.getWorld() && ess.getSettings().getData().getGeneral().isWorldHomePermissions() - && !Permissions.WORLD.isAuthorized(user, loc.getWorld().getName())) + if (user.getPlayer().getWorld() != loc.getWorld() && ess.getSettings().getData().getGeneral().isWorldHomePermissions() && !Permissions.WORLD.isAuthorized( + user, loc.getWorld().getName())) { throw new Exception(_("noPerm", "essentials.world." + loc.getWorld().getName())); } diff --git a/Essentials/src/net/ess3/commands/Commandignore.java b/Essentials/src/net/ess3/commands/Commandignore.java index 73b102246..9b98557c7 100644 --- a/Essentials/src/net/ess3/commands/Commandignore.java +++ b/Essentials/src/net/ess3/commands/Commandignore.java @@ -15,17 +15,23 @@ public class Commandignore extends EssentialsCommand throw new NotEnoughArgumentsException(); } IUser player; - try { + try + { player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer()); - } catch(Exception e) { - if (args[0].equalsIgnoreCase("list")) { + } + catch (Exception e) + { + if (args[0].equalsIgnoreCase("list")) + { user.sendMessage(Util.joinList(user.getData().getIgnore())); throw new NoChargeException(); - } else { + } + else + { throw e; } } - + if (user.isIgnoringPlayer(player)) { user.setIgnoredPlayer(player, false); diff --git a/Essentials/src/net/ess3/commands/Commandinfo.java b/Essentials/src/net/ess3/commands/Commandinfo.java index cf8d90818..e6e15dd99 100644 --- a/Essentials/src/net/ess3/commands/Commandinfo.java +++ b/Essentials/src/net/ess3/commands/Commandinfo.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import org.bukkit.command.CommandSender; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; -import org.bukkit.command.CommandSender; public class Commandinfo extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java index 7a81b36fb..2f6e74190 100644 --- a/Essentials/src/net/ess3/commands/Commandinvsee.java +++ b/Essentials/src/net/ess3/commands/Commandinvsee.java @@ -1,11 +1,10 @@ package net.ess3.commands; -import java.util.Arrays; import static net.ess3.I18n._; +import java.util.Arrays; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IUser; import net.ess3.user.Inventory; -import org.bukkit.inventory.ItemStack; - public class Commandinvsee extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commanditem.java b/Essentials/src/net/ess3/commands/Commanditem.java index 416bed766..e544c620e 100644 --- a/Essentials/src/net/ess3/commands/Commanditem.java +++ b/Essentials/src/net/ess3/commands/Commanditem.java @@ -1,12 +1,12 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; -import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commanditem extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java index 902465b1a..cf5ab1142 100644 --- a/Essentials/src/net/ess3/commands/Commanditemdb.java +++ b/Essentials/src/net/ess3/commands/Commanditemdb.java @@ -1,12 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; - import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; - +import net.ess3.api.IUser; public class Commanditemdb extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandjails.java b/Essentials/src/net/ess3/commands/Commandjails.java index 4bbe6cd64..4563b237d 100644 --- a/Essentials/src/net/ess3/commands/Commandjails.java +++ b/Essentials/src/net/ess3/commands/Commandjails.java @@ -1,9 +1,8 @@ package net.ess3.commands; -import net.ess3.utils.Util; - import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import net.ess3.utils.Util; public class Commandjails extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandjump.java b/Essentials/src/net/ess3/commands/Commandjump.java index 835db0fb9..402bcffff 100644 --- a/Essentials/src/net/ess3/commands/Commandjump.java +++ b/Essentials/src/net/ess3/commands/Commandjump.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.Location; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.utils.LocationUtil; -import org.bukkit.Location; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandjump extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java index a61e58af7..61e24c95d 100644 --- a/Essentials/src/net/ess3/commands/Commandkick.java +++ b/Essentials/src/net/ess3/commands/Commandkick.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import net.ess3.Console; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.Console; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandkick extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandkickall.java b/Essentials/src/net/ess3/commands/Commandkickall.java index fbea0199e..cc0d135a7 100644 --- a/Essentials/src/net/ess3/commands/Commandkickall.java +++ b/Essentials/src/net/ess3/commands/Commandkickall.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; public class Commandkickall extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandkill.java b/Essentials/src/net/ess3/commands/Commandkill.java index 20957f178..75d2997ba 100644 --- a/Essentials/src/net/ess3/commands/Commandkill.java +++ b/Essentials/src/net/ess3/commands/Commandkill.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandkill extends EssentialsCommand @@ -21,7 +21,9 @@ public class Commandkill extends EssentialsCommand for (IUser matchPlayer : ess.getUserMap().matchUsersExcludingHidden(args[0], getPlayerOrNull(sender))) { final Player player = matchPlayer.getPlayer(); - final EntityDamageEvent ede = new EntityDamageEvent(player, sender instanceof IUser && sender.getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE); + final EntityDamageEvent ede = new EntityDamageEvent( + player, sender instanceof IUser && sender.getName().equals( + matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE); server.getPluginManager().callEvent(ede); if (ede.isCancelled() && Permissions.KILL_FORCE.isAuthorized(sender)) { diff --git a/Essentials/src/net/ess3/commands/Commandkillall.java b/Essentials/src/net/ess3/commands/Commandkillall.java index 5b6c21427..de3a94d29 100644 --- a/Essentials/src/net/ess3/commands/Commandkillall.java +++ b/Essentials/src/net/ess3/commands/Commandkillall.java @@ -1,9 +1,8 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Collections; import java.util.Locale; -import static net.ess3.I18n._; -import net.ess3.bukkit.LivingEntities; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; @@ -11,6 +10,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.*; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; +import net.ess3.bukkit.LivingEntities; public class Commandkillall extends EssentialsCommand @@ -117,7 +117,7 @@ public class Commandkillall extends EssentialsCommand { if (entity instanceof Animals || entity instanceof NPC || entity instanceof Snowman || entity instanceof WaterMob) { - EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack> emptyList()); + EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack>emptyList()); ess.getServer().getPluginManager().callEvent(event); entity.remove(); numKills++; @@ -127,7 +127,7 @@ public class Commandkillall extends EssentialsCommand { if (entity instanceof Monster || entity instanceof ComplexLivingEntity || entity instanceof Flying || entity instanceof Slime) { - EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack> emptyList()); + EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack>emptyList()); ess.getServer().getPluginManager().callEvent(event); entity.remove(); numKills++; @@ -135,14 +135,14 @@ public class Commandkillall extends EssentialsCommand } else if (all) { - EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack> emptyList()); + EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack>emptyList()); ess.getServer().getPluginManager().callEvent(event); entity.remove(); numKills++; } else if (entityClass != null && entityClass.isAssignableFrom(entity.getClass())) { - EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack> emptyList()); + EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.<ItemStack>emptyList()); ess.getServer().getPluginManager().callEvent(event); entity.remove(); numKills++; diff --git a/Essentials/src/net/ess3/commands/Commandkit.java b/Essentials/src/net/ess3/commands/Commandkit.java index 4aed743e0..9bdd9dbb9 100644 --- a/Essentials/src/net/ess3/commands/Commandkit.java +++ b/Essentials/src/net/ess3/commands/Commandkit.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Collection; import java.util.Locale; -import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; @@ -51,7 +51,7 @@ public class Commandkit extends EssentialsCommand charge.isAffordableFor(user); ess.getKits().sendKit(user, kit); - + //TODO: Merge kit changes from 2.9 charge.charge(user); diff --git a/Essentials/src/net/ess3/commands/Commandlightning.java b/Essentials/src/net/ess3/commands/Commandlightning.java index 8ee22a05a..894f6b90a 100644 --- a/Essentials/src/net/ess3/commands/Commandlightning.java +++ b/Essentials/src/net/ess3/commands/Commandlightning.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.LightningStrike; import org.bukkit.entity.Player; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandlightning extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index 254d29816..b18e23de7 100644 --- a/Essentials/src/net/ess3/commands/Commandlist.java +++ b/Essentials/src/net/ess3/commands/Commandlist.java @@ -1,13 +1,13 @@ package net.ess3.commands; -import java.util.*; import static net.ess3.I18n._; +import java.util.*; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandlist extends EssentialsCommand @@ -59,8 +59,7 @@ public class Commandlist extends EssentialsCommand final Set<String> hiddenPlayers = new HashSet<String>(); for (Player onlinePlayer : server.getOnlinePlayers()) { - if (userPlayer != null - && !userPlayer.canSee(onlinePlayer)) + if (userPlayer != null && !userPlayer.canSee(onlinePlayer)) { hiddenPlayers.add(onlinePlayer.getName()); if (!showhidden) @@ -118,8 +117,7 @@ public class Commandlist extends EssentialsCommand final Set<String> hiddenPlayers = new HashSet<String>(); for (Player onlinePlayer : server.getOnlinePlayers()) { - if (userPlayer != null - && !userPlayer.canSee(onlinePlayer)) + if (userPlayer != null && !userPlayer.canSee(onlinePlayer)) { hiddenPlayers.add(onlinePlayer.getName()); if (!showhidden) diff --git a/Essentials/src/net/ess3/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java index 94fc67bf3..1786c706f 100644 --- a/Essentials/src/net/ess3/commands/Commandmail.java +++ b/Essentials/src/net/ess3/commands/Commandmail.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import java.util.List; import static net.ess3.I18n._; +import java.util.List; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; import net.ess3.utils.Util; -import org.bukkit.command.CommandSender; public class Commandmail extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java index bd31ef465..c0613308c 100644 --- a/Essentials/src/net/ess3/commands/Commandmore.java +++ b/Essentials/src/net/ess3/commands/Commandmore.java @@ -1,16 +1,15 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import net.ess3.api.ChargeException; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - public class Commandmore extends EssentialsCommand { @@ -25,9 +24,8 @@ public class Commandmore extends EssentialsCommand } else { - stacks = new ItemStack[] - { - player.getItemInHand() + stacks = new ItemStack[]{ + player.getItemInHand() }; } for (ItemStack stack : stacks) @@ -48,9 +46,8 @@ public class Commandmore extends EssentialsCommand final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize(); final int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize(); - int newAmount = Permissions.OVERSIZEDSTACKS.isAuthorized(user) - ? oversizedStackSize - : defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize(); + int newAmount = Permissions.OVERSIZEDSTACKS.isAuthorized( + user) ? oversizedStackSize : defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize(); if (stack.getAmount() >= newAmount) { if (stacks.length == 1) diff --git a/Essentials/src/net/ess3/commands/Commandmotd.java b/Essentials/src/net/ess3/commands/Commandmotd.java index 907a41b34..b82bc7694 100644 --- a/Essentials/src/net/ess3/commands/Commandmotd.java +++ b/Essentials/src/net/ess3/commands/Commandmotd.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import org.bukkit.command.CommandSender; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; -import org.bukkit.command.CommandSender; public class Commandmotd extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java index 7621483d3..575e7bb10 100644 --- a/Essentials/src/net/ess3/commands/Commandmsg.java +++ b/Essentials/src/net/ess3/commands/Commandmsg.java @@ -1,14 +1,14 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Set; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.Console; -import static net.ess3.I18n._; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandmsg extends EssentialsCommand @@ -57,7 +57,7 @@ public class Commandmsg extends EssentialsCommand Console.getConsoleReplyTo().setReplyTo(sender); return; } - + final Set<IUser> matchedPlayers = ess.getUserMap().matchUsers(args[0], false); @@ -70,7 +70,7 @@ public class Commandmsg extends EssentialsCommand if (isUser(sender)) { int i = 0; - + for (IUser u : matchedPlayers) { if (!player.canSee(u.getPlayer())) diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index 8e23855d4..a80b61f0a 100644 --- a/Essentials/src/net/ess3/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import org.bukkit.command.CommandSender; public class Commandmute extends EssentialsCommand @@ -38,16 +38,10 @@ public class Commandmute extends EssentialsCommand player.setTimestamp(TimestampType.MUTE, muteTimestamp); final boolean muted = player.getData().isMuted(); sender.sendMessage( - muted - ? (muteTimestamp > 0 - ? _("mutedPlayerFor", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)) - : _("mutedPlayer", player.getPlayer().getDisplayName())) - : _("unmutedPlayer", player.getPlayer().getDisplayName())); + muted ? (muteTimestamp > 0 ? _("mutedPlayerFor", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)) : _( + "mutedPlayer", player.getPlayer().getDisplayName())) : _( + "unmutedPlayer", player.getPlayer().getDisplayName())); player.sendMessage( - muted - ? (muteTimestamp > 0 - ? _("playerMutedFor", DateUtil.formatDateDiff(muteTimestamp)) - : _("playerMuted")) - : _("playerUnmuted")); + muted ? (muteTimestamp > 0 ? _("playerMutedFor", DateUtil.formatDateDiff(muteTimestamp)) : _("playerMuted")) : _("playerUnmuted")); } } diff --git a/Essentials/src/net/ess3/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java index db22e249f..5f0536af6 100644 --- a/Essentials/src/net/ess3/commands/Commandnear.java +++ b/Essentials/src/net/ess3/commands/Commandnear.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandnear extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java index ceb7d15a4..c5cbf45dd 100644 --- a/Essentials/src/net/ess3/commands/Commandnick.java +++ b/Essentials/src/net/ess3/commands/Commandnick.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandnick extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java index a2f48b7a2..623bf8400 100644 --- a/Essentials/src/net/ess3/commands/Commandpay.java +++ b/Essentials/src/net/ess3/commands/Commandpay.java @@ -5,7 +5,6 @@ import net.ess3.api.IUser; import net.ess3.economy.Trade; - public class Commandpay extends EssentialsCommand { @Override @@ -17,8 +16,9 @@ public class Commandpay extends EssentialsCommand } final double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", "")); - - if (amount <= 0 || Double.isNaN(amount) || Double.isInfinite(amount)) { + + if (amount <= 0 || Double.isNaN(amount) || Double.isInfinite(amount)) + { user.sendMessage(_("invalidAmount")); } @@ -26,7 +26,9 @@ public class Commandpay extends EssentialsCommand for (IUser u : ess.getUserMap().matchUsers(args[0], true)) { user.payUser(u, amount); - Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), u.getName(), new Trade(amount, ess), user.getPlayer().getLocation(), ess); + Trade.log( + "Command", "Pay", "Player", user.getName(), new Trade(amount, ess), u.getName(), new Trade(amount, ess), user.getPlayer().getLocation(), + ess); foundUser = true; } diff --git a/Essentials/src/net/ess3/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java index b4b1ce6ad..d0f5b0244 100644 --- a/Essentials/src/net/ess3/commands/Commandpowertool.java +++ b/Essentials/src/net/ess3/commands/Commandpowertool.java @@ -1,15 +1,15 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static net.ess3.I18n._; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData; import net.ess3.utils.Util; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; public class Commandpowertool extends EssentialsCommand @@ -57,7 +57,7 @@ public class Commandpowertool extends EssentialsCommand { throw new Exception(_("powerToolNoSuchCommandAssigned", command, itemName)); } - + powertools = new ArrayList<String>(powertools); powertools.remove(command); user.sendMessage(_("powerToolRemove", command, itemName)); diff --git a/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java index 9ae6b5e3f..1d105e056 100644 --- a/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java +++ b/Essentials/src/net/ess3/commands/Commandpowertooltoggle.java @@ -18,8 +18,7 @@ public class Commandpowertooltoggle extends EssentialsCommand } userData.setPowerToolsEnabled(!userData.isPowerToolsEnabled()); user.queueSave(); - user.sendMessage(userData.isPowerToolsEnabled() - ? _("powerToolsEnabled") - : _("powerToolsDisabled")); + user.sendMessage( + userData.isPowerToolsEnabled() ? _("powerToolsEnabled") : _("powerToolsDisabled")); } } diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java index ee0e6be50..c339c6552 100644 --- a/Essentials/src/net/ess3/commands/Commandptime.java +++ b/Essentials/src/net/ess3/commands/Commandptime.java @@ -1,19 +1,19 @@ package net.ess3.commands; -import java.util.*; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; -import net.ess3.utils.DescParseTickFormat; +import java.util.*; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.utils.DescParseTickFormat; public class Commandptime extends EssentialsCommand { public static final Set<String> getAliases = new HashSet<String>(); - + static { getAliases.add("get"); @@ -21,7 +21,7 @@ public class Commandptime extends EssentialsCommand getAliases.add("show"); getAliases.add("display"); } - + @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { @@ -39,14 +39,14 @@ public class Commandptime extends EssentialsCommand getUsersTime(sender, users); return; } - + IUser user = isUser(sender) ? getUser(sender) : null; if ((!users.contains(user) || users.size() > 1) && user != null && !Permissions.PTIME_OTHERS.isAuthorized(user)) { user.sendMessage(_("pTimeOthersPermission")); return; } - + Long ticks; // Parse the target time int ticks from args[0] String timeParam = args[0]; @@ -56,7 +56,7 @@ public class Commandptime extends EssentialsCommand relative = false; timeParam = timeParam.substring(1); } - + if (getAliases.contains(timeParam)) { getUsersTime(sender, users); @@ -77,7 +77,7 @@ public class Commandptime extends EssentialsCommand throw new NotEnoughArgumentsException(e); } } - + setUsersTime(sender, users, ticks, relative); } @@ -90,7 +90,7 @@ public class Commandptime extends EssentialsCommand { sender.sendMessage(_("pTimePlayers")); } - + for (IUser user : users) { if (user.getPlayer().getPlayerTimeOffset() == 0) @@ -143,7 +143,7 @@ public class Commandptime extends EssentialsCommand user.getPlayer().setPlayerTime(time, relative); } } - + final StringBuilder msg = new StringBuilder(); for (IUser user : users) { @@ -151,7 +151,7 @@ public class Commandptime extends EssentialsCommand { msg.append(", "); } - + msg.append(user.getName()); } @@ -205,7 +205,7 @@ public class Commandptime extends EssentialsCommand { user = ess.getUserMap().getUser(matchedPlayers.get(0)); } - + if (user != null) { users.add(user); @@ -223,7 +223,7 @@ public class Commandptime extends EssentialsCommand { throw new Exception(_("playerNotFound")); } - + return users; } } diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java index 92aabfd8a..cdee6a53e 100644 --- a/Essentials/src/net/ess3/commands/Commandr.java +++ b/Essentials/src/net/ess3/commands/Commandr.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import net.ess3.Console; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; +import net.ess3.Console; import net.ess3.api.IReplyTo; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.utils.FormatUtil; -import org.bukkit.command.CommandSender; public class Commandr extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java index afbf82cc9..b71d1618c 100644 --- a/Essentials/src/net/ess3/commands/Commandrealname.java +++ b/Essentials/src/net/ess3/commands/Commandrealname.java @@ -1,12 +1,12 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.api.IUser; import net.ess3.api.IUserMap; import net.ess3.utils.FormatUtil; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandrealname extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java index d273bd9cd..051f698e7 100644 --- a/Essentials/src/net/ess3/commands/Commandrecipe.java +++ b/Essentials/src/net/ess3/commands/Commandrecipe.java @@ -1,17 +1,16 @@ package net.ess3.commands; import static net.ess3.I18n._; - -import net.ess3.api.IUser; -import net.ess3.utils.Util; -import org.bukkit.Material; -import org.bukkit.command.CommandSender; -import org.bukkit.inventory.*; - import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import org.bukkit.Material; +import org.bukkit.command.CommandSender; +import org.bukkit.inventory.*; +import net.ess3.api.IUser; +import net.ess3.utils.Util; + public class Commandrecipe extends EssentialsCommand { @@ -49,15 +48,15 @@ public class Commandrecipe extends EssentialsCommand sender.sendMessage(_("recipe", getMaterialName(item), recipeNo + 1, recipes.size())); if (recipe instanceof FurnaceRecipe) { - furnaceRecipe(sender, (FurnaceRecipe) recipe); + furnaceRecipe(sender, (FurnaceRecipe)recipe); } else if (recipe instanceof ShapedRecipe) { - shapedRecipe(sender, (ShapedRecipe) recipe); + shapedRecipe(sender, (ShapedRecipe)recipe); } else if (recipe instanceof ShapelessRecipe) { - shapelessRecipe(sender, (ShapelessRecipe) recipe); + shapelessRecipe(sender, (ShapelessRecipe)recipe); } if (recipes.size() > 1 && args.length == 1) { diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java index 746249396..7fc3d1a80 100644 --- a/Essentials/src/net/ess3/commands/Commandremove.java +++ b/Essentials/src/net/ess3/commands/Commandremove.java @@ -1,12 +1,13 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.api.IUser; +import java.util.Locale; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.*; +import net.ess3.api.IUser; + //Todo: Fix this up public class Commandremove extends EssentialsCommand @@ -88,7 +89,7 @@ public class Commandremove extends EssentialsCommand { radius *= radius; } - + for (Chunk chunk : world.getLoadedChunks()) { for (Entity e : chunk.getEntities()) @@ -100,49 +101,50 @@ public class Commandremove extends EssentialsCommand continue; } } - switch (toRemove) { - case DROPS: - if (e instanceof Item) - { - e.remove(); - removed++; - } - break; - case ARROWS: - if (e instanceof Projectile) - { - e.remove(); - removed++; - } - break; - case BOATS: - if (e instanceof Boat) - { - e.remove(); - removed++; - } - break; - case MINECARTS: - if (e instanceof Minecart) - { - e.remove(); - removed++; - } - break; - case PAINTINGS: - if (e instanceof Painting) - { - e.remove(); - removed++; - } - break; - case XP: - if (e instanceof ExperienceOrb) - { - e.remove(); - removed++; - } - break; + switch (toRemove) + { + case DROPS: + if (e instanceof Item) + { + e.remove(); + removed++; + } + break; + case ARROWS: + if (e instanceof Projectile) + { + e.remove(); + removed++; + } + break; + case BOATS: + if (e instanceof Boat) + { + e.remove(); + removed++; + } + break; + case MINECARTS: + if (e instanceof Minecart) + { + e.remove(); + removed++; + } + break; + case PAINTINGS: + if (e instanceof Painting) + { + e.remove(); + removed++; + } + break; + case XP: + if (e instanceof ExperienceOrb) + { + e.remove(); + removed++; + } + break; } } diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java index c0a9515d7..42d5fad0a 100644 --- a/Essentials/src/net/ess3/commands/Commandrepair.java +++ b/Essentials/src/net/ess3/commands/Commandrepair.java @@ -1,16 +1,16 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static net.ess3.I18n._; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; import net.ess3.api.ChargeException; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; public class Commandrepair extends EssentialsCommand @@ -31,8 +31,7 @@ public class Commandrepair extends EssentialsCommand throw new Exception(_("repairInvalidType")); } - if (!item.getEnchantments().isEmpty() - && !Permissions.REPAIR_ENCHANTED.isAuthorized(user)) + if (!item.getEnchantments().isEmpty() && !Permissions.REPAIR_ENCHANTED.isAuthorized(user)) { throw new Exception(_("repairEnchanted")); } @@ -112,8 +111,7 @@ public class Commandrepair extends EssentialsCommand user.sendMessage(ex.getMessage()); continue; } - if (!item.getEnchantments().isEmpty() - && !Permissions.REPAIR_ENCHANTED.isAuthorized(user)) + if (!item.getEnchantments().isEmpty() && !Permissions.REPAIR_ENCHANTED.isAuthorized(user)) { continue; } diff --git a/Essentials/src/net/ess3/commands/Commandrules.java b/Essentials/src/net/ess3/commands/Commandrules.java index 1e15a6097..e382fe631 100644 --- a/Essentials/src/net/ess3/commands/Commandrules.java +++ b/Essentials/src/net/ess3/commands/Commandrules.java @@ -1,10 +1,10 @@ package net.ess3.commands; +import org.bukkit.command.CommandSender; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; import net.ess3.utils.textreader.TextPager; -import org.bukkit.command.CommandSender; public class Commandrules extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index efb5357a0..aca131cd6 100644 --- a/Essentials/src/net/ess3/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -1,28 +1,29 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.PlayerNotFoundException; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import org.bukkit.command.CommandSender; + public class Commandseen extends EssentialsCommand { @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { - seen(sender,args,true); + seen(sender, args, true); } - + @Override protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception { - seen(user,args,Permissions.SEEN_BANREASON.isAuthorized(user)); + seen(user, args, Permissions.SEEN_BANREASON.isAuthorized(user)); } - - protected void seen (final CommandSender sender, final String[] args, final boolean show) throws Exception + + protected void seen(final CommandSender sender, final String[] args, final boolean show) throws Exception { if (args.length < 1) { @@ -30,7 +31,7 @@ public class Commandseen extends EssentialsCommand } try { - final IUser u = ess.getUserMap().matchUserExcludingHidden(args[0], getPlayerOrNull(sender)); + final IUser u = ess.getUserMap().matchUserExcludingHidden(args[0], getPlayerOrNull(sender)); sender.sendMessage(_("seenOnline", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN)))); } catch (PlayerNotFoundException e) diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java index 8c3b073f6..8e1989bad 100644 --- a/Essentials/src/net/ess3/commands/Commandsell.java +++ b/Essentials/src/net/ess3/commands/Commandsell.java @@ -1,16 +1,15 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.logging.Level; -import static net.ess3.I18n._; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.economy.Trade; import net.ess3.utils.FormatUtil; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - public class Commandsell extends EssentialsCommand @@ -140,7 +139,7 @@ public class Commandsell extends EssentialsCommand } final Player player = user.getPlayer(); - + //TODO: Prices for Enchantments final ItemStack ris = is.clone(); ris.setAmount(amount); @@ -148,8 +147,14 @@ public class Commandsell extends EssentialsCommand player.updateInventory(); Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(worth * amount, ess), player.getLocation(), ess); user.giveMoney(worth * amount); - user.sendMessage(_("itemSold", FormatUtil.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), FormatUtil.displayCurrency(worth, ess))); - logger.log(Level.INFO, _("itemSoldConsole", player.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess))); + user.sendMessage( + _( + "itemSold", FormatUtil.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), + FormatUtil.displayCurrency(worth, ess))); + logger.log( + Level.INFO, _( + "itemSoldConsole", player.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), + FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess))); } } diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index 743cbb611..5477d2a05 100644 --- a/Essentials/src/net/ess3/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -1,8 +1,8 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.regex.Pattern; -import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; @@ -31,8 +31,7 @@ public class Commandsethome extends EssentialsCommand { throw new NotEnoughArgumentsException(); } - if ((user.getHomes().size() < ess.getRanks().getHomeLimit(user)) - || (user.getHomes().contains(args[0].toLowerCase(Locale.ENGLISH)))) + if ((user.getHomes().size() < ess.getRanks().getHomeLimit(user)) || (user.getHomes().contains(args[0].toLowerCase(Locale.ENGLISH)))) { user.getData().addHome(args[0].toLowerCase(Locale.ENGLISH), user.getPlayer().getLocation()); user.queueSave(); @@ -77,7 +76,10 @@ public class Commandsethome extends EssentialsCommand user.getData().addHome("home", user.getPlayer().getLocation()); user.queueSave(); } - user.sendMessage(_("homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(), user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ())); + user.sendMessage( + _( + "homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(), + user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ())); } } diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java index 91d90c1a2..38ba6c7a6 100644 --- a/Essentials/src/net/ess3/commands/Commandsetwarp.java +++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java @@ -1,13 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.Location; import net.ess3.api.IUser; import net.ess3.api.IWarps; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import org.bukkit.Location; - - public class Commandsetwarp extends EssentialsCommand @@ -38,7 +36,7 @@ public class Commandsetwarp extends EssentialsCommand } if (warpLoc == null || Permissions.WARP_OVERWRITE.isAuthorized(user, args[0])) - + { warps.setWarp(args[0], loc); } diff --git a/Essentials/src/net/ess3/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java index fca384aa6..0e9fe6f74 100644 --- a/Essentials/src/net/ess3/commands/Commandsetworth.java +++ b/Essentials/src/net/ess3/commands/Commandsetworth.java @@ -1,10 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; - +import net.ess3.api.IUser; public class Commandsetworth extends EssentialsCommand @@ -33,7 +32,7 @@ public class Commandsetworth extends EssentialsCommand ess.getWorth().setPrice(stack, Double.parseDouble(price)); user.sendMessage(_("worthSet")); - } + } @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception diff --git a/Essentials/src/net/ess3/commands/Commandsocialspy.java b/Essentials/src/net/ess3/commands/Commandsocialspy.java index a16ed75b4..a61b632d0 100644 --- a/Essentials/src/net/ess3/commands/Commandsocialspy.java +++ b/Essentials/src/net/ess3/commands/Commandsocialspy.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import org.bukkit.command.CommandSender; public class Commandsocialspy extends EssentialsToggleCommand @@ -22,10 +22,12 @@ public class Commandsocialspy extends EssentialsToggleCommand protected void informSender(final CommandSender sender, final boolean value, final IUser player) { - if (value) { - sender.sendMessage( _("socialSpyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName())); + if (value) + { + sender.sendMessage(_("socialSpyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName())); } - else { + else + { sender.sendMessage(_("socialSpyFailed", player.getName())); } } diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java index 2504a1576..7d473d64f 100644 --- a/Essentials/src/net/ess3/commands/Commandspawn.java +++ b/Essentials/src/net/ess3/commands/Commandspawn.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.permissions.Permissions; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; public class Commandspawn extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandspawner.java b/Essentials/src/net/ess3/commands/Commandspawner.java index 403af7bed..fe41256ff 100644 --- a/Essentials/src/net/ess3/commands/Commandspawner.java +++ b/Essentials/src/net/ess3/commands/Commandspawner.java @@ -1,17 +1,17 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.CreatureSpawner; +import org.bukkit.entity.EntityType; import net.ess3.api.IUser; import net.ess3.bukkit.LivingEntities; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.LocationUtil; import net.ess3.utils.Util; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.CreatureSpawner; -import org.bukkit.entity.EntityType; public class Commandspawner extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandspeed.java b/Essentials/src/net/ess3/commands/Commandspeed.java index a8d59016f..c8da94bb6 100644 --- a/Essentials/src/net/ess3/commands/Commandspeed.java +++ b/Essentials/src/net/ess3/commands/Commandspeed.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandspeed extends EssentialsCommand @@ -60,8 +60,8 @@ public class Commandspeed extends EssentialsCommand //if (isFly) //{ - user.getPlayer().setFlySpeed((float)getRealMoveSpeed(speed, isFly, isBypass)); - user.sendMessage(_("moveSpeed", _("flying"), speed, user.getPlayer().getDisplayName())); + user.getPlayer().setFlySpeed((float)getRealMoveSpeed(speed, isFly, isBypass)); + user.sendMessage(_("moveSpeed", _("flying"), speed, user.getPlayer().getDisplayName())); //} //else //{ @@ -80,10 +80,10 @@ public class Commandspeed extends EssentialsCommand sender.sendMessage(_("moveSpeed", _("flying"), speed, matchPlayer.getDisplayName())); } //else - // { - // matchPlayer.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass)); - // sender.sendMessage(_("moveSpeed", _("walking"), speed, matchPlayer.getDisplayName())); - // } + // { + // matchPlayer.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass)); + // sender.sendMessage(_("moveSpeed", _("walking"), speed, matchPlayer.getDisplayName())); + // } } } @@ -94,8 +94,7 @@ public class Commandspeed extends EssentialsCommand { isFlyMode = true; } - else if (modeString.contains("walk") || modeString.contains("run") - || modeString.equalsIgnoreCase("w") || modeString.equalsIgnoreCase("r")) + else if (modeString.contains("walk") || modeString.contains("run") || modeString.equalsIgnoreCase("w") || modeString.equalsIgnoreCase("r")) { isFlyMode = false; } diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java index fdbc9a07f..be5fc75ce 100644 --- a/Essentials/src/net/ess3/commands/Commandsudo.java +++ b/Essentials/src/net/ess3/commands/Commandsudo.java @@ -1,13 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; - import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; import org.bukkit.entity.Player; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandsudo extends EssentialsCommand @@ -32,10 +31,10 @@ public class Commandsudo extends EssentialsCommand { throw new Exception(_("sudoExempt")); } - + final Player player = user.getPlayer(); sender.sendMessage(_("sudoRun", player.getDisplayName(), command, getFinalArg(arguments, 0))); - + final Server server = ess.getServer(); server.dispatchCommand(user, command); final PluginCommand execCommand = server.getPluginCommand(command); diff --git a/Essentials/src/net/ess3/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java index bc721844e..7fe2b4fe9 100644 --- a/Essentials/src/net/ess3/commands/Commandsuicide.java +++ b/Essentials/src/net/ess3/commands/Commandsuicide.java @@ -1,9 +1,7 @@ package net.ess3.commands; import static net.ess3.I18n._; - import org.bukkit.entity.Player; - import net.ess3.api.IUser; @@ -16,6 +14,6 @@ public class Commandsuicide extends EssentialsCommand ess.getPlugin().callSuicideEvent(player); user.getPlayer().damage(player.getHealth()); user.sendMessage(_("suicideMessage")); - ess.broadcastMessage(user,_("suicideSuccess", player.getDisplayName())); + ess.broadcastMessage(user, _("suicideSuccess", player.getDisplayName())); } } diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java index a600e4ca1..98201228b 100644 --- a/Essentials/src/net/ess3/commands/Commandtempban.java +++ b/Essentials/src/net/ess3/commands/Commandtempban.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import net.ess3.Console; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import net.ess3.Console; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.Ban; import net.ess3.user.UserData; import net.ess3.utils.DateUtil; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandtempban extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java index 5c2c472a0..ee30a631d 100644 --- a/Essentials/src/net/ess3/commands/Commandthunder.java +++ b/Essentials/src/net/ess3/commands/Commandthunder.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.World; +import net.ess3.api.IUser; public class Commandthunder extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java index 68decf47f..c56a55af4 100644 --- a/Essentials/src/net/ess3/commands/Commandtime.java +++ b/Essentials/src/net/ess3/commands/Commandtime.java @@ -1,13 +1,13 @@ package net.ess3.commands; -import java.util.*; import static net.ess3.I18n._; -import net.ess3.permissions.Permissions; -import net.ess3.utils.DescParseTickFormat; -import net.ess3.utils.Util; +import java.util.*; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.permissions.Permissions; +import net.ess3.utils.DescParseTickFormat; +import net.ess3.utils.Util; public class Commandtime extends EssentialsCommand @@ -91,7 +91,8 @@ public class Commandtime extends EssentialsCommand while (iterator.hasNext()) { World world = iterator.next(); - if (!Permissions.TIME_WORLDS.isAuthorized(sender, world.getName())) { + if (!Permissions.TIME_WORLDS.isAuthorized(sender, world.getName())) + { iterator.remove(); sender.sendMessage(_("timeWorldFailed", world.getName())); continue; @@ -104,7 +105,8 @@ public class Commandtime extends EssentialsCommand world.setTime(time + (add ? 0 : 24000) + ticks); } - if (worlds.isEmpty()) { + if (worlds.isEmpty()) + { return; } final StringBuilder output = new StringBuilder(); diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java index 667a4a551..9c01905c8 100644 --- a/Essentials/src/net/ess3/commands/Commandtogglejail.java +++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import org.bukkit.command.CommandSender; public class Commandtogglejail extends EssentialsCommand @@ -58,9 +58,8 @@ public class Commandtogglejail extends EssentialsCommand player.setTimestamp(TimestampType.JAIL, timeDiff); } player.queueSave(); - sender.sendMessage((timeDiff > 0 - ? _("playerJailedFor", player.getName(), DateUtil.formatDateDiff(timeDiff)) - : _("playerJailed", player.getName()))); + sender.sendMessage( + (timeDiff > 0 ? _("playerJailedFor", player.getName(), DateUtil.formatDateDiff(timeDiff)) : _("playerJailed", player.getName()))); return; } diff --git a/Essentials/src/net/ess3/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java index 6aa9f8f06..35ba051bc 100644 --- a/Essentials/src/net/ess3/commands/Commandtop.java +++ b/Essentials/src/net/ess3/commands/Commandtop.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class Commandtop extends EssentialsCommand @@ -18,7 +18,9 @@ public class Commandtop extends EssentialsCommand final int topX = playerLocation.getBlockX(); final int topZ = playerLocation.getBlockZ(); final int topY = playerLocation.getWorld().getHighestBlockYAt(topX, topZ); - user.getTeleport().teleport(new Location(player.getWorld(), topX, topY + 1, topZ, playerLocation.getYaw(), playerLocation.getPitch()), new Trade(commandName, ess), TeleportCause.COMMAND); + user.getTeleport().teleport( + new Location(player.getWorld(), topX, topY + 1, topZ, playerLocation.getYaw(), playerLocation.getPitch()), new Trade(commandName, ess), + TeleportCause.COMMAND); user.sendMessage(_("teleportTop")); } } diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java index 66aa5d604..f3e693949 100644 --- a/Essentials/src/net/ess3/commands/Commandtp.java +++ b/Essentials/src/net/ess3/commands/Commandtp.java @@ -1,13 +1,13 @@ package net.ess3.commands; -import net.ess3.Console; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import net.ess3.Console; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; -import org.bukkit.command.CommandSender; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtp extends EssentialsCommand @@ -27,8 +27,8 @@ public class Commandtp extends EssentialsCommand { throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName())); } - if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() - && !Permissions.WORLD.isAuthorized(user, player.getPlayer().getWorld().getName())) + if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized( + user, player.getPlayer().getWorld().getName())) { throw new Exception(_("noPerm", "essentials.world." + player.getPlayer().getWorld().getName())); } @@ -44,9 +44,9 @@ public class Commandtp extends EssentialsCommand throw new Exception(_("needTpohere")); } user.sendMessage(_("teleporting")); - + final IUser target = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer()); - + final IUser toPlayer = ess.getUserMap().matchUserExcludingHidden(args[1], user.getPlayer()); if (!target.getData().isTeleportEnabled()) @@ -57,8 +57,8 @@ public class Commandtp extends EssentialsCommand { throw new Exception(_("teleportDisabled", toPlayer.getPlayer().getDisplayName())); } - if (target.getPlayer().getWorld() != toPlayer.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() - && !Permissions.WORLD.isAuthorized(user, toPlayer.getPlayer().getWorld().getName())) + if (target.getPlayer().getWorld() != toPlayer.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized( + user, toPlayer.getPlayer().getWorld().getName())) { throw new Exception(_("noPerm", "essentials.world." + toPlayer.getPlayer().getWorld().getName())); } diff --git a/Essentials/src/net/ess3/commands/Commandtpa.java b/Essentials/src/net/ess3/commands/Commandtpa.java index bacb13bb0..ac7d9205b 100644 --- a/Essentials/src/net/ess3/commands/Commandtpa.java +++ b/Essentials/src/net/ess3/commands/Commandtpa.java @@ -16,16 +16,16 @@ public class Commandtpa extends EssentialsCommand throw new NotEnoughArgumentsException(); } - + IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer()); if (!player.getData().isTeleportEnabled()) { throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName())); } - + ISettings settings = ess.getSettings(); - if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions() - && !Permissions.WORLD.isAuthorized(user, user.getPlayer().getWorld().getName())) + if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized( + user, user.getPlayer().getWorld().getName())) { throw new Exception(_("noPerm", "essentials.world." + player.getPlayer().getWorld().getName())); } diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java index ab3d5a364..58d5157d5 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaall.java +++ b/Essentials/src/net/ess3/commands/Commandtpaall.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandtpaall extends EssentialsCommand @@ -32,7 +32,7 @@ public class Commandtpaall extends EssentialsCommand sender.sendMessage(_("teleportAAll")); for (Player onlinePlayer : server.getOnlinePlayers()) { - + final IUser player = ess.getUserMap().getUser(onlinePlayer); if (user == player) { @@ -42,10 +42,10 @@ public class Commandtpaall extends EssentialsCommand { continue; } - + ISettings settings = ess.getSettings(); - if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() - && !Permissions.WORLD.isAuthorized(user, user.getPlayer().getWorld().getName())) + if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized( + user, user.getPlayer().getWorld().getName())) { continue; } diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java index b8a9ee54f..b2fa20226 100644 --- a/Essentials/src/net/ess3/commands/Commandtpaccept.java +++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtpaccept extends EssentialsCommand @@ -19,10 +19,8 @@ public class Commandtpaccept extends EssentialsCommand } final IUser target = user.getTeleportRequester(); - if (target == null - || !target.isOnline() - || (user.isTpRequestHere() && !Permissions.TPAHERE.isAuthorized(target)) - || (!user.isTpRequestHere() && !Permissions.TPA.isAuthorized(target) && !Permissions.TPAALL.isAuthorized(target))) + if (target == null || !target.isOnline() || (user.isTpRequestHere() && !Permissions.TPAHERE.isAuthorized( + target)) || (!user.isTpRequestHere() && !Permissions.TPA.isAuthorized(target) && !Permissions.TPAALL.isAuthorized(target))) { throw new Exception(_("noPendingRequest")); } diff --git a/Essentials/src/net/ess3/commands/Commandtpahere.java b/Essentials/src/net/ess3/commands/Commandtpahere.java index df8a8e679..f25b8c0b3 100644 --- a/Essentials/src/net/ess3/commands/Commandtpahere.java +++ b/Essentials/src/net/ess3/commands/Commandtpahere.java @@ -16,16 +16,16 @@ public class Commandtpahere extends EssentialsCommand throw new NotEnoughArgumentsException(); } - + final IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer()); if (!player.getData().isTeleportEnabled()) { throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName())); } - + ISettings settings = ess.getSettings(); - if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() - && !Permissions.WORLD.isAuthorized(user, user.getPlayer().getWorld().getName())) + if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized( + user, user.getPlayer().getWorld().getName())) { throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName())); } diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java index 9bc3eab02..5def2fa11 100644 --- a/Essentials/src/net/ess3/commands/Commandtpall.java +++ b/Essentials/src/net/ess3/commands/Commandtpall.java @@ -1,12 +1,12 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; public class Commandtpall extends EssentialsCommand @@ -38,11 +38,11 @@ public class Commandtpall extends EssentialsCommand { continue; } - + ISettings settings = ess.getSettings(); - if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() - && !Permissions.WORLD.isAuthorized(user, user.getPlayer().getWorld().getName())) + if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized( + user, user.getPlayer().getWorld().getName())) { continue; } diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java index 7cacbd9e9..6c7e58fc8 100644 --- a/Essentials/src/net/ess3/commands/Commandtphere.java +++ b/Essentials/src/net/ess3/commands/Commandtphere.java @@ -1,22 +1,22 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.economy.Trade; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtphere extends EssentialsCommand { @Override public void run(final IUser user, final String commandLabel, final String[] args) throws Exception - { + { final IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer()); if (!player.getData().isTeleportEnabled()) { throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName())); } - + user.getTeleport().teleportToMe(player, new Trade(commandName, ess), TeleportCause.COMMAND); user.sendMessage(_("teleporting")); player.sendMessage(_("teleporting")); diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java index 0ca3df387..d4ccc7f32 100644 --- a/Essentials/src/net/ess3/commands/Commandtpo.java +++ b/Essentials/src/net/ess3/commands/Commandtpo.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtpo extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java index db6adfdab..f489fed2e 100644 --- a/Essentials/src/net/ess3/commands/Commandtpohere.java +++ b/Essentials/src/net/ess3/commands/Commandtpohere.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandtpohere extends EssentialsCommand @@ -19,11 +19,11 @@ public class Commandtpohere extends EssentialsCommand //Just basically the old tphere command final IUser player = ess.getUserMap().matchUser(args[0], false); - + ISettings settings = ess.getSettings(); //todo - common method - if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() - && !Permissions.WORLD.isAuthorized(player, user.getPlayer().getWorld().getName())) + if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized( + player, user.getPlayer().getWorld().getName())) { throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName())); } diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java index 6dfbc901d..61bb4699d 100644 --- a/Essentials/src/net/ess3/commands/Commandtppos.java +++ b/Essentials/src/net/ess3/commands/Commandtppos.java @@ -1,11 +1,11 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; public class Commandtppos extends EssentialsCommand @@ -30,7 +30,7 @@ public class Commandtppos extends EssentialsCommand { location.setPitch(Float.parseFloat(args[4])); } - if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) + if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { throw new NotEnoughArgumentsException(_("tpposTooFar")); } @@ -62,7 +62,7 @@ public class Commandtppos extends EssentialsCommand { location.setPitch(Float.parseFloat(args[5])); } - if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) + if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { throw new NotEnoughArgumentsException(_("tpposTooFar")); } diff --git a/Essentials/src/net/ess3/commands/Commandtree.java b/Essentials/src/net/ess3/commands/Commandtree.java index 435b37103..60767ff91 100644 --- a/Essentials/src/net/ess3/commands/Commandtree.java +++ b/Essentials/src/net/ess3/commands/Commandtree.java @@ -1,10 +1,10 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.utils.LocationUtil; import org.bukkit.Location; import org.bukkit.TreeType; +import net.ess3.api.IUser; +import net.ess3.utils.LocationUtil; public class Commandtree extends EssentialsCommand @@ -44,7 +44,7 @@ public class Commandtree extends EssentialsCommand else if (args[0].equalsIgnoreCase("junglebush")) { tree = TreeType.JUNGLE_BUSH; - } + } else if (args[0].equalsIgnoreCase("swamp")) { tree = TreeType.SWAMP; diff --git a/Essentials/src/net/ess3/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java index d6a6d3b12..ad4351c64 100644 --- a/Essentials/src/net/ess3/commands/Commandunban.java +++ b/Essentials/src/net/ess3/commands/Commandunban.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; +import net.ess3.api.IUser; public class Commandunban extends EssentialsCommand @@ -15,7 +15,7 @@ public class Commandunban extends EssentialsCommand throw new NotEnoughArgumentsException(); } - + final IUser player = ess.getUserMap().matchUser(args[0], true); player.getData().setBan(null); player.setBanned(false); diff --git a/Essentials/src/net/ess3/commands/Commandunbanip.java b/Essentials/src/net/ess3/commands/Commandunbanip.java index 325edea64..51e938a08 100644 --- a/Essentials/src/net/ess3/commands/Commandunbanip.java +++ b/Essentials/src/net/ess3/commands/Commandunbanip.java @@ -1,8 +1,8 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; +import net.ess3.api.IUser; public class Commandunbanip extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java index db6d17f66..a1d978728 100644 --- a/Essentials/src/net/ess3/commands/Commandunlimited.java +++ b/Essentials/src/net/ess3/commands/Commandunlimited.java @@ -1,13 +1,13 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.Locale; import java.util.Set; -import static net.ess3.I18n._; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.permissions.Permissions; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; public class Commandunlimited extends EssentialsCommand @@ -20,7 +20,7 @@ public class Commandunlimited extends EssentialsCommand throw new NotEnoughArgumentsException(); } - + IUser target = user; if (args.length > 1 && Permissions.UNLIMITED_OTHERS.isAuthorized(user)) diff --git a/Essentials/src/net/ess3/commands/Commandwarp.java b/Essentials/src/net/ess3/commands/Commandwarp.java index ed862171d..ea3b8ca98 100644 --- a/Essentials/src/net/ess3/commands/Commandwarp.java +++ b/Essentials/src/net/ess3/commands/Commandwarp.java @@ -1,17 +1,17 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; -import static net.ess3.I18n._; +import org.bukkit.command.CommandSender; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.IUser; import net.ess3.api.IWarps; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.utils.Util; -import org.bukkit.command.CommandSender; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class Commandwarp extends EssentialsCommand @@ -35,9 +35,12 @@ public class Commandwarp extends EssentialsCommand IUser otherUser = null; if (args.length == 2 && Permissions.WARP_OTHERS.isAuthorized(user)) { - if (Permissions.WARP_HIDDEN.isAuthorized(user)) { + if (Permissions.WARP_HIDDEN.isAuthorized(user)) + { otherUser = ess.getUserMap().matchUser(args[1], false); - } else { + } + else + { otherUser = ess.getUserMap().matchUserExcludingHidden(args[1], user.getPlayer()); } warpUser(otherUser, args[0]); diff --git a/Essentials/src/net/ess3/commands/Commandweather.java b/Essentials/src/net/ess3/commands/Commandweather.java index 93309e2e6..6d6ae6756 100644 --- a/Essentials/src/net/ess3/commands/Commandweather.java +++ b/Essentials/src/net/ess3/commands/Commandweather.java @@ -1,9 +1,9 @@ package net.ess3.commands; import static net.ess3.I18n._; -import net.ess3.api.IUser; import org.bukkit.World; import org.bukkit.command.CommandSender; +import net.ess3.api.IUser; public class Commandweather extends EssentialsCommand @@ -24,16 +24,14 @@ public class Commandweather extends EssentialsCommand world.setStorm(isStorm ? true : false); world.setWeatherDuration(Integer.parseInt(args[1]) * 20); - user.sendMessage(isStorm - ? _("weatherStormFor", world.getName(), args[1]) - : _("weatherSunFor", world.getName(), args[1])); + user.sendMessage( + isStorm ? _("weatherStormFor", world.getName(), args[1]) : _("weatherSunFor", world.getName(), args[1])); } else { world.setStorm(isStorm ? true : false); - user.sendMessage(isStorm - ? _("weatherStorm", world.getName()) - : _("weatherSun", world.getName())); + user.sendMessage( + isStorm ? _("weatherStorm", world.getName()) : _("weatherSun", world.getName())); } } @@ -56,16 +54,14 @@ public class Commandweather extends EssentialsCommand world.setStorm(isStorm ? true : false); world.setWeatherDuration(Integer.parseInt(args[2]) * 20); - sender.sendMessage(isStorm - ? _("weatherStormFor", world.getName(), args[2]) - : _("weatherSunFor", world.getName(), args[2])); + sender.sendMessage( + isStorm ? _("weatherStormFor", world.getName(), args[2]) : _("weatherSunFor", world.getName(), args[2])); } else { world.setStorm(isStorm ? true : false); - sender.sendMessage(isStorm - ? _("weatherStorm", world.getName()) - : _("weatherSun", world.getName())); + sender.sendMessage( + isStorm ? _("weatherStorm", world.getName()) : _("weatherSun", world.getName())); } } } diff --git a/Essentials/src/net/ess3/commands/Commandwhois.java b/Essentials/src/net/ess3/commands/Commandwhois.java index 4ff6ac381..7204410d7 100644 --- a/Essentials/src/net/ess3/commands/Commandwhois.java +++ b/Essentials/src/net/ess3/commands/Commandwhois.java @@ -1,7 +1,9 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.craftbukkit.SetExpFix; @@ -9,8 +11,6 @@ import net.ess3.permissions.Permissions; import net.ess3.user.UserData; import net.ess3.utils.DateUtil; import net.ess3.utils.FormatUtil; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Commandwhois extends EssentialsCommand @@ -49,9 +49,7 @@ public class Commandwhois extends EssentialsCommand } final UserData userData = user.getData(); final String nickName = FormatUtil.stripFormat(userData.getNickname()); - if (!whois.equalsIgnoreCase(nickName) - && !whois.substring(prefixLength).equalsIgnoreCase(nickName) - && !whois.equalsIgnoreCase(user.getName())) + if (!whois.equalsIgnoreCase(nickName) && !whois.substring(prefixLength).equalsIgnoreCase(nickName) && !whois.equalsIgnoreCase(user.getName())) { continue; } @@ -61,12 +59,14 @@ public class Commandwhois extends EssentialsCommand sender.sendMessage(_("whoisIs", player.getDisplayName(), user.getName())); sender.sendMessage(_("whoisHealth", player.getHealth())); sender.sendMessage(_("whoisExp", SetExpFix.getTotalExperience(player), player.getLevel())); - sender.sendMessage(_("whoisLocation", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ())); + sender.sendMessage( + _( + "whoisLocation", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), + player.getLocation().getBlockZ())); sender.sendMessage(_("whoisMoney", FormatUtil.displayCurrency(user.getMoney(), ess))); sender.sendMessage(_("whoisIPAddress", player.getAddress().getAddress().toString())); final String location = userData.getGeolocation(); - if (location != null - && Permissions.GEOIP_SHOW.isAuthorized(sender)) + if (location != null && Permissions.GEOIP_SHOW.isAuthorized(sender)) { sender.sendMessage(_("whoisGeoLocation", location)); } @@ -75,16 +75,14 @@ public class Commandwhois extends EssentialsCommand sender.sendMessage(_("whoisOP", (user.isOp() ? _("true") : _("false")))); sender.sendMessage(_("whoisFly", player.getAllowFlight() ? _("true") : _("false"), player.isFlying() ? _("flying") : _("notFlying"))); sender.sendMessage(_("whoisAFK", (userData.isAfk() ? _("true") : _("false")))); - sender.sendMessage(_("whoisJail", (userData.isJailed() - ? user.getTimestamp(UserData.TimestampType.JAIL) > 0 - ? DateUtil.formatDateDiff(user.getTimestamp(UserData.TimestampType.JAIL)) - : _("true") - : _("false")))); - sender.sendMessage(_("whoisMute", (userData.isMuted() - ? user.getTimestamp(UserData.TimestampType.MUTE) > 0 - ? DateUtil.formatDateDiff(user.getTimestamp(UserData.TimestampType.MUTE)) - : _("true") - : _("false")))); + sender.sendMessage( + _( + "whoisJail", (userData.isJailed() ? user.getTimestamp(UserData.TimestampType.JAIL) > 0 ? DateUtil.formatDateDiff( + user.getTimestamp(UserData.TimestampType.JAIL)) : _("true") : _("false")))); + sender.sendMessage( + _( + "whoisMute", (userData.isMuted() ? user.getTimestamp(UserData.TimestampType.MUTE) > 0 ? DateUtil.formatDateDiff( + user.getTimestamp(UserData.TimestampType.MUTE)) : _("true") : _("false")))); if (!foundPlayer) { diff --git a/Essentials/src/net/ess3/commands/Commandworld.java b/Essentials/src/net/ess3/commands/Commandworld.java index 9a629ef06..96b395303 100644 --- a/Essentials/src/net/ess3/commands/Commandworld.java +++ b/Essentials/src/net/ess3/commands/Commandworld.java @@ -1,14 +1,14 @@ package net.ess3.commands; -import java.util.List; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.permissions.Permissions; +import java.util.List; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; public class Commandworld extends EssentialsCommand diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java index df3ba1901..d6d1b26be 100644 --- a/Essentials/src/net/ess3/commands/Commandworth.java +++ b/Essentials/src/net/ess3/commands/Commandworth.java @@ -1,11 +1,11 @@ package net.ess3.commands; -import java.util.Locale; import static net.ess3.I18n._; -import net.ess3.api.IUser; -import net.ess3.utils.FormatUtil; +import java.util.Locale; import org.bukkit.command.CommandSender; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IUser; +import net.ess3.utils.FormatUtil; public class Commandworth extends EssentialsCommand @@ -41,18 +41,12 @@ public class Commandworth extends EssentialsCommand throw new Exception(_("itemCannotBeSold")); } - user.sendMessage(iStack.getDurability() != 0 - ? _("worthMeta", - iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), - iStack.getDurability(), - FormatUtil.displayCurrency(worth * amount, ess), - amount, - FormatUtil.displayCurrency(worth, ess)) - : _("worth", - iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), - FormatUtil.displayCurrency(worth * amount, ess), - amount, - FormatUtil.displayCurrency(worth, ess))); + user.sendMessage( + iStack.getDurability() != 0 ? _( + "worthMeta", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), iStack.getDurability(), + FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)) : _( + "worth", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), FormatUtil.displayCurrency(worth * amount, ess), + amount, FormatUtil.displayCurrency(worth, ess))); } @Override @@ -85,18 +79,12 @@ public class Commandworth extends EssentialsCommand throw new Exception(_("itemCannotBeSold")); } - sender.sendMessage(iStack.getDurability() != 0 - ? _("worthMeta", - iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), - iStack.getDurability(), - FormatUtil.displayCurrency(worth * amount, ess), - amount, - FormatUtil.displayCurrency(worth, ess)) - : _("worth", - iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), - FormatUtil.displayCurrency(worth * amount, ess), - amount, - FormatUtil.displayCurrency(worth, ess))); + sender.sendMessage( + iStack.getDurability() != 0 ? _( + "worthMeta", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), iStack.getDurability(), + FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)) : _( + "worth", iStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), FormatUtil.displayCurrency(worth * amount, ess), + amount, FormatUtil.displayCurrency(worth, ess))); } } diff --git a/Essentials/src/net/ess3/commands/EssentialsCommand.java b/Essentials/src/net/ess3/commands/EssentialsCommand.java index 1994d1cf6..7291f4f00 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommand.java @@ -1,17 +1,17 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.List; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.Server; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.AbstractSuperpermsPermission; -import org.bukkit.Server; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public abstract class EssentialsCommand extends AbstractSuperpermsPermission implements IEssentialsCommand @@ -62,7 +62,7 @@ public abstract class EssentialsCommand extends AbstractSuperpermsPermission imp { throw new Exception(_("onlyPlayers", commandName)); } - + @Override public final List<String> tabComplete(final IUser user, final Command cmd, final String commandLabel, final String[] args) { @@ -104,44 +104,52 @@ public abstract class EssentialsCommand extends AbstractSuperpermsPermission imp { return permission; } - - protected boolean isUser(CommandSender sender) { + + protected boolean isUser(CommandSender sender) + { return sender instanceof IUser; } - + /** * Converts a CommandSender object to an User. - * + * * @param sender - * @return + * @return * @throws IllegalArgumentException if the object is neither a superclass of IUser or Player */ - protected IUser getUser(CommandSender sender) { - if (sender instanceof IUser) { + protected IUser getUser(CommandSender sender) + { + if (sender instanceof IUser) + { return (IUser)sender; } - if (sender instanceof Player) { + if (sender instanceof Player) + { return ess.getUserMap().getUser((Player)sender); } throw new IllegalArgumentException(); } - + /** * Converts a CommandSender object to an User. - * + * * @param sender - * @return + * @return * @throws IllegalArgumentException if the object is not a superclass of IUser */ - protected Player getPlayer(CommandSender sender) { - if (sender instanceof IUser) { + protected Player getPlayer(CommandSender sender) + { + if (sender instanceof IUser) + { return ((IUser)sender).getPlayer(); } throw new IllegalArgumentException(); } - - protected Player getPlayerOrNull(CommandSender sender) { - if (sender instanceof IUser) { + + protected Player getPlayerOrNull(CommandSender sender) + { + if (sender instanceof IUser) + { return ((IUser)sender).getPlayer(); } return null; diff --git a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java index 9a2296023..55c43ade2 100644 --- a/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java +++ b/Essentials/src/net/ess3/commands/EssentialsCommandHandler.java @@ -1,20 +1,15 @@ package net.ess3.commands; +import static net.ess3.I18n._; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.api.*; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.command.PluginCommand; -import org.bukkit.command.PluginCommandYamlParser; -import org.bukkit.command.TabExecutor; +import org.bukkit.command.*; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.api.*; public class EssentialsCommandHandler implements ICommandHandler, TabExecutor @@ -111,7 +106,8 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor cmd.init(ess, commandName); cmd.setEssentialsModule(module); commands.put(commandName, cmd); - if (command instanceof PluginCommand) { + if (command instanceof PluginCommand) + { ((PluginCommand)command).setExecutor(this); } } @@ -223,7 +219,7 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor } } } - + try { // Check for disabled commands @@ -242,7 +238,8 @@ public class EssentialsCommandHandler implements ICommandHandler, TabExecutor cmd.init(ess, commandName); cmd.setEssentialsModule(module); commands.put(commandName, cmd); - if (command instanceof PluginCommand) { + if (command instanceof PluginCommand) + { ((PluginCommand)command).setExecutor(this); } } diff --git a/Essentials/src/net/ess3/commands/IEssentialsCommand.java b/Essentials/src/net/ess3/commands/IEssentialsCommand.java index 3d20209fb..78324f106 100644 --- a/Essentials/src/net/ess3/commands/IEssentialsCommand.java +++ b/Essentials/src/net/ess3/commands/IEssentialsCommand.java @@ -1,22 +1,20 @@ package net.ess3.commands; import java.util.List; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; import net.ess3.api.IPermission; import net.ess3.api.IUser; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; public interface IEssentialsCommand extends IPermission { - void run(IUser user, Command cmd, String commandLabel, String[] args) - throws Exception; + void run(IUser user, Command cmd, String commandLabel, String[] args) throws Exception; + + void run(CommandSender sender, Command cmd, String commandLabel, String[] args) throws Exception; - void run(CommandSender sender, Command cmd, String commandLabel, String[] args) - throws Exception; - List<String> tabComplete(IUser user, Command cmd, String commandLabel, String[] args); List<String> tabComplete(CommandSender sender, Command cmd, String commandLabel, String[] args); diff --git a/Essentials/src/net/ess3/commands/NoChargeException.java b/Essentials/src/net/ess3/commands/NoChargeException.java index 99c42225d..b5b508d05 100644 --- a/Essentials/src/net/ess3/commands/NoChargeException.java +++ b/Essentials/src/net/ess3/commands/NoChargeException.java @@ -3,7 +3,7 @@ package net.ess3.commands; public class NoChargeException extends Exception { - private static final long serialVersionUID = 5817092912429182826L; + private static final long serialVersionUID = 5817092912429182826L; public NoChargeException() { diff --git a/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java b/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java index 0025c9e42..3dd04127b 100644 --- a/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java +++ b/Essentials/src/net/ess3/commands/NotEnoughArgumentsException.java @@ -3,7 +3,7 @@ package net.ess3.commands; public class NotEnoughArgumentsException extends Exception { - private static final long serialVersionUID = 4659884540230373059L; + private static final long serialVersionUID = 4659884540230373059L; public NotEnoughArgumentsException() { diff --git a/Essentials/src/net/ess3/commands/WarpNotFoundException.java b/Essentials/src/net/ess3/commands/WarpNotFoundException.java index 6af389c08..73e9504c9 100644 --- a/Essentials/src/net/ess3/commands/WarpNotFoundException.java +++ b/Essentials/src/net/ess3/commands/WarpNotFoundException.java @@ -1,16 +1,17 @@ package net.ess3.commands; + import static net.ess3.I18n._; public class WarpNotFoundException extends Exception { - private static final long serialVersionUID = 6585692783437952812L; + private static final long serialVersionUID = 6585692783437952812L; public WarpNotFoundException() { super(_("warpNotExist")); } - + public WarpNotFoundException(String message) { super(message); diff --git a/Essentials/src/net/ess3/craftbukkit/FakeInventory.java b/Essentials/src/net/ess3/craftbukkit/FakeInventory.java index b00fba745..a874f8b46 100644 --- a/Essentials/src/net/ess3/craftbukkit/FakeInventory.java +++ b/Essentials/src/net/ess3/craftbukkit/FakeInventory.java @@ -153,7 +153,8 @@ public class FakeInventory implements Inventory { for (int i = 0; i < items.length; i++) { - if (items[i] == null || items[i].getTypeId() == 0) { + if (items[i] == null || items[i].getTypeId() == 0) + { return i; } } @@ -241,7 +242,8 @@ public class FakeInventory implements Inventory throw new UnsupportedOperationException("Not supported yet."); } - public boolean containsAtLeast(ItemStack arg0, int arg1) { + public boolean containsAtLeast(ItemStack arg0, int arg1) + { throw new UnsupportedOperationException("Not supported yet."); - } + } } diff --git a/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java index f816026b9..3c2fa910f 100644 --- a/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java +++ b/Essentials/src/net/ess3/craftbukkit/InventoryWorkaround.java @@ -9,6 +9,7 @@ import org.bukkit.inventory.ItemStack; * This class can be removed when https://github.com/Bukkit/CraftBukkit/pull/193 is accepted to CraftBukkit */ + public final class InventoryWorkaround { private InventoryWorkaround() @@ -30,7 +31,8 @@ public final class InventoryWorkaround { continue; } - if (item.getTypeId() == cItem.getTypeId() && (!enforceAmount || item.getAmount() == cItem.getAmount()) && (!enforceDurability || cItem.getDurability() == item.getDurability()) && (!enforceEnchantments || cItem.getEnchantments().equals(item.getEnchantments()))) + if (item.getTypeId() == cItem.getTypeId() && (!enforceAmount || item.getAmount() == cItem.getAmount()) && (!enforceDurability || cItem.getDurability() == item.getDurability()) && (!enforceEnchantments || cItem.getEnchantments().equals( + item.getEnchantments()))) { return i; } @@ -57,7 +59,8 @@ public final class InventoryWorkaround { continue; } - if (item.getTypeId() == cItem.getTypeId() && cItem.getAmount() < maxAmount && (!enforceDurability || cItem.getDurability() == item.getDurability()) && cItem.getEnchantments().equals(item.getEnchantments())) + if (item.getTypeId() == cItem.getTypeId() && cItem.getAmount() < maxAmount && (!enforceDurability || cItem.getDurability() == item.getDurability()) && cItem.getEnchantments().equals( + item.getEnchantments())) { return i; } @@ -109,7 +112,8 @@ public final class InventoryWorkaround combined[j] = items[i].clone(); break; } - if (combined[j].getTypeId() == items[i].getTypeId() && (!enforceDurability || combined[j].getDurability() == items[i].getDurability()) && combined[j].getEnchantments().equals(items[i].getEnchantments())) + if (combined[j].getTypeId() == items[i].getTypeId() && (!enforceDurability || combined[j].getDurability() == items[i].getDurability()) && combined[j].getEnchantments().equals( + items[i].getEnchantments())) { combined[j].setAmount(combined[j].getAmount() + items[i].getAmount()); break; @@ -266,7 +270,8 @@ public final class InventoryWorkaround combined[j] = items[i].clone(); break; } - if (combined[j].getTypeId() == items[i].getTypeId() && (!enforceDurability || combined[j].getDurability() == items[i].getDurability()) && (!enforceEnchantments || combined[j].getEnchantments().equals(items[i].getEnchantments()))) + if (combined[j].getTypeId() == items[i].getTypeId() && (!enforceDurability || combined[j].getDurability() == items[i].getDurability()) && (!enforceEnchantments || combined[j].getEnchantments().equals( + items[i].getEnchantments()))) { combined[j].setAmount(combined[j].getAmount() + items[i].getAmount()); break; diff --git a/Essentials/src/net/ess3/craftbukkit/SetExpFix.java b/Essentials/src/net/ess3/craftbukkit/SetExpFix.java index 54f6792e9..bef354167 100644 --- a/Essentials/src/net/ess3/craftbukkit/SetExpFix.java +++ b/Essentials/src/net/ess3/craftbukkit/SetExpFix.java @@ -22,7 +22,7 @@ public class SetExpFix int amount = exp; while (amount > 0) { - final int expToLevel = getExpAtLevel(player); + final int expToLevel = getExpAtLevel(player); amount -= expToLevel; if (amount >= 0) { @@ -56,7 +56,7 @@ public class SetExpFix } return 17; } - + public static int getExpToLevel(final int level) { int currentLevel = 0; @@ -84,10 +84,10 @@ public class SetExpFix } return exp; } - + public static int getExpUntilNextLevel(final Player player) { - int exp = (int)Math.round(getExpAtLevel(player) * player.getExp()); + int exp = (int)Math.round(getExpAtLevel(player) * player.getExp()); int nextLevel = player.getLevel(); return getExpAtLevel(nextLevel) - exp; } diff --git a/Essentials/src/net/ess3/economy/Money.java b/Essentials/src/net/ess3/economy/Money.java index 2eb9d1a6e..2373cc7f7 100644 --- a/Essentials/src/net/ess3/economy/Money.java +++ b/Essentials/src/net/ess3/economy/Money.java @@ -3,11 +3,7 @@ package net.ess3.economy; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; @@ -23,12 +19,11 @@ public class Money implements StorageObject public Map<String, Double> getBalances() { - return balances == null - ? Collections.<String, Double>emptyMap() - : Collections.unmodifiableMap(balances); + return balances == null ? Collections.<String, Double>emptyMap() : Collections.unmodifiableMap(balances); } - - public void setBalance(String name, Double value) { + + public void setBalance(String name, Double value) + { Map<String, Double> balanceMap = new HashMap<String, Double>(getBalances()); balanceMap.put(name, value); balances = balanceMap; @@ -40,6 +35,6 @@ public class Money implements StorageObject balanceMap.remove(name); balances = balanceMap; } - - + + } diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java index 3bd6dbc97..4b864f691 100644 --- a/Essentials/src/net/ess3/economy/Trade.java +++ b/Essentials/src/net/ess3/economy/Trade.java @@ -1,5 +1,6 @@ package net.ess3.economy; +import static net.ess3.I18n._; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -9,15 +10,14 @@ import java.util.Locale; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.Location; +import org.bukkit.inventory.ItemStack; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.permissions.Permissions; -import org.bukkit.Location; -import org.bukkit.inventory.ItemStack; public class Trade @@ -66,30 +66,24 @@ public class Trade public void isAffordableFor(final IUser user) throws ChargeException { - if (getMoney() != null - && getMoney() > 0 - && !Permissions.ECO_LOAN.isAuthorized(user) - && !user.canAfford(getMoney())) + if (getMoney() != null && getMoney() > 0 && !Permissions.ECO_LOAN.isAuthorized(user) && !user.canAfford(getMoney())) { throw new ChargeException(_("notEnoughMoney")); } - if (getItemStack() != null - && InventoryWorkaround.containsItem(user.getPlayer().getInventory(), true, true, itemStack)) + if (getItemStack() != null && InventoryWorkaround.containsItem(user.getPlayer().getInventory(), true, true, itemStack)) { - throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); + throw new ChargeException( + _("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); } - if (command != null && !command.isEmpty() - && 0 < getCommandCost(user) - && !Permissions.ECO_LOAN.isAuthorized(user)) + if (command != null && !command.isEmpty() && 0 < getCommandCost(user) && !Permissions.ECO_LOAN.isAuthorized(user)) { throw new ChargeException(_("notEnoughMoney")); } - if (exp != null && exp > 0 - && user.getPlayer().getTotalExperience() < exp) + if (exp != null && exp > 0 && user.getPlayer().getTotalExperience() < exp) { throw new ChargeException(_("notEnoughExperience")); } @@ -160,13 +154,13 @@ public class Trade { if (!InventoryWorkaround.containsItem(user.getPlayer().getInventory(), true, true, itemStack)) { - throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); + throw new ChargeException( + _("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); } InventoryWorkaround.removeItem(user.getPlayer().getInventory(), true, true, getItemStack()); user.getPlayer().updateInventory(); } - if (command != null && !command.isEmpty() - && !Permissions.NOCOMMANDCOST.isAuthorized(user, command)) + if (command != null && !command.isEmpty() && !Permissions.NOCOMMANDCOST.isAuthorized(user, command)) { final ISettings settings = ess.getSettings(); @@ -206,17 +200,18 @@ public class Trade public Double getCommandCost(final IUser user) { double cost = 0d; - if (command != null && !command.isEmpty() - && !Permissions.NOCOMMANDCOST.isAuthorized(user, command)) + if (command != null && !command.isEmpty() && !Permissions.NOCOMMANDCOST.isAuthorized(user, command)) { cost = ess.getSettings().getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command); if (cost == 0.0 && fallbackCommand != null && !fallbackCommand.isEmpty()) { - cost = ess.getSettings().getData().getEconomy().getCommandCost(fallbackCommand.charAt(0) == '/' ? fallbackCommand.substring(1) : fallbackCommand); + cost = ess.getSettings().getData().getEconomy().getCommandCost( + fallbackCommand.charAt(0) == '/' ? fallbackCommand.substring(1) : fallbackCommand); } } return cost; } + private static FileWriter fw = null; public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess) diff --git a/Essentials/src/net/ess3/economy/Worth.java b/Essentials/src/net/ess3/economy/Worth.java index 546a35168..68f086774 100644 --- a/Essentials/src/net/ess3/economy/Worth.java +++ b/Essentials/src/net/ess3/economy/Worth.java @@ -3,17 +3,13 @@ package net.ess3.economy; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import org.bukkit.Material; +import org.bukkit.material.MaterialData; +import lombok.*; import net.ess3.storage.EnchantmentLevel; import net.ess3.storage.MapKeyType; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; -import org.bukkit.Material; -import org.bukkit.material.MaterialData; @Data @@ -28,10 +24,9 @@ public class Worth implements StorageObject public Map<MaterialData, Double> getSell() { - return sell == null - ? Collections.<MaterialData, Double>emptyMap() - : Collections.unmodifiableMap(sell); + return sell == null ? Collections.<MaterialData, Double>emptyMap() : Collections.unmodifiableMap(sell); } + @MapKeyType(MaterialData.class) @MapValueType(Double.class) @Getter(AccessLevel.NONE) @@ -40,10 +35,9 @@ public class Worth implements StorageObject public Map<MaterialData, Double> getBuy() { - return buy == null - ? Collections.<MaterialData, Double>emptyMap() - : Collections.unmodifiableMap(buy); + return buy == null ? Collections.<MaterialData, Double>emptyMap() : Collections.unmodifiableMap(buy); } + @MapKeyType(EnchantmentLevel.class) @MapValueType(Double.class) @Getter(AccessLevel.NONE) @@ -52,9 +46,7 @@ public class Worth implements StorageObject public Map<EnchantmentLevel, Double> getEnchantmentMultiplier() { - return enchantmentMultiplier == null - ? Collections.<EnchantmentLevel, Double>emptyMap() - : Collections.unmodifiableMap(enchantmentMultiplier); + return enchantmentMultiplier == null ? Collections.<EnchantmentLevel, Double>emptyMap() : Collections.unmodifiableMap(enchantmentMultiplier); } public Worth() diff --git a/Essentials/src/net/ess3/economy/WorthHolder.java b/Essentials/src/net/ess3/economy/WorthHolder.java index 6be2932d4..d955962db 100644 --- a/Essentials/src/net/ess3/economy/WorthHolder.java +++ b/Essentials/src/net/ess3/economy/WorthHolder.java @@ -2,13 +2,13 @@ package net.ess3.economy; import java.io.File; import java.util.Map; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; +import org.bukkit.material.MaterialData; import net.ess3.api.IEssentials; import net.ess3.api.IWorth; import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.storage.EnchantmentLevel; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemStack; -import org.bukkit.material.MaterialData; public class WorthHolder extends AsyncStorageObjectHolder<net.ess3.economy.Worth> implements IWorth diff --git a/Essentials/src/net/ess3/economy/register/Method.java b/Essentials/src/net/ess3/economy/register/Method.java index c01e46476..2ded29805 100644 --- a/Essentials/src/net/ess3/economy/register/Method.java +++ b/Essentials/src/net/ess3/economy/register/Method.java @@ -15,13 +15,12 @@ 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. - * + * <p/> * <pre> * if(method.getName().equalsIgnoreCase("iConomy")) * iConomy plugin = ((iConomy)method.getPlugin());</pre> * - * @return - * <code>Object</code> + * @return <code>Object</code> * @see #getName() * @see #getVersion() */ @@ -33,7 +32,7 @@ public interface Method * @return <code>String</code> Plugin name. */ public String getName(); - + /** * Returns the reported name of this method. * @@ -51,7 +50,7 @@ public interface Method /** * Returns the amount of decimal places that get stored * NOTE: it will return -1 if there is no rounding - * + * * @return <code>int</code> for each decimal place */ public int fractionalDigits(); @@ -108,7 +107,7 @@ public interface Method /** * Forces an account creation * - * @param name Account name + * @param name Account name * @param balance Initial account balance * @return <code>boolean</code> */ diff --git a/Essentials/src/net/ess3/economy/register/Methods.java b/Essentials/src/net/ess3/economy/register/Methods.java index 7f5acfa3f..f5d3ad9b3 100644 --- a/Essentials/src/net/ess3/economy/register/Methods.java +++ b/Essentials/src/net/ess3/economy/register/Methods.java @@ -10,12 +10,12 @@ import org.bukkit.plugin.PluginManager; * The * <code>Methods</code> initializes Methods that utilize the Method interface based on a "first come, first served" * basis. - * + * <p/> * Allowing you to check whether a payment method exists or not. - * + * <p/> * Methods also allows you to set a preferred method of payment before it captures payment plugins in the initialization * process. - * + * <p/> * in * <code>bukkit.yml</code>: <blockquote><pre> * economy: @@ -90,8 +90,7 @@ public class Methods * Returns an array of payment method names that have been loaded through the * <code>_init</code> method. * - * @return - * <code>Set<String></code> - Array of payment methods that are loaded. + * @return <code>Set<String></code> - Array of payment methods that are loaded. * @see #setMethod(org.bukkit.plugin.Plugin) */ public static Set<String> getDependencies() @@ -129,8 +128,7 @@ public class Methods /** * Verifies if Register has set a payment method for usage yet. * - * @return - * <code>boolean</code> + * @return <code>boolean</code> * @see #setMethod(org.bukkit.plugin.Plugin) * @see #checkDisabled(org.bukkit.plugin.Plugin) */ @@ -143,8 +141,7 @@ public class Methods * Checks Plugin Class against a multitude of checks to verify it's usability as a payment method. * * @param <code>PluginManager</code> the plugin manager for the server - * @return - * <code>boolean</code> True on success, False on failure. + * @return <code>boolean</code> True on success, False on failure. */ public static boolean setMethod(PluginManager manager) { @@ -245,8 +242,7 @@ public class Methods /** * Sets the preferred economy * - * @return - * <code>boolean</code> + * @return <code>boolean</code> */ public static boolean setPreferred(String check) { @@ -262,9 +258,8 @@ public class Methods /** * Grab the existing and initialized (hopefully) Method Class. * - * @return - * <code>Method</code> <em>or</em> - * <code>Null</code> + * @return <code>Method</code> <em>or</em> + * <code>Null</code> */ public static Method getMethod() { @@ -275,8 +270,7 @@ public class Methods * Verify is a plugin is disabled, only does this if we there is an existing payment method initialized in Register. * * @param method Plugin data from bukkit, Internal Class file. - * @return - * <code>boolean</code> + * @return <code>boolean</code> */ public static boolean checkDisabled(Plugin method) { diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE6.java b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java index 2d8fd4715..ae3096b4b 100644 --- a/Essentials/src/net/ess3/economy/register/methods/BOSE6.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE6.java @@ -1,15 +1,15 @@ package net.ess3.economy.register.methods; +import org.bukkit.plugin.Plugin; import cosine.boseconomy.BOSEconomy; import net.ess3.economy.register.Method; -import org.bukkit.plugin.Plugin; /** * BOSEconomy 6 Implementation of Method * * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> + * <http://aol.nexua.org> */ @SuppressWarnings("deprecation") public class BOSE6 implements Method @@ -80,8 +80,7 @@ public class BOSE6 implements Method @Override public boolean hasBankAccount(String bank, String name) { - return this.BOSEconomy.isBankOwner(bank, name) - || this.BOSEconomy.isBankMember(bank, name); + return this.BOSEconomy.isBankOwner(bank, name) || this.BOSEconomy.isBankMember(bank, name); } @Override @@ -134,9 +133,8 @@ public class BOSE6 implements Method @Override public boolean isCompatible(Plugin plugin) { - return plugin.getDescription().getName().equalsIgnoreCase("boseconomy") - && plugin instanceof BOSEconomy - && plugin.getDescription().getVersion().equals("0.6.2"); + return plugin.getDescription().getName().equalsIgnoreCase("boseconomy") && plugin instanceof BOSEconomy && plugin.getDescription().getVersion().equals( + "0.6.2"); } @Override diff --git a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java index 46234bc52..96cdafdec 100644 --- a/Essentials/src/net/ess3/economy/register/methods/BOSE7.java +++ b/Essentials/src/net/ess3/economy/register/methods/BOSE7.java @@ -1,8 +1,8 @@ package net.ess3.economy.register.methods; +import org.bukkit.plugin.Plugin; import cosine.boseconomy.BOSEconomy; import net.ess3.economy.register.Method; -import org.bukkit.plugin.Plugin; /** @@ -10,7 +10,7 @@ import org.bukkit.plugin.Plugin; * * @author Acrobot * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> + * <http://aol.nexua.org> */ public class BOSE7 implements Method { @@ -133,9 +133,8 @@ public class BOSE7 implements Method @Override public boolean isCompatible(Plugin plugin) { - return plugin.getDescription().getName().equalsIgnoreCase("boseconomy") - && plugin instanceof BOSEconomy - && !plugin.getDescription().getVersion().equals("0.6.2"); + return plugin.getDescription().getName().equalsIgnoreCase("boseconomy") && plugin instanceof BOSEconomy && !plugin.getDescription().getVersion().equals( + "0.6.2"); } @Override diff --git a/Essentials/src/net/ess3/economy/register/methods/MCUR.java b/Essentials/src/net/ess3/economy/register/methods/MCUR.java index 3c6d39fba..415882621 100644 --- a/Essentials/src/net/ess3/economy/register/methods/MCUR.java +++ b/Essentials/src/net/ess3/economy/register/methods/MCUR.java @@ -1,9 +1,9 @@ package net.ess3.economy.register.methods; +import org.bukkit.plugin.Plugin; import me.ashtheking.currency.Currency; import me.ashtheking.currency.CurrencyList; import net.ess3.economy.register.Method; -import org.bukkit.plugin.Plugin; /** @@ -104,9 +104,8 @@ public class MCUR implements Method @Override public boolean isCompatible(Plugin plugin) { - return (plugin.getDescription().getName().equalsIgnoreCase("Currency") - || plugin.getDescription().getName().equalsIgnoreCase("MultiCurrency")) - && plugin instanceof Currency; + return (plugin.getDescription().getName().equalsIgnoreCase("Currency") || plugin.getDescription().getName().equalsIgnoreCase( + "MultiCurrency")) && plugin instanceof Currency; } @Override diff --git a/Essentials/src/net/ess3/economy/register/methods/VaultEco.java b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java index 5281c5b2f..a8476206d 100644 --- a/Essentials/src/net/ess3/economy/register/methods/VaultEco.java +++ b/Essentials/src/net/ess3/economy/register/methods/VaultEco.java @@ -1,10 +1,10 @@ package net.ess3.economy.register.methods; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.RegisteredServiceProvider; import net.ess3.economy.register.Method; import net.milkbowl.vault.Vault; import net.milkbowl.vault.economy.Economy; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.RegisteredServiceProvider; public class VaultEco implements Method @@ -34,12 +34,12 @@ public class VaultEco implements Method { return this.vault.getDescription().getName(); } - + public String getEconomy() { return economy == null ? "NoEco" : economy.getName(); } - + @Override public String getLongName() { @@ -85,8 +85,7 @@ public class VaultEco implements Method @Override public boolean hasBankAccount(String bank, String name) { - return this.economy.isBankOwner(bank, name).transactionSuccess() - || this.economy.isBankMember(bank, name).transactionSuccess(); + return this.economy.isBankOwner(bank, name).transactionSuccess() || this.economy.isBankMember(bank, name).transactionSuccess(); } @Override @@ -148,7 +147,8 @@ public class VaultEco implements Method public void setPlugin(Plugin plugin) { this.vault = (Vault)plugin; - RegisteredServiceProvider<Economy> economyProvider = this.vault.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class); + RegisteredServiceProvider<Economy> economyProvider = this.vault.getServer().getServicesManager().getRegistration( + net.milkbowl.vault.economy.Economy.class); if (economyProvider != null) { this.economy = economyProvider.getProvider(); diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo5.java b/Essentials/src/net/ess3/economy/register/methods/iCo5.java index a25513f36..0b7ee8023 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo5.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo5.java @@ -1,19 +1,19 @@ package net.ess3.economy.register.methods; +import org.bukkit.plugin.Plugin; import com.iConomy.iConomy; import com.iConomy.system.Account; import com.iConomy.system.BankAccount; import com.iConomy.system.Holdings; import com.iConomy.util.Constants; import net.ess3.economy.register.Method; -import org.bukkit.plugin.Plugin; /** * iConomy 5 Implementation of Method * * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> + * <http://aol.nexua.org> */ public class iCo5 implements Method { @@ -123,9 +123,8 @@ public class iCo5 implements Method @Override public boolean isCompatible(Plugin plugin) { - return plugin.getDescription().getName().equalsIgnoreCase("iconomy") - && plugin.getClass().getName().equals("com.iConomy.iConomy") - && plugin instanceof iConomy; + return plugin.getDescription().getName().equalsIgnoreCase("iconomy") && plugin.getClass().getName().equals( + "com.iConomy.iConomy") && plugin instanceof iConomy; } @Override diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo6.java b/Essentials/src/net/ess3/economy/register/methods/iCo6.java index c68882aa3..fe5f6159a 100644 --- a/Essentials/src/net/ess3/economy/register/methods/iCo6.java +++ b/Essentials/src/net/ess3/economy/register/methods/iCo6.java @@ -1,18 +1,18 @@ package net.ess3.economy.register.methods; +import org.bukkit.plugin.Plugin; import com.iCo6.iConomy; import com.iCo6.system.Account; import com.iCo6.system.Accounts; import com.iCo6.system.Holdings; import net.ess3.economy.register.Method; -import org.bukkit.plugin.Plugin; /** * iConomy 6 Implementation of Method * * @author Nijikokun <nijikokun@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> + * <http://aol.nexua.org> */ public class iCo6 implements Method { @@ -115,9 +115,8 @@ public class iCo6 implements Method @Override public boolean isCompatible(Plugin plugin) { - return plugin.getDescription().getName().equalsIgnoreCase("iconomy") - && plugin.getClass().getName().equals("com.iCo6.iConomy") - && plugin instanceof iConomy; + return plugin.getDescription().getName().equalsIgnoreCase("iconomy") && plugin.getClass().getName().equals( + "com.iCo6.iConomy") && plugin instanceof iConomy; } @Override diff --git a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java index 6846f0eea..9dd429f45 100644 --- a/Essentials/src/net/ess3/listener/EssentialsBlockListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsBlockListener.java @@ -1,10 +1,5 @@ package net.ess3.listener; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.bukkit.BukkitMaterial; -import net.ess3.craftbukkit.InventoryWorkaround; - import org.bukkit.GameMode; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -13,7 +8,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; - +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.bukkit.BukkitMaterial; public class EssentialsBlockListener implements Listener @@ -25,7 +22,7 @@ public class EssentialsBlockListener implements Listener this.ess = ess; } - @EventHandler(priority = EventPriority.LOW,ignoreCancelled=true) + @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onBlockPlace(final BlockPlaceEvent event) { final Block block = event.getBlockPlaced(); @@ -34,7 +31,7 @@ public class EssentialsBlockListener implements Listener { return; } - + final Player player = event.getPlayer(); final IUser user = ess.getUserMap().getUser(player); diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java index ddf5955f0..8b9177e01 100644 --- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java @@ -1,24 +1,20 @@ package net.ess3.listener; -import java.util.List; import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; -import net.ess3.user.UserData.TimestampType; +import java.util.List; import org.bukkit.Material; -import org.bukkit.entity.Ageable; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; +import org.bukkit.entity.*; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.*; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.user.UserData.TimestampType; public class EssentialsEntityListener implements Listener @@ -46,8 +42,9 @@ public class EssentialsEntityListener implements Listener ISettings settings = ess.getSettings(); attacker.updateActivity(true); - if (settings.getData().getGeneral().getLoginAttackDelay() > 0 && !Permissions.PVPDELAY_EXEMPT.isAuthorized(attacker) - && (System.currentTimeMillis() < (attacker.getTimestamp(TimestampType.LOGIN) + settings.getData().getGeneral().getLoginAttackDelay()))) + if (settings.getData().getGeneral().getLoginAttackDelay() > 0 && !Permissions.PVPDELAY_EXEMPT.isAuthorized( + attacker) && (System.currentTimeMillis() < (attacker.getTimestamp( + TimestampType.LOGIN) + settings.getData().getGeneral().getLoginAttackDelay()))) { event.setCancelled(true); } @@ -102,9 +99,11 @@ public class EssentialsEntityListener implements Listener public void onEntityDamage(final EntityDamageEvent event) { final Entity entity = event.getEntity(); - if (entity instanceof Player) { + if (entity instanceof Player) + { final Player player = (Player)entity; - if (ess.getUserMap().getUser(player).isGodModeEnabled()) { + if (ess.getUserMap().getUser(player).isGodModeEnabled()) + { player.setFireTicks(0); player.setRemainingAir(player.getMaximumAir()); event.setCancelled(true); @@ -196,7 +195,7 @@ public class EssentialsEntityListener implements Listener event.setCancelled(true); } } - + @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onPotionSplashEvent(final PotionSplashEvent event) { diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 52c3150fd..e24fdc64e 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -1,5 +1,6 @@ package net.ess3.listener; +import static net.ess3.I18n._; import java.io.IOException; import java.util.Iterator; import java.util.List; @@ -7,17 +8,6 @@ import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.api.IUserMap; -import net.ess3.permissions.Permissions; -import net.ess3.settings.Commands; -import net.ess3.user.UserData.TimestampType; -import net.ess3.utils.FormatUtil; -import net.ess3.utils.LocationUtil; -import net.ess3.utils.textreader.*; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Server; @@ -25,12 +15,24 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.bukkit.event.inventory.*; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.api.IUserMap; +import net.ess3.permissions.Permissions; +import net.ess3.settings.Commands; +import net.ess3.user.UserData.TimestampType; +import net.ess3.utils.FormatUtil; +import net.ess3.utils.LocationUtil; +import net.ess3.utils.textreader.*; public class EssentialsPlayerListener implements Listener @@ -39,7 +41,7 @@ public class EssentialsPlayerListener implements Listener private final transient Server server; private final transient IEssentials ess; private final transient IUserMap userMap; - + public EssentialsPlayerListener(final IEssentials parent) { super(); @@ -156,14 +158,15 @@ public class EssentialsPlayerListener implements Listener @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(final PlayerJoinEvent event) { - ess.getPlugin().scheduleAsyncDelayedTask(new Runnable() - { - @Override - public void run() - { - delayedJoin(event.getPlayer()); - } - }); + ess.getPlugin().scheduleAsyncDelayedTask( + new Runnable() + { + @Override + public void run() + { + delayedJoin(event.getPlayer()); + } + }); /* TODO: Make sure my update is good if (!event.getPlayer().isOnline()) { @@ -242,7 +245,7 @@ public class EssentialsPlayerListener implements Listener } }*/ } - + public void delayedJoin(final Player player) { if (!player.isOnline()) @@ -270,18 +273,19 @@ public class EssentialsPlayerListener implements Listener if (Permissions.SLEEPINGIGNORED.isAuthorized(user)) { - ess.getPlugin().scheduleSyncDelayedTask(new Runnable() - { - @Override - public void run() - { - user.getPlayer().setSleepingIgnored(true); - } - }); + ess.getPlugin().scheduleSyncDelayedTask( + new Runnable() + { + @Override + public void run() + { + user.getPlayer().setSleepingIgnored(true); + } + }); } - + final Commands settings = ess.getSettings().getData().getCommands(); - + if (!settings.isDisabled("motd") && Permissions.MOTD.isAuthorized(user)) { try @@ -322,7 +326,7 @@ public class EssentialsPlayerListener implements Listener } } - + @EventHandler(priority = EventPriority.HIGH) public void onPlayerLogin(final PlayerLoginEvent event) { @@ -349,7 +353,8 @@ public class EssentialsPlayerListener implements Listener if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED)) { final String banReason = user.getData().getBan() == null ? "" : user.getData().getBan().getReason(); - event.disallow(Result.KICK_BANNED, banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban") ? _("defaultBanReason") : banReason); + event.disallow( + Result.KICK_BANNED, banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban") ? _("defaultBanReason") : banReason); return; } @@ -400,16 +405,18 @@ public class EssentialsPlayerListener implements Listener if (user.getData().hasUnlimited(event.getBucket())) { event.getItemStack().setType(event.getBucket()); - ess.getPlugin().scheduleSyncDelayedTask(new Runnable() - { - @Override - public void run() - { - user.getPlayer().updateInventory(); - } - }); + ess.getPlugin().scheduleSyncDelayedTask( + new Runnable() + { + @Override + public void run() + { + user.getPlayer().updateInventory(); + } + }); } } + private final Pattern spaceSplit = Pattern.compile(" "); @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @@ -444,7 +451,8 @@ public class EssentialsPlayerListener implements Listener { user.updateDisplayName(); } - if (!settings.getData().getWorldOptions(event.getPlayer().getLocation().getWorld().getName()).isGodmode() && !Permissions.NOGOD_OVERRIDE.isAuthorized(user)) + if (!settings.getData().getWorldOptions(event.getPlayer().getLocation().getWorld().getName()).isGodmode() && !Permissions.NOGOD_OVERRIDE.isAuthorized( + user)) { if (user.getData().isGodmode()) { @@ -571,9 +579,8 @@ public class EssentialsPlayerListener implements Listener if (invHolder != null && invHolder instanceof Player) { final IUser invOwner = userMap.getUser((Player)invHolder); - if (user.isInvSee() && (!Permissions.INVSEE_MODIFY.isAuthorized(user) - || Permissions.INVSEE_PREVENT_MODIFY.isAuthorized(invOwner) - || !invOwner.isOnline())) + if (user.isInvSee() && (!Permissions.INVSEE_MODIFY.isAuthorized(user) || Permissions.INVSEE_PREVENT_MODIFY.isAuthorized( + invOwner) || !invOwner.isOnline())) { event.setCancelled(true); } @@ -582,7 +589,7 @@ public class EssentialsPlayerListener implements Listener if (event.getView().getTopInventory().getType() == InventoryType.WORKBENCH) { final IUser user = userMap.getUser((Player)event.getWhoClicked()); - if(user.isRecipeSee()) + 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 489ebf2bb..f87573051 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPluginListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPluginListener.java @@ -1,6 +1,12 @@ package net.ess3.listener; import java.util.logging.Level; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.server.PluginDisableEvent; +import org.bukkit.event.server.PluginEnableEvent; +import org.bukkit.plugin.Plugin; import net.ess3.api.IEssentials; import net.ess3.api.IReload; import net.ess3.api.ISettings; @@ -9,12 +15,6 @@ import net.ess3.ranks.GMGroups; import net.ess3.ranks.RanksStorage; import net.ess3.ranks.VaultGroups; import net.ess3.settings.General; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.server.PluginDisableEvent; -import org.bukkit.event.server.PluginEnableEvent; -import org.bukkit.plugin.Plugin; public class EssentialsPluginListener implements Listener, IReload @@ -35,10 +35,10 @@ public class EssentialsPluginListener implements Listener, IReload ess.getCommandHandler().addPlugin(event.getPlugin()); 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() - }); + ess.getLogger().log( + Level.INFO, "Payment method found ({0} version: {1})", new Object[]{ + Methods.getMethod().getName(), Methods.getMethod().getVersion() + }); } } diff --git a/Essentials/src/net/ess3/metrics/Metrics.java b/Essentials/src/net/ess3/metrics/Metrics.java index 1f182f511..f20d3a86b 100644 --- a/Essentials/src/net/ess3/metrics/Metrics.java +++ b/Essentials/src/net/ess3/metrics/Metrics.java @@ -23,6 +23,7 @@ package net.ess3.metrics; * The views and conclusions contained in the software and documentation are those of the authors and contributors and * should not be interpreted as representing official policies, either expressed or implied, of anybody else. */ + import java.io.*; import java.net.Proxy; import java.net.URL; @@ -193,7 +194,8 @@ public class Metrics } // Begin hitting the server with glorious data - taskId = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() + taskId = plugin.getServer().getScheduler().runTaskTimerAsynchronously( + plugin, new Runnable() { private boolean firstPost = true; diff --git a/Essentials/src/net/ess3/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java index 755d30f0c..6ce7f3948 100644 --- a/Essentials/src/net/ess3/metrics/MetricsListener.java +++ b/Essentials/src/net/ess3/metrics/MetricsListener.java @@ -1,18 +1,16 @@ package net.ess3.metrics; import static net.ess3.I18n._; - import java.util.logging.Level; - +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; public class MetricsListener implements Listener { @@ -29,9 +27,10 @@ public class MetricsListener implements Listener public void onPlayerJoin(final PlayerJoinEvent event) { final IUser player = ess.getUserMap().getUser(event.getPlayer()); - + ISettings settings = ess.getSettings(); - if (settings.getData().getGeneral().getMetricsEnabled() == null && (Permissions.ESSENTIALS.isAuthorized(event.getPlayer()) || event.getPlayer().hasPermission("bukkit.broadcast.admin"))) + if (settings.getData().getGeneral().getMetricsEnabled() == null && (Permissions.ESSENTIALS.isAuthorized( + 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 40b4c4213..8f8f4a90e 100644 --- a/Essentials/src/net/ess3/metrics/MetricsStarter.java +++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java @@ -1,5 +1,6 @@ package net.ess3.metrics; +import static net.ess3.I18n._; import java.util.Locale; import java.util.logging.Level; import net.ess3.api.IEssentials; @@ -8,7 +9,7 @@ import net.ess3.economy.register.Method; import net.ess3.economy.register.methods.VaultEco; import net.ess3.metrics.Metrics.Graph; import net.ess3.metrics.Metrics.Plotter; -import static net.ess3.I18n._; + public class MetricsStarter implements Runnable { @@ -25,7 +26,10 @@ public class MetricsStarter implements Runnable EssentialsProtect, EssentialsGeoIP, EssentialsXMPP - }; + } + + + ; public MetricsStarter(final IEssentials plugin) { @@ -81,53 +85,58 @@ public class MetricsStarter implements Runnable localeGraph.addPlotter(new SimplePlotter(ess.getI18n().getCurrentLocale().getDisplayLanguage(Locale.ENGLISH))); final Graph featureGraph = metrics.createGraph("Features"); - featureGraph.addPlotter(new Plotter("Unique Accounts") - { - @Override - public int getValue() - { - return ess.getUserMap().getUniqueUsers(); - } - }); - featureGraph.addPlotter(new Plotter("Jails") - { - @Override - public int getValue() - { - return ess.getJails().getCount(); - } - }); - featureGraph.addPlotter(new Plotter("Kits") - { - @Override - public int getValue() - { - int size = 0; - try + featureGraph.addPlotter( + new Plotter("Unique Accounts") { - size = ess.getKits().getList().size(); - } - catch (Exception ex) + @Override + public int getValue() + { + return ess.getUserMap().getUniqueUsers(); + } + }); + featureGraph.addPlotter( + new Plotter("Jails") { - } - return size; - - } - }); - featureGraph.addPlotter(new Plotter("Warps") - { - @Override - public int getValue() - { - return ess.getWarps().getList().size(); - } - }); + @Override + public int getValue() + { + return ess.getJails().getCount(); + } + }); + featureGraph.addPlotter( + new Plotter("Kits") + { + @Override + public int getValue() + { + int size = 0; + try + { + size = ess.getKits().getList().size(); + } + catch (Exception ex) + { + } + return size; + + } + }); + featureGraph.addPlotter( + new Plotter("Warps") + { + @Override + public int getValue() + { + return ess.getWarps().getList().size(); + } + }); final Graph enabledGraph = metrics.createGraph("EnabledFeatures"); enabledGraph.addPlotter(new SimplePlotter("Total")); - + ISettings settings = ess.getSettings(); - final String BKcommand = settings.getData().getGeneral().getBackup().getCommand();; + final String BKcommand = settings.getData().getGeneral().getBackup().getCommand(); + ; if (BKcommand != null && !"".equals(BKcommand)) { enabledGraph.addPlotter(new SimplePlotter("Backup")); diff --git a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java index c846a88d2..b88136006 100644 --- a/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java +++ b/Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java @@ -1,9 +1,9 @@ package net.ess3.permissions; -import net.ess3.api.IPermission; -import net.ess3.bukkit.PermissionFactory; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissionDefault; +import net.ess3.api.IPermission; +import net.ess3.bukkit.PermissionFactory; public abstract class AbstractSuperpermsPermission implements IPermission diff --git a/Essentials/src/net/ess3/permissions/BasePermission.java b/Essentials/src/net/ess3/permissions/BasePermission.java index 61b89e6c2..b1cb0be68 100644 --- a/Essentials/src/net/ess3/permissions/BasePermission.java +++ b/Essentials/src/net/ess3/permissions/BasePermission.java @@ -1,6 +1,7 @@ package net.ess3.permissions; -public class BasePermission extends AbstractSuperpermsPermission { +public class BasePermission extends AbstractSuperpermsPermission +{ protected String permission; public BasePermission(String base, String permission) @@ -13,5 +14,5 @@ public class BasePermission extends AbstractSuperpermsPermission { public String getPermissionName() { return permission; - } + } } diff --git a/Essentials/src/net/ess3/permissions/DotStarPermission.java b/Essentials/src/net/ess3/permissions/DotStarPermission.java index f557ed991..7e3383e9b 100644 --- a/Essentials/src/net/ess3/permissions/DotStarPermission.java +++ b/Essentials/src/net/ess3/permissions/DotStarPermission.java @@ -14,10 +14,10 @@ public class DotStarPermission extends AbstractSuperpermsPermission { this(base, PermissionDefault.OP); } - + public DotStarPermission(final String base, final PermissionDefault defaultPerm) { - this.base = base+"."; + this.base = base + "."; this.dotStarPermission = base + ".*"; this.defaultPerm = defaultPerm; } diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index 516dca129..60b85aecc 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -1,10 +1,10 @@ package net.ess3.permissions; import java.util.Locale; -import net.ess3.api.IPermission; -import net.ess3.bukkit.PermissionFactory; import org.bukkit.command.CommandSender; import org.bukkit.permissions.PermissionDefault; +import net.ess3.api.IPermission; +import net.ess3.bukkit.PermissionFactory; public enum Permissions implements IPermission @@ -113,7 +113,7 @@ public enum Permissions implements IPermission WARP_HIDDEN, WARP_OTHERS, VANISH_EXEMPT, - VANISH_SEE_OTHERS, + VANISH_SEE_OTHERS, VANISH_PVP, VANISH_OTHERS; private static final String base = "essentials."; @@ -162,6 +162,7 @@ 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/AbstractRanks.java b/Essentials/src/net/ess3/ranks/AbstractRanks.java index a0ea29c62..b94e24cd1 100644 --- a/Essentials/src/net/ess3/ranks/AbstractRanks.java +++ b/Essentials/src/net/ess3/ranks/AbstractRanks.java @@ -1,10 +1,10 @@ package net.ess3.ranks; import java.text.MessageFormat; -import net.ess3.api.IUser; -import net.ess3.utils.FormatUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.api.IUser; +import net.ess3.utils.FormatUtil; public abstract class AbstractRanks diff --git a/Essentials/src/net/ess3/ranks/GMGroups.java b/Essentials/src/net/ess3/ranks/GMGroups.java index 55a6295d3..2ec24e1c9 100644 --- a/Essentials/src/net/ess3/ranks/GMGroups.java +++ b/Essentials/src/net/ess3/ranks/GMGroups.java @@ -1,13 +1,13 @@ package net.ess3.ranks; import java.util.logging.Level; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.Plugin; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.Plugin; public class GMGroups extends AbstractRanks implements IRanks diff --git a/Essentials/src/net/ess3/ranks/Ranks.java b/Essentials/src/net/ess3/ranks/Ranks.java index fffe8fd4a..4e876b128 100644 --- a/Essentials/src/net/ess3/ranks/Ranks.java +++ b/Essentials/src/net/ess3/ranks/Ranks.java @@ -17,12 +17,12 @@ 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<String, RankOptions> ranks = new LinkedHashMap<String, RankOptions>(); } diff --git a/Essentials/src/net/ess3/ranks/RanksStorage.java b/Essentials/src/net/ess3/ranks/RanksStorage.java index d845a81c8..5538415d8 100644 --- a/Essentials/src/net/ess3/ranks/RanksStorage.java +++ b/Essentials/src/net/ess3/ranks/RanksStorage.java @@ -7,12 +7,12 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.Map.Entry; +import org.bukkit.command.CommandSender; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import net.ess3.permissions.Permissions; import net.ess3.storage.AsyncStorageObjectHolder; -import org.bukkit.command.CommandSender; public class RanksStorage extends AsyncStorageObjectHolder<Ranks> implements IRanks diff --git a/Essentials/src/net/ess3/ranks/VaultGroups.java b/Essentials/src/net/ess3/ranks/VaultGroups.java index ef5d1b64a..b294b6d5d 100644 --- a/Essentials/src/net/ess3/ranks/VaultGroups.java +++ b/Essentials/src/net/ess3/ranks/VaultGroups.java @@ -1,12 +1,12 @@ package net.ess3.ranks; import java.util.logging.Level; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.RegisteredServiceProvider; import net.ess3.api.IEssentials; import net.ess3.api.IRanks; import net.ess3.api.ISettings; import net.milkbowl.vault.chat.Chat; -import org.bukkit.command.CommandSender; -import org.bukkit.plugin.RegisteredServiceProvider; public class VaultGroups extends AbstractRanks implements IRanks diff --git a/Essentials/src/net/ess3/settings/Backup.java b/Essentials/src/net/ess3/settings/Backup.java index bf99962f3..bbdef7bdf 100644 --- a/Essentials/src/net/ess3/settings/Backup.java +++ b/Essentials/src/net/ess3/settings/Backup.java @@ -3,7 +3,6 @@ package net.ess3.settings; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import lombok.Data; import lombok.EqualsAndHashCode; import net.ess3.storage.Comment; @@ -19,22 +18,20 @@ 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<String> 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<String> commandsAfterBackup; - - public Backup() + + public Backup() { commandsBeforeBackup = new ArrayList<String>(); commandsBeforeBackup.add("save-all"); @@ -42,19 +39,15 @@ public class Backup implements StorageObject commandsAfterBackup = new ArrayList<String>(); commandsAfterBackup.add("save-on"); } - - public List<String> getCommandsBeforeBackup() + + public List<String> getCommandsBeforeBackup() { - return commandsBeforeBackup == null - ? Collections.<String>emptyList() - : Collections.unmodifiableList(commandsBeforeBackup); + return commandsBeforeBackup == null ? Collections.<String>emptyList() : Collections.unmodifiableList(commandsBeforeBackup); } - - public List<String> getCommandsAfterBackup() + + public List<String> getCommandsAfterBackup() { - return commandsAfterBackup == null - ? Collections.<String>emptyList() - : Collections.unmodifiableList(commandsAfterBackup); + return commandsAfterBackup == null ? Collections.<String>emptyList() : Collections.unmodifiableList(commandsAfterBackup); } - + } diff --git a/Essentials/src/net/ess3/settings/Chat.java b/Essentials/src/net/ess3/settings/Chat.java index a7a99fe6e..14c7cc702 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 da84f725d..e78e09f34 100644 --- a/Essentials/src/net/ess3/settings/Commands.java +++ b/Essentials/src/net/ess3/settings/Commands.java @@ -1,11 +1,7 @@ package net.ess3.settings; import java.util.List; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import net.ess3.settings.commands.*; import net.ess3.storage.Comment; import net.ess3.storage.ListType; @@ -30,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<String> overridden = null; diff --git a/Essentials/src/net/ess3/settings/Economy.java b/Essentials/src/net/ess3/settings/Economy.java index 54315bca8..bd37372bd 100644 --- a/Essentials/src/net/ess3/settings/Economy.java +++ b/Essentials/src/net/ess3/settings/Economy.java @@ -1,11 +1,7 @@ package net.ess3.settings; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import net.ess3.economy.Worth; import net.ess3.storage.Comment; import net.ess3.storage.MapValueType; @@ -30,30 +26,32 @@ public class Economy implements StorageObject { return currencySymbol == null || currencySymbol.isEmpty() ? "$" : currencySymbol.substring(0, 1); } + private final transient 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 775aa3ff9..6fbdb5b8c 100644 --- a/Essentials/src/net/ess3/settings/General.java +++ b/Essentials/src/net/ess3/settings/General.java @@ -17,25 +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; @@ -43,20 +42,21 @@ 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.<worldname>" - }) + { + "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.<worldname>" + }) private boolean worldTeleportPermissions = false; private boolean worldHomePermissions = false; @Comment("Delay to wait before people can cause attack damage after logging in ") @@ -71,6 +71,7 @@ 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/Jails.java b/Essentials/src/net/ess3/settings/Jails.java index 394a1d437..bce7a80c5 100644 --- a/Essentials/src/net/ess3/settings/Jails.java +++ b/Essentials/src/net/ess3/settings/Jails.java @@ -3,15 +3,11 @@ package net.ess3.settings; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import org.bukkit.Location; +import lombok.*; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; import net.ess3.storage.StoredLocation; -import org.bukkit.Location; @Data @@ -22,15 +18,14 @@ public class Jails implements StorageObject @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private Map<String, StoredLocation> jails; - + public Map<String, StoredLocation> getJails() { - return jails == null - ? Collections.<String, StoredLocation>emptyMap() - : Collections.unmodifiableMap(jails); + return jails == null ? Collections.<String, StoredLocation>emptyMap() : Collections.unmodifiableMap(jails); } - - public void addJail(String name, Location loc) { + + public void addJail(String name, Location loc) + { Map<String, StoredLocation> jailMap = new HashMap<String, StoredLocation>(getJails()); jailMap.put(name, new StoredLocation(loc)); jails = jailMap; diff --git a/Essentials/src/net/ess3/settings/Kit.java b/Essentials/src/net/ess3/settings/Kit.java index 4b671f25c..58e7930e0 100644 --- a/Essentials/src/net/ess3/settings/Kit.java +++ b/Essentials/src/net/ess3/settings/Kit.java @@ -4,14 +4,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import org.bukkit.inventory.ItemStack; +import lombok.*; import net.ess3.storage.ListType; import net.ess3.storage.StorageObject; -import org.bukkit.inventory.ItemStack; @Data @@ -26,12 +22,11 @@ public class Kit implements StorageObject public List<ItemStack> getItems() { - return items == null - ? Collections.<ItemStack>emptyList() - : Collections.unmodifiableList(items); + return items == null ? Collections.<ItemStack>emptyList() : Collections.unmodifiableList(items); } - - public void setItems(Collection<ItemStack> items) { + + public void setItems(Collection<ItemStack> items) + { this.items = new ArrayList<ItemStack>(items); } } diff --git a/Essentials/src/net/ess3/settings/Kits.java b/Essentials/src/net/ess3/settings/Kits.java index 1264c8e55..392350820 100644 --- a/Essentials/src/net/ess3/settings/Kits.java +++ b/Essentials/src/net/ess3/settings/Kits.java @@ -4,15 +4,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; -import net.ess3.storage.MapValueType; -import net.ess3.storage.StorageObject; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +import lombok.*; +import net.ess3.storage.MapValueType; +import net.ess3.storage.StorageObject; @Data @@ -23,13 +19,13 @@ public class Kits implements StorageObject { final Kit kit = new Kit(); kit.setDelay(10.0); - kit.setItems(Arrays.<ItemStack>asList( - new ItemStack(Material.DIAMOND_SPADE, 1), - new ItemStack(Material.DIAMOND_PICKAXE, 1), - new ItemStack(Material.DIAMOND_AXE, 1))); + kit.setItems( + Arrays.<ItemStack>asList( + new ItemStack(Material.DIAMOND_SPADE, 1), new ItemStack(Material.DIAMOND_PICKAXE, 1), new ItemStack(Material.DIAMOND_AXE, 1))); kits = new HashMap<String, Kit>(); kits.put("tools", kit); } + @MapValueType(Kit.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) @@ -37,8 +33,6 @@ public class Kits implements StorageObject public Map<String, Kit> getKits() { - return kits == null - ? Collections.<String, Kit>emptyMap() - : Collections.unmodifiableMap(kits); + return kits == null ? Collections.<String, Kit>emptyMap() : Collections.unmodifiableMap(kits); } } diff --git a/Essentials/src/net/ess3/settings/Settings.java b/Essentials/src/net/ess3/settings/Settings.java index 9ed3fd498..a73e5f42d 100644 --- a/Essentials/src/net/ess3/settings/Settings.java +++ b/Essentials/src/net/ess3/settings/Settings.java @@ -1,11 +1,7 @@ package net.ess3.settings; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; @@ -16,49 +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/Spawns.java b/Essentials/src/net/ess3/settings/Spawns.java index 2ebd5b283..f59cdac1a 100644 --- a/Essentials/src/net/ess3/settings/Spawns.java +++ b/Essentials/src/net/ess3/settings/Spawns.java @@ -3,16 +3,12 @@ package net.ess3.settings; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import org.bukkit.Location; +import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; import net.ess3.storage.StoredLocation; -import org.bukkit.Location; @Data @@ -20,39 +16,34 @@ 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) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private Map<String, StoredLocation> spawns; - + public Map<String, StoredLocation> getSpawns() { - return spawns == null - ? Collections.<String, StoredLocation>emptyMap() - : Collections.unmodifiableMap(spawns); + return spawns == null ? Collections.<String, StoredLocation>emptyMap() : Collections.unmodifiableMap(spawns); } - + public void addSpawn(String name, Location location) { Map<String, StoredLocation> newspawns = new HashMap<String, StoredLocation>(getSpawns()); diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index 2694eafa3..9588f7200 100644 --- a/Essentials/src/net/ess3/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -1,10 +1,19 @@ package net.ess3.settings; +import static net.ess3.I18n._; import java.io.File; import java.util.Locale; import java.util.Map; import java.util.logging.Level; -import static net.ess3.I18n._; +import org.bukkit.*; +import org.bukkit.event.Event; +import org.bukkit.event.EventException; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerRespawnEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.plugin.EventExecutor; import net.ess3.api.IEssentials; import net.ess3.api.IEssentialsModule; import net.ess3.api.ISettings; @@ -15,15 +24,6 @@ import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.SimpleTextInput; import net.ess3.utils.textreader.SimpleTextPager; -import org.bukkit.*; -import org.bukkit.event.Event; -import org.bukkit.event.EventException; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.plugin.EventExecutor; public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IEssentialsModule @@ -37,7 +37,8 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> 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) @@ -53,6 +54,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE /** * Get the spawn for a group from the config + * * @param group - Group name * @return */ @@ -84,6 +86,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE /** * Gets the World spawn location + * * @return */ private Location getWorldSpawn() @@ -101,6 +104,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE /** * Get re-spawn listen priority + * * @return */ public EventPriority getRespawnPriority() @@ -117,12 +121,12 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE /** * Get the newbie spawn from the config + * * @return */ public Location getNewbieSpawn() { - if (getData().getNewbieSpawn() == null || getData().getNewbieSpawn().isEmpty() - || getData().getNewbieSpawn().equalsIgnoreCase("none")) + if (getData().getNewbieSpawn() == null || getData().getNewbieSpawn().isEmpty() || getData().getNewbieSpawn().equalsIgnoreCase("none")) { return null; } @@ -136,14 +140,19 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE public String getAnnounceNewPlayerFormat(IUser user) { - return getData().getNewPlayerAnnouncement().replace('&', '\u00a7').replace("\u00a7\u00a7", "&").replace("{PLAYER}", user.getPlayer().getDisplayName()).replace("{DISPLAYNAME}", user.getPlayer().getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getPlayer().getAddress().toString()); + return getData().getNewPlayerAnnouncement().replace('&', '\u00a7').replace("\u00a7\u00a7", "&").replace( + "{PLAYER}", user.getPlayer().getDisplayName()).replace( + "{DISPLAYNAME}", user.getPlayer().getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace( + "{USERNAME}", user.getName()).replace( + "{ADDRESS}", user.getPlayer().getAddress().toString()); } //TODO: Why is this stuff here in the settings folder? private void registerListeners() { final SpawnPlayerListener playerListener = new SpawnPlayerListener(ess, this); - ess.getServer().getPluginManager().registerEvent(PlayerRespawnEvent.class, playerListener, getRespawnPriority(), new EventExecutor() + ess.getServer().getPluginManager().registerEvent( + PlayerRespawnEvent.class, playerListener, getRespawnPriority(), new EventExecutor() { @Override public void execute(final Listener ll, final Event event) throws EventException @@ -151,7 +160,8 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE ((SpawnPlayerListener)ll).onPlayerRespawn((PlayerRespawnEvent)event); } }, ess.getPlugin()); - ess.getServer().getPluginManager().registerEvent(PlayerJoinEvent.class, playerListener, getRespawnPriority(), new EventExecutor() + ess.getServer().getPluginManager().registerEvent( + PlayerJoinEvent.class, playerListener, getRespawnPriority(), new EventExecutor() { @Override public void execute(final Listener ll, final Event event) throws EventException diff --git a/Essentials/src/net/ess3/settings/Warp.java b/Essentials/src/net/ess3/settings/Warp.java index 99ce3cce7..9d1910416 100644 --- a/Essentials/src/net/ess3/settings/Warp.java +++ b/Essentials/src/net/ess3/settings/Warp.java @@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode; import net.ess3.storage.StorageObject; import net.ess3.storage.StoredLocation; + @Data @EqualsAndHashCode(callSuper = false) public class Warp implements StorageObject diff --git a/Essentials/src/net/ess3/settings/WorldOptions.java b/Essentials/src/net/ess3/settings/WorldOptions.java index ae3e35ea9..deb06bd39 100644 --- a/Essentials/src/net/ess3/settings/WorldOptions.java +++ b/Essentials/src/net/ess3/settings/WorldOptions.java @@ -2,14 +2,10 @@ package net.ess3.settings; import java.util.EnumMap; import java.util.Map; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import org.bukkit.entity.EntityType; +import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.StorageObject; -import org.bukkit.entity.EntityType; @Data @@ -30,6 +26,7 @@ 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") @@ -39,6 +36,7 @@ public class WorldOptions implements StorageObject /** * Checks if a entity can be spawned. + * * @param creatureName - Name of the {@link EntityType} * @return */ @@ -49,6 +47,7 @@ public class WorldOptions implements StorageObject /** * Checks if an {@link EntityType} is allowed to be spawned + * * @param creature - {@link EntityType} to check * @return */ diff --git a/Essentials/src/net/ess3/settings/Worlds.java b/Essentials/src/net/ess3/settings/Worlds.java index 4e624c961..c3f1f09d0 100644 --- a/Essentials/src/net/ess3/settings/Worlds.java +++ b/Essentials/src/net/ess3/settings/Worlds.java @@ -4,9 +4,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import net.ess3.storage.StorageObject; + @Data @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 7c2218372..6ce34e9e1 100644 --- a/Essentials/src/net/ess3/settings/antibuild/Alert.java +++ b/Essentials/src/net/ess3/settings/antibuild/Alert.java @@ -3,15 +3,11 @@ package net.ess3.settings.antibuild; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import org.bukkit.Material; +import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.ListType; import net.ess3.storage.StorageObject; -import org.bukkit.Material; @Data @@ -36,9 +32,8 @@ 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 94a8aac2d..3bbf32f42 100644 --- a/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java +++ b/Essentials/src/net/ess3/settings/antibuild/AntiBuild.java @@ -2,7 +2,8 @@ package net.ess3.settings.antibuild; import lombok.Data; import lombok.EqualsAndHashCode; -import net.ess3.storage.*; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data @@ -10,25 +11,23 @@ import net.ess3.storage.*; 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 c320d6d4e..c058b9be4 100644 --- a/Essentials/src/net/ess3/settings/antibuild/BlackList.java +++ b/Essentials/src/net/ess3/settings/antibuild/BlackList.java @@ -3,15 +3,11 @@ package net.ess3.settings.antibuild; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import org.bukkit.Material; +import lombok.*; import net.ess3.storage.Comment; import net.ess3.storage.ListType; import net.ess3.storage.StorageObject; -import org.bukkit.Material; @Data @@ -19,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<Material> placement = new HashSet<Material>(); @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<Material> usage = new HashSet<Material>(); @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<Material> breaking = new HashSet<Material>(); @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) @@ -53,9 +49,8 @@ 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 171926218..5136dd8d0 100644 --- a/Essentials/src/net/ess3/settings/commands/Afk.java +++ b/Essentials/src/net/ess3/settings/commands/Afk.java @@ -11,28 +11,22 @@ 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 e83c53860..c0e7ed7b6 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 585426dce..77eeacb55 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.<plugin>, 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.<plugin>, 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 8b4c7356b..2ef08fe1f 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/SocialSpy.java b/Essentials/src/net/ess3/settings/commands/SocialSpy.java index 9cb572689..4460c0cfd 100644 --- a/Essentials/src/net/ess3/settings/commands/SocialSpy.java +++ b/Essentials/src/net/ess3/settings/commands/SocialSpy.java @@ -21,6 +21,7 @@ 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<String> socialspyCommands = new ArrayList<String>(); diff --git a/Essentials/src/net/ess3/settings/commands/Speed.java b/Essentials/src/net/ess3/settings/commands/Speed.java index cb9652006..295a6a1b3 100644 --- a/Essentials/src/net/ess3/settings/commands/Speed.java +++ b/Essentials/src/net/ess3/settings/commands/Speed.java @@ -5,13 +5,14 @@ import lombok.EqualsAndHashCode; import net.ess3.storage.Comment; import net.ess3.storage.StorageObject; + @Data @EqualsAndHashCode(callSuper = false) public class Speed implements StorageObject { @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"}) 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 04be7a24e..6c6bdca06 100644 --- a/Essentials/src/net/ess3/settings/commands/Teleport.java +++ b/Essentials/src/net/ess3/settings/commands/Teleport.java @@ -11,18 +11,17 @@ 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 = 0; - @Comment({"Cancels a request made by tpa / tphere on world change to prevent cross world tp"}) - private boolean cancelRequestsOnWorldChange = false; + @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 17c5a85e0..553776c9d 100644 --- a/Essentials/src/net/ess3/settings/protect/Prevent.java +++ b/Essentials/src/net/ess3/settings/protect/Prevent.java @@ -2,14 +2,15 @@ package net.ess3.settings.protect; import lombok.Data; import lombok.EqualsAndHashCode; -import net.ess3.storage.*; +import net.ess3.storage.Comment; +import net.ess3.storage.StorageObject; @Data @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 @@ -29,9 +30,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 5b1a9ae87..ff4af10ff 100644 --- a/Essentials/src/net/ess3/settings/protect/Protect.java +++ b/Essentials/src/net/ess3/settings/protect/Protect.java @@ -9,19 +9,19 @@ import net.ess3.storage.StorageObject; @Data @EqualsAndHashCode(callSuper = false) 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..436808e09 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -5,8 +5,8 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.util.logging.Level; -import net.ess3.api.IEssentials; import org.bukkit.Bukkit; +import net.ess3.api.IEssentials; public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> implements Runnable diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index 2a74c4cd5..8ab5edcac 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -5,8 +5,8 @@ import java.io.FileNotFoundException; import java.io.PrintWriter; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; -import net.ess3.api.IEssentials; import org.bukkit.Bukkit; +import net.ess3.api.IEssentials; public abstract class AbstractDelayedYamlFileWriter implements Runnable diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java index 4c909b1bb..81bf3e6c6 100644 --- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java @@ -4,8 +4,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; -import net.ess3.api.IEssentials; import org.bukkit.Bukkit; +import net.ess3.api.IEssentials; public abstract class AsyncStorageObjectHolder<T extends StorageObject> implements IStorageObjectHolder<T> @@ -39,7 +39,6 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen /** * Warning: If you access this method, you have to acquire a read or write lock first * - * * @return Object storing all the data */ @Override diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index 13e8665b1..32bf5fc76 100644 --- a/Essentials/src/net/ess3/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -5,12 +5,12 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; -import net.ess3.Essentials; -import net.ess3.api.IPlugin; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; +import net.ess3.Essentials; +import net.ess3.api.IPlugin; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.error.YAMLException; @@ -407,8 +407,8 @@ public class BukkitConstructor extends Constructor } catch (Exception e) { - throw new YAMLException("Cannot create property=" + key + " for JavaBean=" - + object + "; " + e.getMessage(), e); + throw new YAMLException( + "Cannot create property=" + key + " for JavaBean=" + object + "; " + e.getMessage(), e); } } return object; diff --git a/Essentials/src/net/ess3/storage/EnchantmentLevel.java b/Essentials/src/net/ess3/storage/EnchantmentLevel.java index ad583f17f..5cb0ad346 100644 --- a/Essentials/src/net/ess3/storage/EnchantmentLevel.java +++ b/Essentials/src/net/ess3/storage/EnchantmentLevel.java @@ -67,8 +67,7 @@ public class EnchantmentLevel implements Entry<Enchantment, Integer> if (obj instanceof Entry) { final Entry entry = (Entry)obj; - if (entry.getKey() instanceof Enchantment - && entry.getValue() instanceof Integer) + if (entry.getKey() instanceof Enchantment && entry.getValue() instanceof Integer) { final Enchantment objEnchantment = (Enchantment)entry.getKey(); final Integer objLevel = (Integer)entry.getValue(); diff --git a/Essentials/src/net/ess3/storage/ManagedFile.java b/Essentials/src/net/ess3/storage/ManagedFile.java index c6e23e6b8..cf2abd6d9 100644 --- a/Essentials/src/net/ess3/storage/ManagedFile.java +++ b/Essentials/src/net/ess3/storage/ManagedFile.java @@ -1,5 +1,6 @@ package net.ess3.storage; +import static net.ess3.I18n._; import java.io.*; import java.math.BigInteger; import java.security.DigestInputStream; @@ -10,9 +11,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.logging.Level; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; import org.bukkit.Bukkit; +import net.ess3.api.IEssentials; public class ManagedFile @@ -156,7 +156,8 @@ public class ManagedFile } else { - Bukkit.getLogger().warning("File " + file.toString() + " has been modified by user and file version differs, please update the file manually."); + Bukkit.getLogger().warning( + "File " + file.toString() + " has been modified by user and file version differs, please update the file manually."); } } finally diff --git a/Essentials/src/net/ess3/storage/ObjectLoadException.java b/Essentials/src/net/ess3/storage/ObjectLoadException.java index e70ec5b8a..f5c3c1f02 100644 --- a/Essentials/src/net/ess3/storage/ObjectLoadException.java +++ b/Essentials/src/net/ess3/storage/ObjectLoadException.java @@ -3,7 +3,7 @@ package net.ess3.storage; public class ObjectLoadException extends Exception { - private static final long serialVersionUID = 8263648967116854400L; + private static final long serialVersionUID = 8263648967116854400L; public ObjectLoadException(Throwable thrwbl) { diff --git a/Essentials/src/net/ess3/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java index 044499902..f1872c24d 100644 --- a/Essentials/src/net/ess3/storage/StorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java @@ -1,9 +1,5 @@ package net.ess3.storage; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.util.concurrent.UncheckedExecutionException; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -16,6 +12,10 @@ import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ExecutionException; import java.util.logging.Level; import java.util.regex.Pattern; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.util.concurrent.UncheckedExecutionException; import net.ess3.api.IEssentials; import net.ess3.api.InvalidNameException; import net.ess3.utils.Util; @@ -32,7 +32,7 @@ public abstract class StorageObjectMap<I> extends CacheLoader<String, I> impleme protected final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>(); protected final transient ConcurrentSkipListMap<String, File> zippedfiles = new ConcurrentSkipListMap<String, File>(); private final Pattern zipCheck = Pattern.compile("^[a-zA-Z0-9]*-?[a-zA-Z0-9]+\\.yml$"); - + public StorageObjectMap(final IEssentials ess, final String folderName) { super(); @@ -47,82 +47,83 @@ public abstract class StorageObjectMap<I> extends CacheLoader<String, I> impleme private void loadAllObjectsAsync() { - ess.getPlugin().scheduleAsyncDelayedTask(new Runnable() - { - @Override - public void run() - { - if (!folder.exists() || !folder.isDirectory()) + ess.getPlugin().scheduleAsyncDelayedTask( + new Runnable() { - return; - } - keys.clear(); - cache.invalidateAll(); - for (String string : folder.list()) - { - final File file = new File(folder, string); - if (!file.isFile() || !file.canRead()) - { - continue; - } - if (string.endsWith(".yml")) + @Override + public void run() { - addFileToKeys(string.substring(0, string.length() - 4)); + if (!folder.exists() || !folder.isDirectory()) + { + return; + } + keys.clear(); + cache.invalidateAll(); + for (String string : folder.list()) + { + final File file = new File(folder, string); + if (!file.isFile() || !file.canRead()) + { + continue; + } + if (string.endsWith(".yml")) + { + addFileToKeys(string.substring(0, string.length() - 4)); + } + if (string.endsWith(".zip")) + { + addZipFile(file); + } + } } - if (string.endsWith(".zip")) + + private void addFileToKeys(String filename) { - addZipFile(file); - } - } - } + try + { - private void addFileToKeys(String filename) - { - try - { + final String name = Util.decodeFileName(filename); + keys.add(name.toLowerCase(Locale.ENGLISH)); - final String name = Util.decodeFileName(filename); - keys.add(name.toLowerCase(Locale.ENGLISH)); + } + catch (InvalidNameException ex) + { + ess.getLogger().log(Level.WARNING, "Invalid filename: " + filename, ex); + } + } - } - catch (InvalidNameException ex) - { - ess.getLogger().log(Level.WARNING, "Invalid filename: " + filename, ex); - } - } - - private void addZipFile(File file) - { - try - { - final ZipFile zipFile = new ZipFile(file); - try + private void addZipFile(File file) { - final Enumeration<ZipArchiveEntry> entries = zipFile.getEntriesInPhysicalOrder(); - while (entries.hasMoreElements()) + try { - final ZipArchiveEntry entry = entries.nextElement(); - final String name = entry.getName(); - if (entry.isDirectory() || entry.getSize() == 0 || !zipCheck.matcher(name).matches()) + final ZipFile zipFile = new ZipFile(file); + try { - continue; + final Enumeration<ZipArchiveEntry> entries = zipFile.getEntriesInPhysicalOrder(); + while (entries.hasMoreElements()) + { + final ZipArchiveEntry entry = entries.nextElement(); + final String name = entry.getName(); + if (entry.isDirectory() || entry.getSize() == 0 || !zipCheck.matcher(name).matches()) + { + continue; + } + final String shortName = name.substring(0, name.length() - 4); + addFileToKeys(shortName); + zippedfiles.put(name, file); + } + } + finally + { + zipFile.close(); } - final String shortName = name.substring(0, name.length() - 4); - addFileToKeys(shortName); - zippedfiles.put(name, file); + } + catch (IOException ex) + { + ess.getLogger().log(Level.WARNING, "Error opening file " + file.getAbsolutePath(), ex); } } - finally - { - zipFile.close(); - } - } - catch (IOException ex) - { - ess.getLogger().log(Level.WARNING, "Error opening file " + file.getAbsolutePath(), ex); - } - } - }); + }); } @Override diff --git a/Essentials/src/net/ess3/storage/StorageQueue.java b/Essentials/src/net/ess3/storage/StorageQueue.java index 9e0ad91c4..5084ba82f 100644 --- a/Essentials/src/net/ess3/storage/StorageQueue.java +++ b/Essentials/src/net/ess3/storage/StorageQueue.java @@ -10,7 +10,7 @@ import java.util.logging.Level; import net.ess3.api.IPlugin; -public class StorageQueue implements Runnable +public class StorageQueue implements Runnable { private DelayQueue<WriteRequest> queue = new DelayQueue<WriteRequest>(); public final static long DELAY = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS); @@ -62,9 +62,10 @@ public class StorageQueue implements Runnable { if (!enabled.get()) { - plugin.getLogger().log(Level.SEVERE, - "File " + objectHolder.toString() + " is queued for saving, while the queue is disabled. It's possible that it will not be saved!", - new RuntimeException()); + plugin.getLogger().log( + Level.SEVERE, + "File " + objectHolder.toString() + " is queued for saving, while the queue is disabled. It's possible that it will not be saved!", + new RuntimeException()); } queue.add(new WriteRequest(objectHolder)); } diff --git a/Essentials/src/net/ess3/storage/StoredLocation.java b/Essentials/src/net/ess3/storage/StoredLocation.java index 4b05cc796..f503758b8 100644 --- a/Essentials/src/net/ess3/storage/StoredLocation.java +++ b/Essentials/src/net/ess3/storage/StoredLocation.java @@ -91,7 +91,7 @@ public class StoredLocation public static class WorldNotLoadedException extends Exception { - private static final long serialVersionUID = -2079102649647074279L; + private static final long serialVersionUID = -2079102649647074279L; public WorldNotLoadedException(String worldname) { diff --git a/Essentials/src/net/ess3/storage/YamlStorageReader.java b/Essentials/src/net/ess3/storage/YamlStorageReader.java index 88ab5bcd9..f49a0b5a2 100644 --- a/Essentials/src/net/ess3/storage/YamlStorageReader.java +++ b/Essentials/src/net/ess3/storage/YamlStorageReader.java @@ -80,8 +80,7 @@ public class YamlStorageReader implements IStorageReader { prepareList(field, description, classes, constructor); prepareMap(field, description, classes, constructor); - if (StorageObject.class.isAssignableFrom(field.getType()) - && !classes.contains(field.getType())) + if (StorageObject.class.isAssignableFrom(field.getType()) && !classes.contains(field.getType())) { prepareConstructor(constructor, classes, field.getType()); } @@ -95,8 +94,7 @@ public class YamlStorageReader implements IStorageReader if (listType != null) { description.putListPropertyType(field.getName(), listType.value()); - if (StorageObject.class.isAssignableFrom(listType.value()) - && !classes.contains(listType.value())) + if (StorageObject.class.isAssignableFrom(listType.value()) && !classes.contains(listType.value())) { prepareConstructor(constructor, classes, listType.value()); } @@ -109,11 +107,9 @@ public class YamlStorageReader implements IStorageReader if (mapType != null) { final MapKeyType mapKeyType = field.getAnnotation(MapKeyType.class); - description.putMapPropertyType(field.getName(), - mapKeyType == null ? String.class : mapKeyType.value(), - mapType.value()); - if (StorageObject.class.isAssignableFrom(mapType.value()) - && !classes.contains(mapType.value())) + description.putMapPropertyType( + field.getName(), mapKeyType == null ? String.class : mapKeyType.value(), mapType.value()); + if (StorageObject.class.isAssignableFrom(mapType.value()) && !classes.contains(mapType.value())) { prepareConstructor(constructor, classes, mapType.value()); } diff --git a/Essentials/src/net/ess3/storage/YamlStorageWriter.java b/Essentials/src/net/ess3/storage/YamlStorageWriter.java index 40ac71464..e5de1460b 100644 --- a/Essentials/src/net/ess3/storage/YamlStorageWriter.java +++ b/Essentials/src/net/ess3/storage/YamlStorageWriter.java @@ -83,7 +83,7 @@ public class YamlStorageWriter implements IStorageWriter } } } - writer.println(); + writer.println(); } private boolean writeKey(final Field field, final int depth, final Object data) @@ -197,7 +197,7 @@ public class YamlStorageWriter implements IStorageWriter } } } - writer.println(); + writer.println(); } private void writeIndention(final int depth) diff --git a/Essentials/src/net/ess3/user/CooldownException.java b/Essentials/src/net/ess3/user/CooldownException.java index 5bd9da29f..08e163522 100644 --- a/Essentials/src/net/ess3/user/CooldownException.java +++ b/Essentials/src/net/ess3/user/CooldownException.java @@ -4,11 +4,11 @@ package net.ess3.user; public class CooldownException extends Exception { - private static final long serialVersionUID = 913632836257457319L; + 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 94b626ab7..d520ce833 100644 --- a/Essentials/src/net/ess3/user/IOfflinePlayer.java +++ b/Essentials/src/net/ess3/user/IOfflinePlayer.java @@ -10,10 +10,10 @@ public interface IOfflinePlayer String getDisplayName(); //Location getBedSpawnLocation(); - + void setBanned(boolean bln); - + boolean hasPermission(Permission perm); - + void setName(final String name); }
\ No newline at end of file diff --git a/Essentials/src/net/ess3/user/IOfflineUser.java b/Essentials/src/net/ess3/user/IOfflineUser.java index 19431d982..b5361da4f 100644 --- a/Essentials/src/net/ess3/user/IOfflineUser.java +++ b/Essentials/src/net/ess3/user/IOfflineUser.java @@ -5,5 +5,5 @@ import net.ess3.storage.IStorageObjectHolder; public interface IOfflineUser extends IStorageObjectHolder<UserData>//, IOfflinePlayer { - + } diff --git a/Essentials/src/net/ess3/user/Inventory.java b/Essentials/src/net/ess3/user/Inventory.java index b50b8c535..fdd523eec 100644 --- a/Essentials/src/net/ess3/user/Inventory.java +++ b/Essentials/src/net/ess3/user/Inventory.java @@ -2,12 +2,12 @@ package net.ess3.user; import java.util.HashMap; import java.util.Map; +import org.bukkit.inventory.ItemStack; import lombok.Data; import lombok.EqualsAndHashCode; import net.ess3.storage.MapKeyType; import net.ess3.storage.MapValueType; import net.ess3.storage.StorageObject; -import org.bukkit.inventory.ItemStack; @Data @@ -26,14 +26,16 @@ public class Inventory implements StorageObject public Inventory(ItemStack[] contents) { size = contents.length; - if (items == null) { + if (items == null) + { items = new HashMap<Integer, ItemStack>(size); } items.clear(); for (int i = 0; i < contents.length; i++) { ItemStack itemStack = contents[i]; - if (itemStack == null) { + if (itemStack == null) + { continue; } items.put(i, itemStack); @@ -42,13 +44,15 @@ public class Inventory implements StorageObject public ItemStack[] getBukkitInventory() { - if (items == null) { + if (items == null) + { throw new IllegalStateException(); } final ItemStack[] inventory = new ItemStack[size]; for (Map.Entry<Integer, ItemStack> entry : items.entrySet()) { - if (entry.getKey() < 0 || entry.getKey()>= size) { + if (entry.getKey() < 0 || entry.getKey() >= size) + { continue; } inventory[entry.getKey()] = entry.getValue(); diff --git a/Essentials/src/net/ess3/user/PlayerNotFoundException.java b/Essentials/src/net/ess3/user/PlayerNotFoundException.java index 09b2488cd..2c3c741c1 100644 --- a/Essentials/src/net/ess3/user/PlayerNotFoundException.java +++ b/Essentials/src/net/ess3/user/PlayerNotFoundException.java @@ -2,9 +2,11 @@ package net.ess3.user; import static net.ess3.I18n._; -public class PlayerNotFoundException extends Exception { - private static final long serialVersionUID = -510752839980332640L; +public class PlayerNotFoundException extends Exception +{ + + private static final long serialVersionUID = -510752839980332640L; public PlayerNotFoundException() { diff --git a/Essentials/src/net/ess3/user/TooManyMatchesException.java b/Essentials/src/net/ess3/user/TooManyMatchesException.java index ce4bc9f61..f5911a746 100644 --- a/Essentials/src/net/ess3/user/TooManyMatchesException.java +++ b/Essentials/src/net/ess3/user/TooManyMatchesException.java @@ -1,14 +1,14 @@ package net.ess3.user; +import static net.ess3.I18n._; import java.util.Collections; import java.util.Set; -import static net.ess3.I18n._; import net.ess3.api.IUser; public class TooManyMatchesException extends Exception { - private static final long serialVersionUID = -1458262878150217201L; + private static final long serialVersionUID = -1458262878150217201L; private final Set<IUser> matches; public TooManyMatchesException() diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index aaae52ead..e3523c7fd 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -1,15 +1,20 @@ package net.ess3.user; +import static net.ess3.I18n._; import java.lang.ref.WeakReference; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import org.bukkit.Location; +import org.bukkit.OfflinePlayer; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import lombok.Getter; import lombok.Setter; import net.ess3.Console; -import static net.ess3.I18n._; import net.ess3.Teleport; import net.ess3.api.*; import net.ess3.craftbukkit.InventoryWorkaround; @@ -17,11 +22,6 @@ import net.ess3.economy.register.Method; import net.ess3.permissions.Permissions; import net.ess3.utils.DateUtil; import net.ess3.utils.FormatUtil; -import org.bukkit.Location; -import org.bukkit.OfflinePlayer; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; public class User extends UserBase implements IUser @@ -245,7 +245,10 @@ public class User extends UserBase implements IUser { final Boolean changeDisplayname = ess.getSettings().getData().getChat().getChangeDisplayname(); - if (isOnline() && (changeDisplayname == true || (changeDisplayname == null && ess.getPlugin().isModuleEnabled("Chat")))); + if (isOnline() && (changeDisplayname == true || (changeDisplayname == null && ess.getPlugin().isModuleEnabled("Chat")))) + { + ; + } { setDisplayNick(); } @@ -392,8 +395,7 @@ public class User extends UserBase implements IUser final long autoafkkick = settings.getData().getCommands().getAfk().getAutoAFKKick(); if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis() //&& !hidden - && !Permissions.KICK_EXEMPT.isAuthorized(this) - && !Permissions.AFK_KICKEXEMPT.isAuthorized(this)) + && !Permissions.KICK_EXEMPT.isAuthorized(this) && !Permissions.AFK_KICKEXEMPT.isAuthorized(this)) { final String kickReason = _("autoAfkKickReason", autoafkkick / 60.0); lastActivity = 0; @@ -427,9 +429,8 @@ public class User extends UserBase implements IUser public boolean isGodModeEnabled() { final ISettings settings = ess.getSettings(); - return (getData().isGodmode() - && !settings.getData().getWorldOptions(getPlayer().getLocation().getWorld().getName()).isGodmode()) - || (getData().isAfk() && settings.getData().getCommands().getAfk().isFreezeAFKPlayers()); + return (getData().isGodmode() && !settings.getData().getWorldOptions( + getPlayer().getLocation().getWorld().getName()).isGodmode()) || (getData().isAfk() && settings.getData().getCommands().getAfk().isFreezeAFKPlayers()); } @Override @@ -591,6 +592,7 @@ public class User extends UserBase implements IUser { return true; } + private transient long teleportInvulnerabilityTimestamp = 0; public void enableInvulnerabilityAfterTeleport() @@ -607,8 +609,7 @@ public class User extends UserBase implements IUser @Override public void resetInvulnerabilityAfterTeleport() { - if (teleportInvulnerabilityTimestamp != 0 - && teleportInvulnerabilityTimestamp < System.currentTimeMillis()) + if (teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp < System.currentTimeMillis()) { teleportInvulnerabilityTimestamp = 0; } diff --git a/Essentials/src/net/ess3/user/UserBase.java b/Essentials/src/net/ess3/user/UserBase.java index 7a9d252b4..90ee40138 100644 --- a/Essentials/src/net/ess3/user/UserBase.java +++ b/Essentials/src/net/ess3/user/UserBase.java @@ -1,26 +1,28 @@ package net.ess3.user; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Set; +import org.bukkit.Location; +import org.bukkit.OfflinePlayer; +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.permissions.Permission; +import org.bukkit.permissions.PermissionAttachment; +import org.bukkit.permissions.PermissionAttachmentInfo; +import org.bukkit.plugin.Plugin; import lombok.Delegate; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.api.InvalidNameException; import net.ess3.permissions.Permissions; -import net.ess3.settings.Economy; import net.ess3.storage.AsyncStorageObjectHolder; import net.ess3.storage.IStorageObjectHolder; import net.ess3.storage.StoredLocation.WorldNotLoadedException; import net.ess3.utils.Util; -import org.bukkit.Location; -import org.bukkit.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.permissions.Permission; -import org.bukkit.permissions.PermissionAttachment; -import org.bukkit.permissions.PermissionAttachmentInfo; -import org.bukkit.plugin.Plugin; public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implements OfflinePlayer, CommandSender, IStorageObjectHolder<UserData> @@ -241,7 +243,8 @@ public abstract class UserBase extends AsyncStorageObjectHolder<UserData> implem public boolean isIgnoringPlayer(final IUser user) { - return getData().getIgnore() == null ? false : getData().getIgnore().contains(user.getName().toLowerCase(Locale.ENGLISH)) && Permissions.CHAT_IGNORE_EXEMPT.isAuthorized(user); + return getData().getIgnore() == null ? false : getData().getIgnore().contains( + user.getName().toLowerCase(Locale.ENGLISH)) && Permissions.CHAT_IGNORE_EXEMPT.isAuthorized(user); } public void setIgnoredPlayer(final IUser user, final boolean set) diff --git a/Essentials/src/net/ess3/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java index 35ab164e3..a25775333 100644 --- a/Essentials/src/net/ess3/user/UserData.java +++ b/Essentials/src/net/ess3/user/UserData.java @@ -1,14 +1,10 @@ package net.ess3.user; import java.util.*; -import lombok.AccessLevel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; -import net.ess3.storage.*; import org.bukkit.Location; import org.bukkit.Material; +import lombok.*; +import net.ess3.storage.*; @Data @@ -19,6 +15,8 @@ public class UserData implements StorageObject { JAIL, MUTE, LASTHEAL, LASTTELEPORT, LOGIN, LOGOUT, KIT, COMMAND } + + private String nickname; private Double money; @MapValueType(StoredLocation.class) @@ -28,10 +26,9 @@ public class UserData implements StorageObject public Map<String, StoredLocation> getHomes() { - return homes == null - ? Collections.<String, StoredLocation>emptyMap() - : Collections.unmodifiableMap(homes); + return homes == null ? Collections.<String, StoredLocation>emptyMap() : Collections.unmodifiableMap(homes); } + @ListType(Material.class) @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) @@ -39,10 +36,9 @@ public class UserData implements StorageObject public Set<Material> getUnlimited() { - return unlimited == null - ? Collections.<Material>emptySet() - : Collections.unmodifiableSet(unlimited); + return unlimited == null ? Collections.<Material>emptySet() : Collections.unmodifiableSet(unlimited); } + @MapValueType(List.class) @MapKeyType(Material.class) @Getter(AccessLevel.NONE) @@ -51,10 +47,9 @@ public class UserData implements StorageObject public Map<Material, List<String>> getPowerTools() { - return powerTools == null - ? Collections.<Material, List<String>>emptyMap() - : Collections.unmodifiableMap(powerTools); + return powerTools == null ? Collections.<Material, List<String>>emptyMap() : Collections.unmodifiableMap(powerTools); } + private StoredLocation lastLocation; @MapKeyType(String.class) @MapValueType(Long.class) @@ -64,10 +59,9 @@ public class UserData implements StorageObject public Map<String, Long> getTimestamps() { - return timestamps == null - ? Collections.<String, Long>emptyMap() - : Collections.unmodifiableMap(timestamps); + return timestamps == null ? Collections.<String, Long>emptyMap() : Collections.unmodifiableMap(timestamps); } + private String jail; @ListType @Getter(AccessLevel.NONE) @@ -76,10 +70,9 @@ public class UserData implements StorageObject public List<String> getMails() { - return mails == null - ? Collections.<String>emptyList() - : Collections.unmodifiableList(mails); + return mails == null ? Collections.<String>emptyList() : Collections.unmodifiableList(mails); } + private Inventory inventory; private boolean teleportEnabled; @ListType @@ -89,10 +82,9 @@ public class UserData implements StorageObject public Set<String> getIgnore() { - return ignore == null - ? Collections.<String>emptySet() - : Collections.unmodifiableSet(ignore); + return ignore == null ? Collections.<String>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 7c0ac22e4..d9adfaead 100644 --- a/Essentials/src/net/ess3/user/UserMap.java +++ b/Essentials/src/net/ess3/user/UserMap.java @@ -1,21 +1,17 @@ package net.ess3.user; +import static net.ess3.I18n._; import java.io.File; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Locale; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.regex.Pattern; +import org.bukkit.entity.Player; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.api.IUserMap; import net.ess3.api.InvalidNameException; import net.ess3.storage.StorageObjectMap; import net.ess3.utils.FormatUtil; -import org.bukkit.entity.Player; -import static net.ess3.I18n._; + public class UserMap extends StorageObjectMap<IUser> implements IUserMap { @@ -145,6 +141,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap { return matchUsers(name, false, false, requester); } + private final Pattern comma = Pattern.compile(","); public Set<IUser> matchUsers(final String name, final boolean includeHidden, final boolean includeOffline, final Player requester) @@ -174,8 +171,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap Player match = null; for (Player player : ess.getServer().getOnlinePlayers()) { - if (player.getName().equalsIgnoreCase(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (player.getName().equalsIgnoreCase(searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { match = player; break; @@ -195,9 +191,8 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap for (Player player : ess.getServer().getOnlinePlayers()) { final String nickname = getUser(player).getData().getNickname(); - if (nickname != null && !nickname.isEmpty() - && nickname.equalsIgnoreCase(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (nickname != null && !nickname.isEmpty() && nickname.equalsIgnoreCase( + searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { if (multimatching || multisearch) { @@ -236,16 +231,15 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap { for (Player player : ess.getServer().getOnlinePlayers()) { - if (player.getName().toLowerCase(Locale.ENGLISH).startsWith(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (player.getName().toLowerCase(Locale.ENGLISH).startsWith( + searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { result.add(getUser(player)); break; } final String nickname = getUser(player).getData().getNickname(); - if (nickname != null && !nickname.isEmpty() - && nickname.toLowerCase(Locale.ENGLISH).startsWith(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (nickname != null && !nickname.isEmpty() && nickname.toLowerCase(Locale.ENGLISH).startsWith( + searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { result.add(getUser(player)); break; diff --git a/Essentials/src/net/ess3/utils/DateUtil.java b/Essentials/src/net/ess3/utils/DateUtil.java index de2be3131..bcc8824c3 100644 --- a/Essentials/src/net/ess3/utils/DateUtil.java +++ b/Essentials/src/net/ess3/utils/DateUtil.java @@ -1,12 +1,14 @@ package net.ess3.utils; +import static net.ess3.I18n._; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static net.ess3.I18n._; -public class DateUtil { + +public class DateUtil +{ public static String formatDateDiff(long date) { Calendar c = new GregorianCalendar(); @@ -28,29 +30,11 @@ 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++) { @@ -85,13 +69,8 @@ public class DateUtil { public static long parseDateDiff(String time, boolean future) throws Exception { Pattern timePattern = Pattern.compile( - "(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?" - + "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?" - + "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?" - + "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?" - + "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?" - + "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?" - + "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE); + "(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", + Pattern.CASE_INSENSITIVE); Matcher m = timePattern.matcher(time); int years = 0; int months = 0; diff --git a/Essentials/src/net/ess3/utils/DescParseTickFormat.java b/Essentials/src/net/ess3/utils/DescParseTickFormat.java index a0ec8094f..463566fc9 100644 --- a/Essentials/src/net/ess3/utils/DescParseTickFormat.java +++ b/Essentials/src/net/ess3/utils/DescParseTickFormat.java @@ -1,14 +1,14 @@ package net.ess3.utils; +import static net.ess3.I18n._; import java.text.SimpleDateFormat; import java.util.*; -import static net.ess3.I18n._; /** * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note * that the time is INGAME. - * + * <p/> * http://www.minecraftwiki.net/wiki/Day/night_cycle * * @author Olof Larsson diff --git a/Essentials/src/net/ess3/utils/ExecuteTimer.java b/Essentials/src/net/ess3/utils/ExecuteTimer.java index 2f0c7a5f6..012ab9296 100644 --- a/Essentials/src/net/ess3/utils/ExecuteTimer.java +++ b/Essentials/src/net/ess3/utils/ExecuteTimer.java @@ -49,7 +49,7 @@ public class ExecuteTimer time2 = (Long)pair.getTime(); if (time1 > 0) { - duration = (time2 - time1)/1000000.0; + duration = (time2 - time1) / 1000000.0; output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - "); } else @@ -58,7 +58,7 @@ public class ExecuteTimer } time1 = time2; } - duration = (time1 - time0)/1000000.0; + duration = (time1 - time0) / 1000000.0; output.append("Total: ").append(decimalFormat.format(duration)).append("ms"); times.clear(); return output.toString(); diff --git a/Essentials/src/net/ess3/utils/FormatUtil.java b/Essentials/src/net/ess3/utils/FormatUtil.java index 4cba2a71b..38f1d5541 100644 --- a/Essentials/src/net/ess3/utils/FormatUtil.java +++ b/Essentials/src/net/ess3/utils/FormatUtil.java @@ -1,10 +1,10 @@ package net.ess3.utils; +import static net.ess3.I18n._; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; import java.util.regex.Pattern; -import static net.ess3.I18n._; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; diff --git a/Essentials/src/net/ess3/utils/LocationUtil.java b/Essentials/src/net/ess3/utils/LocationUtil.java index 3feac8303..fffd7abca 100644 --- a/Essentials/src/net/ess3/utils/LocationUtil.java +++ b/Essentials/src/net/ess3/utils/LocationUtil.java @@ -1,20 +1,17 @@ package net.ess3.utils; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import static net.ess3.I18n._; +import java.util.*; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.entity.LivingEntity; -public class LocationUtil { - // The player can stand inside these materials + +public class LocationUtil +{ + // The player can stand inside these materials private static final Set<Integer> AIR_MATERIALS = new HashSet<Integer>(); private static final HashSet<Byte> AIR_MATERIALS_TARGET = new HashSet<Byte>(); @@ -72,7 +69,7 @@ public class LocationUtil { } return block.getLocation(); } - + public final static int RADIUS = 3; public final static Vector3D[] VOLUME; @@ -85,11 +82,13 @@ public class LocationUtil { this.y = y; this.z = z; } + public int x; public int y; public int z; } + static { List<Vector3D> pos = new ArrayList<Vector3D>(); @@ -103,7 +102,8 @@ public class LocationUtil { } } } - Collections.sort(pos, new Comparator<Vector3D>() + Collections.sort( + pos, new Comparator<Vector3D>() { @Override public int compare(Vector3D a, Vector3D b) @@ -212,8 +212,8 @@ public class LocationUtil { return true; } - if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId())) - || (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId()))) + if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId())) || (!AIR_MATERIALS.contains( + 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 43e124eea..6e871a051 100644 --- a/Essentials/src/net/ess3/utils/Target.java +++ b/Essentials/src/net/ess3/utils/Target.java @@ -3,30 +3,31 @@ package net.ess3.utils; import org.bukkit.Location; import org.bukkit.entity.Entity; + public class Target { - private final Location location; - private final Entity entity; + private final Location location; + private final Entity entity; - public Target(Location location) - { - this.location = location; - this.entity = null; - } + public Target(Location location) + { + this.location = location; + this.entity = null; + } - public Target(Entity entity) - { - this.entity = entity; - this.location = null; - } + public Target(Entity entity) + { + this.entity = entity; + this.location = null; + } - public Location getLocation() + public Location getLocation() + { + if (this.entity != null) { - if (this.entity != null) - { - return this.entity.getLocation(); - } - return location; + return this.entity.getLocation(); } + return location; } +} diff --git a/Essentials/src/net/ess3/utils/Util.java b/Essentials/src/net/ess3/utils/Util.java index 1827b194d..3aeb82f2b 100644 --- a/Essentials/src/net/ess3/utils/Util.java +++ b/Essentials/src/net/ess3/utils/Util.java @@ -3,12 +3,12 @@ package net.ess3.utils; import java.util.Collection; import java.util.Locale; import java.util.regex.Pattern; -import net.ess3.api.InvalidNameException; -import net.ess3.utils.gnu.inet.encoding.Punycode; -import net.ess3.utils.gnu.inet.encoding.PunycodeException; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; +import net.ess3.api.InvalidNameException; +import net.ess3.utils.gnu.inet.encoding.Punycode; +import net.ess3.utils.gnu.inet.encoding.PunycodeException; public final class Util @@ -16,6 +16,7 @@ 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]"); @@ -80,10 +81,11 @@ public final class Util public static ItemStack convertBlockToItem(final Block block) { - final ItemStack is = new ItemStack(block.getType(), 1/*, (short)0, block.getData()*/); // TODO: Do we need block.getData? that constructor is depreciated - + final ItemStack is = new ItemStack( + block.getType(), 1/*, (short)0, block.getData()*/); // TODO: Do we need block.getData? that constructor is depreciated + short s = 0; - + switch (is.getType()) { case WOODEN_DOOR: @@ -214,5 +216,5 @@ 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 8d8aa3750..ee72d36df 100644 --- a/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java +++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/Punycode.java @@ -24,6 +24,8 @@ package net.ess3.utils.gnu.inet.encoding; * 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. @@ -55,13 +57,12 @@ public class Punycode final static char DELIMITER = '-'; /** - * Punycodes a unicode string. - * - * @param input Unicode string. - * @return Punycoded string. - */ - public static String encode(String input) - throws PunycodeException + * Punycodes a unicode string. + * + * @param input Unicode string. + * @return Punycoded string. + */ + public static String encode(String input) throws PunycodeException { int n = INITIAL_N; int delta = 0; @@ -123,7 +124,7 @@ public class Punycode { int q = delta; - for (int k = BASE;; k += BASE) + for (int k = BASE; ; k += BASE) { int t; if (k <= bias) @@ -161,13 +162,12 @@ public class Punycode } /** - * Decode a punycoded string. - * - * @param input Punycode string - * @return Unicode string. - */ - public static String decode(String input) - throws PunycodeException + * Decode a punycoded string. + * + * @param input Punycode string + * @return Unicode string. + */ + public static String decode(String input) throws PunycodeException { int n = INITIAL_N; int i = 0; @@ -176,7 +176,8 @@ public class Punycode int d = input.lastIndexOf(DELIMITER); // Change start by snowleo - if (d < 0) { + if (d < 0) + { return input; } else if (d > 0) // Change end by snowleo @@ -202,7 +203,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()) { @@ -281,8 +282,7 @@ public class Punycode return c < 0x80; } - public final static int digit2codepoint(int d) - throws PunycodeException + public final static int digit2codepoint(int d) throws PunycodeException { if (d < 26) { @@ -300,8 +300,7 @@ public class Punycode } } - public final static int codepoint2digit(int c) - throws PunycodeException + public final static int codepoint2digit(int c) throws PunycodeException { if (c - '0' < 10 && c >= '0') // Changed by snowleo { 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 268851eae..7e4da7d79 100644 --- a/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java +++ b/Essentials/src/net/ess3/utils/gnu/inet/encoding/PunycodeException.java @@ -24,21 +24,22 @@ package net.ess3.utils.gnu.inet.encoding; * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA */ + + /** * Exception handling for Punycode class. */ -public class PunycodeException - extends Exception +public class PunycodeException extends Exception { - private static final long serialVersionUID = -4335979163218011160L; + private static final long serialVersionUID = -4335979163218011160L; public static String OVERFLOW = "Overflow."; public static String BAD_INPUT = "Bad input."; /** - * Creates a new PunycodeException. - * - * @param m message. - */ + * Creates a new PunycodeException. + * + * @param m message. + */ public PunycodeException(String m) { super(m); diff --git a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java index 4f3a915f2..9fdc87c9b 100644 --- a/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java +++ b/Essentials/src/net/ess3/utils/textreader/ArrayListInput.java @@ -8,8 +8,8 @@ import java.util.Map; public class ArrayListInput implements IText { - private final transient List<String> lines = new ArrayList<String>(); - + private final transient List<String> lines = new ArrayList<String>(); + @Override public List<String> getLines() { @@ -27,5 +27,5 @@ 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 f082913e1..36322c123 100644 --- a/Essentials/src/net/ess3/utils/textreader/HelpInput.java +++ b/Essentials/src/net/ess3/utils/textreader/HelpInput.java @@ -1,16 +1,16 @@ package net.ess3.utils.textreader; +import static net.ess3.I18n._; import java.io.IOException; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; import net.ess3.api.IEssentials; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; public class HelpInput implements IText @@ -55,9 +55,9 @@ 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)))) + 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)))) { continue; } diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java index 47e6923cb..37e96053e 100644 --- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java @@ -5,13 +5,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.utils.DescParseTickFormat; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.utils.DescParseTickFormat; public class KeywordReplacer implements IText @@ -47,7 +47,8 @@ public class KeywordReplacer implements IText world = player.getLocation() == null || player.getLocation().getWorld() == null ? "" : player.getLocation().getWorld().getName(); worldTime12 = DescParseTickFormat.format12(player.getWorld() == null ? 0 : player.getWorld().getTime()); worldTime24 = DescParseTickFormat.format24(player.getWorld() == null ? 0 : player.getWorld().getTime()); - worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(player.getWorld() == null ? 0 : player.getWorld().getFullTime())); + worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format( + DescParseTickFormat.ticksToDate(player.getWorld() == null ? 0 : player.getWorld().getFullTime())); } else { diff --git a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java index f79e851be..03405df29 100644 --- a/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/SimpleTextInput.java @@ -1,16 +1,20 @@ package net.ess3.utils.textreader; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; public class SimpleTextInput implements IText { private final transient List<String> lines = new ArrayList<String>(); - - public SimpleTextInput (final String input) { + + public SimpleTextInput(final String input) + { lines.add(input); } - + @Override public List<String> getLines() { @@ -28,5 +32,5 @@ public class SimpleTextInput implements IText { return Collections.emptyMap(); } - + } diff --git a/Essentials/src/net/ess3/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java index aa3682e47..037dadc03 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java @@ -4,11 +4,11 @@ import java.io.*; import java.lang.ref.SoftReference; import java.util.*; import java.util.logging.Level; +import org.bukkit.command.CommandSender; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.api.InvalidNameException; import net.ess3.utils.Util; -import org.bukkit.command.CommandSender; public class TextInput implements IText @@ -117,10 +117,14 @@ public class TextInput implements IText } finally { - if(output != null) - output.close(); - if(input != null) - input.close(); + if (output != null) + { + output.close(); + } + if (input != null) + { + input.close(); + } } throw new FileNotFoundException("File " + filename + ".txt does not exist. Creating one for you."); } diff --git a/Essentials/src/net/ess3/utils/textreader/TextPager.java b/Essentials/src/net/ess3/utils/textreader/TextPager.java index 88f00125c..ade5ad310 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextPager.java +++ b/Essentials/src/net/ess3/utils/textreader/TextPager.java @@ -1,11 +1,11 @@ package net.ess3.utils.textreader; +import static net.ess3.I18n._; import java.util.List; import java.util.Locale; import java.util.Map; -import net.ess3.I18n; -import static net.ess3.I18n._; import org.bukkit.command.CommandSender; +import net.ess3.I18n; public class TextPager diff --git a/Essentials/test/net/ess3/EconomyTest.java b/Essentials/test/net/ess3/EconomyTest.java index 9acb12f61..1abfb0a2e 100644 --- a/Essentials/test/net/ess3/EconomyTest.java +++ b/Essentials/test/net/ess3/EconomyTest.java @@ -33,7 +33,7 @@ public class EconomyTest extends EssentialsTest { fail(ex.getMessage()); } - assertFalse("NPC can be removed",ess.getEconomy().playerExists(NPCNAME)); + assertFalse("NPC can be removed", ess.getEconomy().playerExists(NPCNAME)); //test Math try diff --git a/Essentials/test/net/ess3/EssentialsTest.java b/Essentials/test/net/ess3/EssentialsTest.java index 5eef12025..0daa06abf 100644 --- a/Essentials/test/net/ess3/EssentialsTest.java +++ b/Essentials/test/net/ess3/EssentialsTest.java @@ -1,13 +1,12 @@ package net.ess3; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import junit.framework.TestCase; -import net.ess3.api.IPlugin; -import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.Server; @@ -15,8 +14,9 @@ import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.*; +import junit.framework.TestCase; +import net.ess3.api.IPlugin; +import org.apache.commons.io.FileUtils; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -43,37 +43,39 @@ public abstract class EssentialsTest extends TestCase when(pluginManager.getPlugins()).thenReturn(new Plugin[0]); when(server.getLogger()).thenReturn(logger); when(server.getOnlinePlayers()).thenReturn(playerList.toArray(new Player[0])); - when(server.getPlayerExact(anyString())).thenAnswer(new Answer<Player>() - { - @Override - public Player answer(InvocationOnMock invocation) throws Throwable - { - Object[] args = invocation.getArguments(); - String name = (String)args[0]; - for (Player player : playerList) + when(server.getPlayerExact(anyString())).thenAnswer( + new Answer<Player>() { - if (player.getName().equalsIgnoreCase(name)) + @Override + public Player answer(InvocationOnMock invocation) throws Throwable { - return player; + Object[] args = invocation.getArguments(); + String name = (String)args[0]; + for (Player player : playerList) + { + if (player.getName().equalsIgnoreCase(name)) + { + return player; + } + } + return null; } - } - return null; - } - }); + }); when(server.getPluginManager()).thenReturn(pluginManager); when(server.getOfflinePlayers()).thenReturn(playerList.toArray(new Player[0])); - when(server.getOfflinePlayer(anyString())).thenAnswer(new Answer<OfflinePlayer>() - { - @Override - public OfflinePlayer answer(InvocationOnMock invocation) throws Throwable - { - Object[] args = invocation.getArguments(); - String name = (String)args[0]; - OfflinePlayer player = mock(OfflinePlayer.class); - when(player.getName()).thenReturn(name); - return player; - } - }); + when(server.getOfflinePlayer(anyString())).thenAnswer( + new Answer<OfflinePlayer>() + { + @Override + public OfflinePlayer answer(InvocationOnMock invocation) throws Throwable + { + Object[] args = invocation.getArguments(); + String name = (String)args[0]; + OfflinePlayer player = mock(OfflinePlayer.class); + when(player.getName()).thenReturn(name); + return player; + } + }); Bukkit.setServer(server); } else @@ -82,7 +84,7 @@ public abstract class EssentialsTest extends TestCase } plugin = mock(IPlugin.class); - + File folder = FileUtils.getTempDirectory(); when(plugin.getDataFolder()).thenReturn(folder); when(world.getName()).thenReturn("world"); diff --git a/Essentials/test/net/ess3/StorageTest.java b/Essentials/test/net/ess3/StorageTest.java index 723b76487..128e71363 100644 --- a/Essentials/test/net/ess3/StorageTest.java +++ b/Essentials/test/net/ess3/StorageTest.java @@ -1,6 +1,7 @@ package net.ess3; import java.io.*; +import org.bukkit.Location; import net.ess3.settings.Settings; import net.ess3.settings.geoip.GeoIP; import net.ess3.storage.ObjectLoadException; @@ -8,7 +9,6 @@ import net.ess3.storage.StorageObject; import net.ess3.storage.YamlStorageReader; import net.ess3.storage.YamlStorageWriter; import net.ess3.utils.ExecuteTimer; -import org.bukkit.Location; import org.junit.Test; @@ -110,7 +110,7 @@ public class StorageTest extends EssentialsTest } } - + @Test public void testGeoIp() { diff --git a/Essentials/test/net/ess3/UserTest.java b/Essentials/test/net/ess3/UserTest.java index 364c345a9..abe847ed1 100644 --- a/Essentials/test/net/ess3/UserTest.java +++ b/Essentials/test/net/ess3/UserTest.java @@ -10,7 +10,7 @@ public class UserTest extends EssentialsTest public UserTest(String testName) { super(testName); - + addPlayer("testPlayer1"); base1 = ess.getUserMap().getUser("testPlayer1"); } @@ -63,7 +63,7 @@ public class UserTest extends EssentialsTest 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 77035da03..0364b68aa 100644 --- a/Essentials/test/net/ess3/UtilTest.java +++ b/Essentials/test/net/ess3/UtilTest.java @@ -156,8 +156,9 @@ public class UtilTest extends EssentialsTest b = new GregorianCalendar(2000, 3, 7, 10, 0, 0); assertEquals(" 10 years 6 months 10 days 13 hours 45 minutes 45 seconds", DateUtil.formatDateDiff(a, b)); } - - public void filenameTest() { + + public void filenameTest() + { try { assertEquals("_-", Util.sanitizeFileName("\u0000")); @@ -170,12 +171,12 @@ public class UtilTest extends EssentialsTest assertEquals("_-", Util.sanitizeFileName("\"")); assertEquals("_-", Util.sanitizeFileName("<>?:*.")); assertEquals("a-0fa", Util.sanitizeFileName("aä")); - + } catch (InvalidNameException ex) { Logger.getLogger(UtilTest.class.getName()).log(Level.SEVERE, null, ex); } - + } } diff --git a/Essentials2Compat/pom.xml b/Essentials2Compat/pom.xml index 9c5bc6752..81dc96ac8 100644 --- a/Essentials2Compat/pom.xml +++ b/Essentials2Compat/pom.xml @@ -1,21 +1,20 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>Essentials2Compat</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>Essentials2Compat</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/Essentials2Compat/src/com/earth2me/essentials/Economy.java b/Essentials2Compat/src/com/earth2me/essentials/Economy.java index ea566eb90..15f0045ac 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Economy.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Economy.java @@ -14,6 +14,7 @@ public final class Economy private Economy() { } + private static IEssentials ess; private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded."; @@ -23,6 +24,7 @@ public final class Economy * @param name Name of the user * @return balance * @throws net.ess3.api.UserDoesNotExistException + * */ public static double getMoney(String name) throws UserDoesNotExistException { @@ -36,10 +38,11 @@ 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 { @@ -53,10 +56,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 { @@ -67,10 +70,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 { @@ -81,10 +84,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 { @@ -95,10 +98,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 { @@ -111,7 +114,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 { @@ -123,7 +126,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 @@ -134,7 +137,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 @@ -145,7 +148,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/Essentials.java b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java index 4d61e6b3d..d625586cd 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java @@ -1,11 +1,11 @@ package com.earth2me.essentials; import java.io.File; +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; import net.ess3.api.IEssentials; import net.ess3.api.IItemDb; import net.ess3.api.IPlugin; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; public class Essentials extends JavaPlugin diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java index 1fc101f8d..45f7b8a29 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java @@ -1,6 +1,6 @@ package com.earth2me.essentials; -import com.google.common.io.Files; +import static net.ess3.I18n._; import java.io.*; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -13,8 +13,6 @@ import java.util.Locale; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.storage.StoredLocation; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Server; @@ -23,6 +21,8 @@ import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; +import com.google.common.io.Files; +import net.ess3.storage.StoredLocation; @Deprecated @@ -127,7 +127,9 @@ public class EssentialsConf extends YamlConfiguration { buffer.rewind(); data.clear(); - LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName()); + LOGGER.log( + Level.INFO, + "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName()); decoder = Charset.defaultCharset().newDecoder(); result = decoder.decode(buffer, data, true); if (result.isError()) @@ -245,12 +247,10 @@ public class EssentialsConf extends YamlConfiguration { return null; } - return new StoredLocation(worldName, - getDouble((path == null ? "" : path + ".") + "x", 0), - getDouble((path == null ? "" : path + ".") + "y", 0), - getDouble((path == null ? "" : path + ".") + "z", 0), - (float)getDouble((path == null ? "" : path + ".") + "yaw", 0), - (float)getDouble((path == null ? "" : path + ".") + "pitch", 0)); + return new StoredLocation( + worldName, getDouble((path == null ? "" : path + ".") + "x", 0), getDouble((path == null ? "" : path + ".") + "y", 0), + getDouble((path == null ? "" : path + ".") + "z", 0), (float)getDouble((path == null ? "" : path + ".") + "yaw", 0), + (float)getDouble((path == null ? "" : path + ".") + "pitch", 0)); } public void setProperty(final String path, final Location loc) @@ -267,9 +267,7 @@ public class EssentialsConf extends YamlConfiguration public ItemStack getItemStack(final String path) { final ItemStack stack = new ItemStack( - Material.valueOf(getString(path + ".type", "AIR")), - getInt(path + ".amount", 1), - (short)getInt(path + ".damage", 0)); + Material.valueOf(getString(path + ".type", "AIR")), getInt(path + ".amount", 1), (short)getInt(path + ".damage", 0)); final ConfigurationSection enchants = getConfigurationSection(path + ".enchant"); if (enchants != null) { diff --git a/Essentials2Compat/src/com/earth2me/essentials/ISettings.java b/Essentials2Compat/src/com/earth2me/essentials/ISettings.java index 268a81ba0..db4af46fa 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/ISettings.java +++ b/Essentials2Compat/src/com/earth2me/essentials/ISettings.java @@ -1,7 +1,6 @@ package com.earth2me.essentials; -import java.text.MessageFormat; import java.util.List; import java.util.Map; import java.util.Set; @@ -10,7 +9,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.event.EventPriority; -public interface ISettings +public interface ISettings { boolean areSignsDisabled(); @@ -29,7 +28,6 @@ public interface ISettings int getChatRadius(); - double getCommandCost(String label); String getCurrencySymbol(); @@ -71,7 +69,6 @@ public interface ISettings int getHomeLimit(String set); - boolean getSortListByGroups(); int getSpawnMobLimit(); @@ -85,7 +82,6 @@ public interface ISettings boolean hidePermissionlessHelp(); - boolean isCommandDisabled(String label); boolean isCommandOverridden(String name); diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java index 262dbe140..406a1a540 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java @@ -1,17 +1,17 @@ package com.earth2me.essentials; +import static net.ess3.I18n._; import java.io.File; import java.text.MessageFormat; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.MemoryConfiguration; import org.bukkit.event.EventPriority; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IEssentials; public class Settings implements ISettings @@ -52,6 +52,7 @@ public class Settings implements ISettings { return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3)); } + private int chatRadius = 0; private int _getChatRadius() @@ -141,8 +142,8 @@ public class Settings implements ISettings } return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false); } - private ConfigurationSection commandCosts; + private ConfigurationSection commandCosts; public ConfigurationSection _getCommandCosts() @@ -177,6 +178,7 @@ public class Settings implements ISettings } return 0.0; } + private String nicknamePrefix = "~"; private String _getNicknamePrefix() @@ -201,6 +203,7 @@ public class Settings implements ISettings { return config.getDouble("heal-cooldown", 0); } + private ConfigurationSection kits; public ConfigurationSection _getKits() @@ -241,6 +244,7 @@ public class Settings implements ISettings } return null; } + private ChatColor operatorColor = null; @Override @@ -314,6 +318,7 @@ public class Settings implements ISettings { return config.getString("backup.command", null); } + private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>()); /*@Override @@ -337,7 +342,7 @@ public class Settings implements ISettings } return mFormat; }*/ - + public String getDefaultChatformat() { return config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"); @@ -410,6 +415,7 @@ public class Settings implements ISettings warnOnBuildDisallow = _warnOnBuildDisallow(); mailsPerMinute = _getMailsPerMinute(); } + private List<Integer> itemSpawnBl = new ArrayList<Integer>(); @Override @@ -445,6 +451,7 @@ public class Settings implements ISettings } return epItemSpwn; } + private List<String> enabledSigns = new ArrayList<String>(); private boolean signsEnabled = false; @@ -483,6 +490,7 @@ public class Settings implements ISettings } return newSigns; } + private boolean warnOnBuildDisallow; private boolean _warnOnBuildDisallow() @@ -495,6 +503,7 @@ public class Settings implements ISettings { return warnOnBuildDisallow; } + private boolean debug = false; private boolean configDebug = false; @@ -587,6 +596,7 @@ public class Settings implements ISettings { return config.getBoolean(configName, def); } + private final static double MAXMONEY = 10000000000000.0; @Override @@ -599,6 +609,7 @@ public class Settings implements ISettings } return max; } + private final static double MINMONEY = -10000000000000.0; @Override @@ -633,6 +644,7 @@ public class Settings implements ISettings { return config.getBoolean("remove-god-on-disconnect", false); } + private boolean changeDisplayName = true; private boolean _changeDisplayName() @@ -645,6 +657,7 @@ public class Settings implements ISettings { return changeDisplayName; } + private boolean changePlayerListName = false; private boolean _changePlayerListName() @@ -663,6 +676,7 @@ public class Settings implements ISettings { return config.getBoolean("use-bukkit-permissions", false); } + private boolean prefixsuffixconfigured = false; private boolean addprefixsuffix = false; private boolean essentialsChatActive = false; @@ -688,6 +702,7 @@ public class Settings implements ISettings { return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive; } + private boolean disablePrefix = false; private boolean _disablePrefix() @@ -700,6 +715,7 @@ public class Settings implements ISettings { return disablePrefix; } + private boolean disableSuffix = false; private boolean _disableSuffix() @@ -724,6 +740,7 @@ public class Settings implements ISettings { return config.getLong("auto-afk-kick", -1); } + private boolean getFreezeAfkPlayers; @Override @@ -736,6 +753,7 @@ public class Settings implements ISettings { return config.getBoolean("freeze-afk-players", false); } + private boolean cancelAfkOnMove; @Override @@ -754,6 +772,7 @@ public class Settings implements ISettings { return config.getBoolean("death-messages", true); } + private Set<String> noGodWorlds = new HashSet<String>(); @Override @@ -785,6 +804,7 @@ public class Settings implements ISettings { return config.getBoolean("world-home-permissions", false); } + private boolean registerBackInListener; @Override @@ -797,6 +817,7 @@ public class Settings implements ISettings { return config.getBoolean("register-back-in-listener", false); } + private boolean disableItemPickupWhileAfk; @Override @@ -854,6 +875,7 @@ public class Settings implements ISettings { this.metricsEnabled = metricsEnabled; } + private boolean teleportInvulnerability; @Override @@ -872,6 +894,7 @@ public class Settings implements ISettings { return teleportInvulnerability; } + private long loginAttackDelay; private long _getLoginAttackDelay() @@ -884,6 +907,7 @@ public class Settings implements ISettings { return loginAttackDelay; } + private int signUsePerSecond; private int _getSignUsePerSecond() @@ -913,12 +937,14 @@ public 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() { + private int _getMailsPerMinute() + { return config.getInt("mails-per-minute", 1000); } + @Override public int getMailsPerMinute() { diff --git a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java index 8a229081c..957ed9777 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java +++ b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java @@ -1,18 +1,14 @@ package com.earth2me.essentials; -import com.google.common.io.PatternFilenameFilter; import java.io.File; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.logging.Level; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.api.InvalidNameException; -import net.ess3.api.NoLoanPermittedException; -import net.ess3.api.UserDoesNotExistException; -import net.ess3.user.User; import org.bukkit.Material; +import com.google.common.io.PatternFilenameFilter; +import net.ess3.api.*; +import net.ess3.user.User; class UpdateUserFiles @@ -57,7 +53,8 @@ class UpdateUserFiles else { IUser user = ess.getUserMap().getUser(name); - if (user == null) { + if (user == null) + { try { user = new User(ess.getServer().getOfflinePlayer(name), ess); @@ -137,6 +134,7 @@ class UpdateUserFiles String realname = getPlayer(name); return realname == null ? BROKENNAME : realname; } + private final Map<String, String> players = new HashMap<String, String>(); private String getPlayer(String check) diff --git a/Essentials2Compat/src/com/earth2me/essentials/UserData.java b/Essentials2Compat/src/com/earth2me/essentials/UserData.java index f7c05d2c2..078535293 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/UserData.java +++ b/Essentials2Compat/src/com/earth2me/essentials/UserData.java @@ -2,20 +2,20 @@ package com.earth2me.essentials; import java.io.File; import java.util.*; -import net.ess3.api.IEssentials; -import net.ess3.storage.StoredLocation; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.MemoryConfiguration; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IEssentials; +import net.ess3.storage.StoredLocation; -public class UserData +public class UserData { protected final transient IEssentials ess; private EssentialsConf config; private final File folder; - + protected UserData(IEssentials ess, File file) { @@ -59,6 +59,7 @@ public class UserData kitTimestamps = _getKitTimestamps(); nickname = _getNickname(); } + private double money; private double _getMoney() @@ -90,6 +91,7 @@ public class UserData config.setProperty("money", value); config.save(); } + private Map<String, Object> homes; private Map<String, Object> _getHomes() @@ -115,15 +117,14 @@ public class UserData } return search; } - + public StoredLocation getHome(String name) throws Exception { String search = getHomeName(name); - return config.getLocation("homes." + search, ess.getServer()); + return config.getLocation("homes." + search, ess.getServer()); } - public List<String> getHomes() { return new ArrayList<String>(homes.keySet()); @@ -165,6 +166,7 @@ public class UserData } return false; } + private String nickname; public String _getNickname() @@ -183,6 +185,7 @@ public class UserData config.setProperty("nickname", nick); config.save(); } + private List<Integer> unlimited; private List<Integer> _getUnlimited() @@ -213,6 +216,7 @@ public class UserData config.setProperty("unlimited", unlimited); config.save(); } + private Map<String, Object> powertools; private Map<String, Object> _getPowertools() @@ -223,8 +227,9 @@ public class UserData } return new HashMap<String, Object>(); } - - public Set<String> getPowertools() { + + public Set<String> getPowertools() + { return powertools.keySet(); } @@ -265,6 +270,7 @@ public class UserData { return !powertools.isEmpty(); } + private StoredLocation lastLocation; private StoredLocation _getLastLocation() @@ -303,6 +309,7 @@ public class UserData config.setProperty("timestamps.lastteleport", time); config.save(); } + private long lastHealTimestamp; private long _getLastHealTimestamp() @@ -321,6 +328,7 @@ public class UserData config.setProperty("timestamps.lastheal", time); config.save(); } + private String jail; private String _getJail() @@ -347,6 +355,7 @@ public class UserData } config.save(); } + private List<String> mails; private List<String> _getMails() @@ -379,6 +388,7 @@ public class UserData mails.add(mail); setMails(mails); } + private boolean teleportEnabled; private boolean getTeleportEnabled() @@ -411,6 +421,7 @@ public class UserData setSocialSpyEnabled(ret); return ret; } + private List<String> ignoredPlayers; public List<String> getIgnoredPlayers() @@ -452,6 +463,7 @@ public class UserData config.setProperty("godmode", set); config.save(); } + private boolean muted; public boolean getMuted() @@ -470,6 +482,7 @@ public class UserData config.setProperty("muted", set); config.save(); } + private long muteTimeout; private long _getMuteTimeout() @@ -488,6 +501,7 @@ public class UserData config.setProperty("timestamps.mute", time); config.save(); } + private boolean jailed; private boolean getJailed() @@ -513,6 +527,7 @@ public class UserData setJailed(ret); return ret; } + private long jailTimeout; private long _getJailTimeout() @@ -553,6 +568,7 @@ public class UserData config.setProperty("ban.timeout", time); config.save(); } + private long lastLogin; private long _getLastLogin() @@ -590,6 +606,7 @@ public class UserData config.setProperty("timestamps.logout", time); config.save(); } + private String lastLoginAddress; private String _getLastLoginAddress() @@ -607,6 +624,7 @@ public class UserData lastLoginAddress = address; config.setProperty("ipAddress", address); } + private boolean afk; private boolean getAfk() @@ -632,6 +650,7 @@ public class UserData setAfk(ret); return ret; } + private boolean newplayer; private String geolocation; @@ -659,6 +678,7 @@ public class UserData } config.save(); } + private boolean isSocialSpyEnabled; private boolean _isSocialSpyEnabled() @@ -677,6 +697,7 @@ public class UserData config.setProperty("socialspy", status); config.save(); } + private boolean isNPC; private boolean _isNPC() @@ -695,6 +716,7 @@ public class UserData config.setProperty("npc", set); config.save(); } + private boolean arePowerToolsEnabled; public boolean arePowerToolsEnabled() @@ -720,6 +742,7 @@ public class UserData { return config.getBoolean("powertoolsenabled", true); } + private ConfigurationSection kitTimestamps; private ConfigurationSection _getKitTimestamps() @@ -744,8 +767,9 @@ public class UserData } return new MemoryConfiguration(); } - - public Set<String> getKitTimestamps() { + + public Set<String> getKitTimestamps() + { return kitTimestamps.getKeys(false); } diff --git a/Essentials2Compat/src/com/earth2me/essentials/Util.java b/Essentials2Compat/src/com/earth2me/essentials/Util.java index 3a34a85fc..1bdc878bb 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/Util.java +++ b/Essentials2Compat/src/com/earth2me/essentials/Util.java @@ -2,7 +2,8 @@ package com.earth2me.essentials; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; -import java.util.*; +import java.util.Collection; +import java.util.Locale; import java.util.logging.Logger; import java.util.regex.Pattern; @@ -12,6 +13,7 @@ public class Util private Util() { } + private final static Logger logger = Logger.getLogger("Minecraft"); 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]"); @@ -46,7 +48,7 @@ public class Util } return str; } - + public static double roundDouble(final double d) { return Math.round(d * 100.0) / 100.0; diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml index 1346a3706..0db30ef3b 100644 --- a/EssentialsAntiBuild/pom.xml +++ b/EssentialsAntiBuild/pom.xml @@ -1,21 +1,20 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsAntiBuild</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>EssentialsAntiBuild</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java index 0869d706e..11320c6a0 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuild.java @@ -31,8 +31,8 @@ public class EssentialsAntiBuild extends JavaPlugin implements IAntiBuild public EssentialsConnect getEssentialsConnect() { return ess; - } - + } + @Override public AntiBuildHolder getSettings() { diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java index 2e0aba9a4..4334d6697 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java @@ -1,8 +1,6 @@ package net.ess3.antibuild; import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Entity; @@ -11,13 +9,18 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.bukkit.event.block.*; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockPistonExtendEvent; +import org.bukkit.event.block.BlockPistonRetractEvent; +import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.inventory.CraftItemEvent; import org.bukkit.event.painting.PaintingBreakByEntityEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.inventory.ItemStack; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class EssentialsAntiBuildListener implements Listener @@ -33,39 +36,36 @@ public class EssentialsAntiBuildListener implements Listener @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockPlace(final BlockPlaceEvent event) - { + { final Player user = event.getPlayer(); final Block block = event.getBlockPlaced(); final int typeId = block.getTypeId(); final Material type = block.getType(); - if (antib.getSettings().getData().isDisableBuild() - && !Permissions.BUILD.isAuthorized(user) - && !Permissions.PLACEMENT.isAuthorized(user, block)) + if (antib.getSettings().getData().isDisableBuild() && !Permissions.BUILD.isAuthorized(user) && !Permissions.PLACEMENT.isAuthorized(user, block)) + { + if (antib.getSettings().getData().isWarnOnBuildDisallow()) { - if (antib.getSettings().getData().isWarnOnBuildDisallow()) - { - user.sendMessage(_("antiBuildPlace", type.toString())); - } - event.setCancelled(true); - return; + user.sendMessage(_("antiBuildPlace", type.toString())); } + event.setCancelled(true); + return; + } - if (antib.getSettings().getData().getBlacklist().getPlacement(type) && !Permissions.BLACKLIST_ALLOWPLACEMENT.isAuthorized(user)) + if (antib.getSettings().getData().getBlacklist().getPlacement(type) && !Permissions.BLACKLIST_ALLOWPLACEMENT.isAuthorized(user)) + { + if (antib.getSettings().getData().isWarnOnBuildDisallow()) { - if (antib.getSettings().getData().isWarnOnBuildDisallow()) - { - user.sendMessage(_("antiBuildPlace", type.toString())); - } - event.setCancelled(true); - return; + user.sendMessage(_("antiBuildPlace", type.toString())); } + event.setCancelled(true); + return; + } - if (antib.getSettings().getData().getAlert().getAlertOnPlacementContains(type) - && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) - { - antib.getEssentialsConnect().alert(user, type.toString(), _("alertPlaced")); - } + if (antib.getSettings().getData().getAlert().getAlertOnPlacementContains(type) && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) + { + antib.getEssentialsConnect().alert(user, type.toString(), _("alertPlaced")); + } } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @@ -75,36 +75,33 @@ public class EssentialsAntiBuildListener implements Listener final Block block = event.getBlock(); final int typeId = block.getTypeId(); final Material type = block.getType(); - - if (antib.getSettings().getData().isDisableBuild() - && !Permissions.BUILD.isAuthorized(user) - && !Permissions.BREAK.isAuthorized(user, block)) - { - if (antib.getSettings().getData().isWarnOnBuildDisallow()) - { - user.sendMessage(_("antiBuildBreak", type.toString())); - } - event.setCancelled(true); - return; - } - if (antib.getSettings().getData().getBlacklist().getBreaking(type) && !Permissions.BLACKLIST_ALLOWBREAK.isAuthorized(user)) + if (antib.getSettings().getData().isDisableBuild() && !Permissions.BUILD.isAuthorized(user) && !Permissions.BREAK.isAuthorized(user, block)) + { + if (antib.getSettings().getData().isWarnOnBuildDisallow()) { - if (antib.getSettings().getData().isWarnOnBuildDisallow()) - { - user.sendMessage(_("antiBuildBreak", type.toString())); - } - event.setCancelled(true); - return; + user.sendMessage(_("antiBuildBreak", type.toString())); } + event.setCancelled(true); + return; + } - if (antib.getSettings().getData().getAlert().getAlertOnBreakContains(type) - && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) + if (antib.getSettings().getData().getBlacklist().getBreaking(type) && !Permissions.BLACKLIST_ALLOWBREAK.isAuthorized(user)) + { + if (antib.getSettings().getData().isWarnOnBuildDisallow()) { - antib.getEssentialsConnect().alert(user, type.toString(), _("alertBroke")); + user.sendMessage(_("antiBuildBreak", type.toString())); } + event.setCancelled(true); + return; + } + + if (antib.getSettings().getData().getAlert().getAlertOnBreakContains(type) && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) + { + antib.getEssentialsConnect().alert(user, type.toString(), _("alertBroke")); + } } - + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onPaintingBreak(final PaintingBreakByEntityEvent event) { @@ -112,9 +109,8 @@ public class EssentialsAntiBuildListener implements Listener if (entity instanceof Player) { final IUser user = ess.getUserMap().getUser((Player)entity); - if (antib.getSettings().getData().isDisableBuild() - && !Permissions.BUILD.isAuthorized(user) - && !Permissions.BREAK.isAuthorized(user, Material.PAINTING, null)) + if (antib.getSettings().getData().isDisableBuild() && !Permissions.BUILD.isAuthorized(user) && !Permissions.BREAK.isAuthorized( + user, Material.PAINTING, null)) { if (antib.getSettings().getData().isWarnOnBuildDisallow()) { @@ -159,9 +155,7 @@ public class EssentialsAntiBuildListener implements Listener final Player user = event.getPlayer(); final ItemStack item = event.getItem(); - if (item != null - && antib.getSettings().getData().getBlacklist().getUsage(item.getType()) - && !Permissions.BLACKLIST_ALLOWUSAGE.isAuthorized(user)) + if (item != null && antib.getSettings().getData().getBlacklist().getUsage(item.getType()) && !Permissions.BLACKLIST_ALLOWUSAGE.isAuthorized(user)) { if (antib.getSettings().getData().isWarnOnBuildDisallow()) { @@ -171,15 +165,12 @@ public class EssentialsAntiBuildListener implements Listener return; } - if (item != null - && antib.getSettings().getData().getAlert().getAlertOnUseContains(item.getType()) - && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) + if (item != null && antib.getSettings().getData().getAlert().getAlertOnUseContains(item.getType()) && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) { antib.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed")); } - if (antib.getSettings().getData().isDisableUse() - && !Permissions.BUILD.isAuthorized(user)) + if (antib.getSettings().getData().isDisableUse() && !Permissions.BUILD.isAuthorized(user)) { if (event.hasItem() && !Permissions.INTERACT.isAuthorized(user, item.getType(), item.getData())) { @@ -211,8 +202,7 @@ public class EssentialsAntiBuildListener implements Listener final Player user = (Player)entity; final ItemStack item = event.getRecipe().getResult(); - if (antib.getSettings().getData().isDisableUse() - && !Permissions.BUILD.isAuthorized(user)) + if (antib.getSettings().getData().isDisableUse() && !Permissions.BUILD.isAuthorized(user)) { if (!Permissions.CRAFT.isAuthorized(user, item.getType(), item.getData())) { @@ -233,8 +223,7 @@ public class EssentialsAntiBuildListener implements Listener final Player user = event.getPlayer(); final ItemStack item = event.getItem().getItemStack(); - if (antib.getSettings().getData().isDisableUse() - && !Permissions.BUILD.isAuthorized(user)) + if (antib.getSettings().getData().isDisableUse() && !Permissions.BUILD.isAuthorized(user)) { if (!Permissions.PICKUP.isAuthorized(user, item.getType(), item.getData())) { @@ -251,8 +240,10 @@ public class EssentialsAntiBuildListener implements Listener final Player user = event.getPlayer(); final ItemStack item = event.getItemDrop().getItemStack(); - if (antib.getSettings().getData().isDisableUse() - && !Permissions.BUILD.isAuthorized(user)); + if (antib.getSettings().getData().isDisableUse() && !Permissions.BUILD.isAuthorized(user)) + { + ; + } { if (!Permissions.DROP.isAuthorized(user, item.getType(), item.getData())) { @@ -264,5 +255,5 @@ public class EssentialsAntiBuildListener implements Listener } } } - } + } } diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java index efa549172..249da46eb 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsConnect.java @@ -1,13 +1,13 @@ package net.ess3.antibuild; +import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.bukkit.BukkitPlugin; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.api.IEssentials; +import net.ess3.bukkit.BukkitPlugin; public class EssentialsConnect @@ -24,7 +24,7 @@ public class EssentialsConnect } ess = ((BukkitPlugin)essPlugin).getEssentials(); antib = (IAntiBuild)essProtect; - antib.setSettings(new AntiBuildHolder(ess)); + antib.setSettings(new AntiBuildHolder(ess)); } public void onDisable() @@ -39,9 +39,8 @@ public class EssentialsConnect public void alert(final Player user, final String item, final String type) { final Location loc = user.getLocation(); - final String warnMessage = _("alertFormat", user.getName(), type, item, - loc.getWorld().getName() + "," + loc.getBlockX() + "," - + loc.getBlockY() + "," + loc.getBlockZ()); + final String warnMessage = _( + "alertFormat", user.getName(), type, item, loc.getWorld().getName() + "," + loc.getBlockX() + "," + loc.getBlockY() + "," + loc.getBlockZ()); LOGGER.log(Level.WARNING, warnMessage); for (Player p : ess.getServer().getOnlinePlayers()) { diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java b/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java index 599b63a01..51e49c463 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/IAntiBuild.java @@ -3,10 +3,11 @@ package net.ess3.antibuild; import org.bukkit.plugin.Plugin; + public interface IAntiBuild extends Plugin { EssentialsConnect getEssentialsConnect(); - + AntiBuildHolder getSettings(); void setSettings(AntiBuildHolder settings); diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java b/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java index 588eebf24..a217163c4 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/Permissions.java @@ -1,14 +1,11 @@ package net.ess3.antibuild; -import java.util.EnumMap; import java.util.Locale; +import org.bukkit.command.CommandSender; +import org.bukkit.permissions.PermissionDefault; import net.ess3.api.IPermission; import net.ess3.bukkit.PermissionFactory; -import net.ess3.permissions.BasePermission; import net.ess3.permissions.MaterialDotStarPermission; -import org.bukkit.Material; -import org.bukkit.command.CommandSender; -import org.bukkit.permissions.PermissionDefault; public enum Permissions implements IPermission @@ -33,7 +30,7 @@ public enum Permissions implements IPermission { this(defaultBase, defaultPerm); } - + private Permissions(final String base, final PermissionDefault defaultPerm) { permission = base + toString().toLowerCase(Locale.ENGLISH).replace('_', '.'); @@ -70,12 +67,12 @@ 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 60a21f11e..e59886710 100644 --- a/EssentialsChat/pom.xml +++ b/EssentialsChat/pom.xml @@ -1,21 +1,20 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsChat</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>EssentialsChat</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java index b80d38f6d..bfd26152e 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChat.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChat.java @@ -1,19 +1,19 @@ package net.ess3.chat; +import static net.ess3.I18n._; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; import net.ess3.api.IEssentials; import net.ess3.api.IPlugin; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerHighest; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerLowest; import net.ess3.chat.listenerlevel.EssentialsChatPlayerListenerNormal; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; public class EssentialsChat extends JavaPlugin diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java index 02c9cda74..4c76e2185 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java @@ -1,23 +1,19 @@ package net.ess3.chat; +import static net.ess3.I18n._; import java.text.MessageFormat; import java.util.Locale; import java.util.Map; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.api.ChargeException; -import net.ess3.api.IEssentials; -import net.ess3.api.IRanks; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.permissions.Permissions; -import net.ess3.utils.FormatUtil; import org.bukkit.Server; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.*; +import net.ess3.economy.Trade; +import net.ess3.permissions.Permissions; +import net.ess3.utils.FormatUtil; + public abstract class EssentialsChatPlayer implements Listener { @@ -26,9 +22,8 @@ public abstract class EssentialsChatPlayer implements Listener protected final transient Server server; protected final transient Map<AsyncPlayerChatEvent, ChatStore> chatStorage; - public EssentialsChatPlayer(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayer( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { this.ess = ess; this.server = server; @@ -84,12 +79,13 @@ public abstract class EssentialsChatPlayer implements Listener IRanks groupSettings = ess.getRanks(); MessageFormat format = groupSettings.getChatFormat(user); - synchronized(format) + synchronized (format) { - event.setFormat(format.format(new Object[] - { - group, world, world.substring(0, 1).toUpperCase(Locale.ENGLISH) - })); + event.setFormat( + format.format( + 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..c335d2300 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java @@ -1,8 +1,6 @@ package net.ess3.chat; import static net.ess3.I18n._; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; @@ -10,6 +8,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; public class EssentialsLocalChatEventListener implements Listener diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java index 3ecb1f733..628b5f056 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerHighest.java @@ -1,20 +1,19 @@ package net.ess3.chat.listenerlevel; import java.util.Map; -import net.ess3.api.IEssentials; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer { - public EssentialsChatPlayerListenerHighest(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayerListenerHighest( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { super(server, ess, chatStorage); } diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java index 836d6af86..df823461e 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java @@ -1,21 +1,20 @@ package net.ess3.chat.listenerlevel; import java.util.Map; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer { - public EssentialsChatPlayerListenerLowest(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayerListenerLowest( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { super(server, ess, chatStorage); } @@ -29,7 +28,7 @@ public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer return; } final IUser user = ess.getUserMap().getUser(event.getPlayer()); - if(user == null) + if (user == null) { event.setCancelled(true); return; diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java index bef4322d6..bc2572ad1 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerNormal.java @@ -1,20 +1,19 @@ package net.ess3.chat.listenerlevel; import java.util.Map; -import net.ess3.api.IEssentials; -import net.ess3.chat.ChatStore; -import net.ess3.chat.EssentialsChatPlayer; import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import net.ess3.api.IEssentials; +import net.ess3.chat.ChatStore; +import net.ess3.chat.EssentialsChatPlayer; public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer { - public EssentialsChatPlayerListenerNormal(final Server server, - final IEssentials ess, - final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) + public EssentialsChatPlayerListenerNormal( + final Server server, final IEssentials ess, final Map<AsyncPlayerChatEvent, ChatStore> chatStorage) { super(server, ess, chatStorage); } diff --git a/EssentialsExtra/pom.xml b/EssentialsExtra/pom.xml index bb763b565..fc2f8e23f 100644 --- a/EssentialsExtra/pom.xml +++ b/EssentialsExtra/pom.xml @@ -1,21 +1,20 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsExtra</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>EssentialsExtra</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java b/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java index 258b53bb5..05418e9d8 100644 --- a/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java +++ b/EssentialsExtra/src/net/ess3/extra/AnnotatedCommand.java @@ -14,7 +14,6 @@ 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 de2c5fedd..93831ef19 100644 --- a/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java +++ b/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java @@ -12,18 +12,17 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Level; -import net.ess3.api.ICommandHandler; -import net.ess3.api.IEssentials; -import net.ess3.bukkit.BukkitPlugin; -import org.bukkit.command.TabExecutor; -import net.ess3.commands.EssentialsCommandHandler; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; +import org.bukkit.command.TabExecutor; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; import org.bukkit.plugin.java.JavaPlugin; +import net.ess3.api.IEssentials; +import net.ess3.bukkit.BukkitPlugin; +import net.ess3.commands.EssentialsCommandHandler; public class EssentialsExtra extends JavaPlugin @@ -69,9 +68,8 @@ public class EssentialsExtra extends JavaPlugin } } } - urls = new URL[] - { - commandDir.toURI().toURL() + urls = new URL[]{ + commandDir.toURI().toURL() }; } catch (Exception ex) @@ -95,7 +93,8 @@ public class EssentialsExtra extends JavaPlugin { throw new IllegalArgumentException("Command class is not annotated with AnnotatedCommand.class"); } - commandMap.register("Essentials", new Command(commandName, anot.description(), anot.usage(), Arrays.asList(anot.aliases())) + commandMap.register( + "Essentials", new Command(commandName, anot.description(), anot.usage(), Arrays.asList(anot.aliases())) { @Override public boolean execute(CommandSender cs, String label, String[] args) diff --git a/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java b/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java index 9ad4274a7..cc947ead2 100644 --- a/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java +++ b/EssentialsExtra/src/net/ess3/extra/commands/Commandkittycannon.java @@ -2,12 +2,12 @@ package net.ess3.extra.commands; import java.util.Random; -import net.ess3.api.IUser; -import net.ess3.commands.EssentialsCommand; -import net.ess3.extra.AnnotatedCommand; import org.bukkit.Location; import org.bukkit.entity.EntityType; import org.bukkit.entity.Ocelot; +import net.ess3.api.IUser; +import net.ess3.commands.EssentialsCommand; +import net.ess3.extra.AnnotatedCommand; @AnnotatedCommand(description = "Throw an exploding kitten at your opponent", usage = "/<command>") @@ -28,15 +28,16 @@ public class Commandkittycannon extends EssentialsCommand ocelot.setCatType(Ocelot.Type.values()[i]); ocelot.setTamed(true); ocelot.setVelocity(user.getPlayer().getEyeLocation().getDirection().multiply(2)); - ess.getPlugin().scheduleSyncDelayedTask(new Runnable() - { - @Override - public void run() - { - final Location loc = ocelot.getLocation(); - ocelot.remove(); - loc.getWorld().createExplosion(loc, 0F); - } - }, 20); + ess.getPlugin().scheduleSyncDelayedTask( + new Runnable() + { + @Override + public void run() + { + final Location loc = ocelot.getLocation(); + ocelot.remove(); + loc.getWorld().createExplosion(loc, 0F); + } + }, 20); } } diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml index c9cb19213..6327d48c5 100644 --- a/EssentialsGeoIP/pom.xml +++ b/EssentialsGeoIP/pom.xml @@ -1,21 +1,20 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsGeoIP</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>EssentialsGeoIP</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/EssentialsGroupBridge/pom.xml b/EssentialsGroupBridge/pom.xml index 37d26ef38..ef9144d1b 100644 --- a/EssentialsGroupBridge/pom.xml +++ b/EssentialsGroupBridge/pom.xml @@ -1,21 +1,20 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsGroupBridge</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>EssentialsGroupManager</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>EssentialsGroupBridge</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>EssentialsGroupManager</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/EssentialsGroupManager/pom.xml b/EssentialsGroupManager/pom.xml index 975483d5f..f0ec22557 100644 --- a/EssentialsGroupManager/pom.xml +++ b/EssentialsGroupManager/pom.xml @@ -1,14 +1,13 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsGroupManager</artifactId> + <artifactId>EssentialsGroupManager</artifactId> </project> diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml index 3fcd5c2b1..ecc54bf47 100644 --- a/EssentialsProtect/pom.xml +++ b/EssentialsProtect/pom.xml @@ -1,22 +1,21 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>EssentialsProtect</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>EssentialsProtect</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </project> diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java index b91f6740e..e6e00ad6d 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java @@ -1,11 +1,11 @@ package net.ess3.protect; +import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.plugin.Plugin; import net.ess3.api.IEssentials; import net.ess3.bukkit.BukkitPlugin; -import org.bukkit.plugin.Plugin; public class EssentialsConnect diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java index 0cc39069f..6446adc44 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java @@ -6,7 +6,9 @@ import org.bukkit.block.BlockFace; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import org.bukkit.event.block.*; +import org.bukkit.event.block.BlockBurnEvent; +import org.bukkit.event.block.BlockFromToEvent; +import org.bukkit.event.block.BlockIgniteEvent; public class EssentialsProtectBlockListener implements Listener @@ -23,8 +25,7 @@ public class EssentialsProtectBlockListener implements Listener { final ProtectHolder settings = prot.getSettings(); final Block block = event.getBlock(); - if (block.getType() == Material.OBSIDIAN - || block.getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN) + if (block.getType() == Material.OBSIDIAN || block.getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN) { event.setCancelled(settings.getData().getPrevent().isPortalCreation()); return; diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java index 2c9a5cdde..0e1b75a7e 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java @@ -36,23 +36,18 @@ public class EssentialsProtectEntityListener implements Listener { final DamageCause cause = event.getCause(); - if (cause == DamageCause.CONTACT - && (Permissions.PREVENTDAMAGE_CONTACT.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (cause == DamageCause.CONTACT && (Permissions.PREVENTDAMAGE_CONTACT.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if (cause == DamageCause.LAVA - && (Permissions.PREVENTDAMAGE_LAVADAMAGE.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (cause == DamageCause.LAVA && (Permissions.PREVENTDAMAGE_LAVADAMAGE.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if (cause == DamageCause.BLOCK_EXPLOSION - && (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (cause == DamageCause.BLOCK_EXPLOSION && (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized( + user))) { event.setCancelled(true); return; @@ -66,52 +61,44 @@ public class EssentialsProtectEntityListener implements Listener final Player attacker = eAttack instanceof Player ? (Player)eAttack : null; // PVP Settings - if (target instanceof Player && eAttack instanceof Player - && (!Permissions.PVP.isAuthorized(user) || !Permissions.PVP.isAuthorized(attacker))) + if (target instanceof Player && eAttack instanceof Player && (!Permissions.PVP.isAuthorized(user) || !Permissions.PVP.isAuthorized(attacker))) { event.setCancelled(true); return; } //Creeper explode prevention - if (eAttack instanceof Creeper && settings.getData().getPrevent().isCreeperExplosion() - || (Permissions.PREVENTDAMAGE_CREEPER.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (eAttack instanceof Creeper && settings.getData().getPrevent().isCreeperExplosion() || (Permissions.PREVENTDAMAGE_CREEPER.isAuthorized( + user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) - && (Permissions.PREVENTDAMAGE_FIREBALL.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) && (Permissions.PREVENTDAMAGE_FIREBALL.isAuthorized( + user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - - if ((event.getEntity() instanceof WitherSkull - && Permissions.PREVENTDAMAGE_WITHERSKULL.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + + if ((event.getEntity() instanceof WitherSkull && Permissions.PREVENTDAMAGE_WITHERSKULL.isAuthorized( + user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if (eAttack instanceof TNTPrimed - && (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (eAttack instanceof TNTPrimed && (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if (edEvent.getDamager() instanceof Projectile - && ((Permissions.PREVENTDAMAGE_PROJECTILES.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)) - || (((Projectile)edEvent.getDamager()).getShooter() instanceof Player - && (!Permissions.PVP.isAuthorized(user) - || !Permissions.PVP.isAuthorized((Player)((Projectile)edEvent.getDamager()).getShooter()))))) + if (edEvent.getDamager() instanceof Projectile && ((Permissions.PREVENTDAMAGE_PROJECTILES.isAuthorized( + user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized( + user)) || (((Projectile)edEvent.getDamager()).getShooter() instanceof Player && (!Permissions.PVP.isAuthorized( + user) || !Permissions.PVP.isAuthorized((Player)((Projectile)edEvent.getDamager()).getShooter()))))) { event.setCancelled(true); return; @@ -121,45 +108,35 @@ public class EssentialsProtectEntityListener implements Listener final DamageCause cause = event.getCause(); if (target instanceof Player) { - if (cause == DamageCause.FALL - && (Permissions.PREVENTDAMAGE_FALL.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (cause == DamageCause.FALL && (Permissions.PREVENTDAMAGE_FALL.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if (cause == DamageCause.SUFFOCATION - && (Permissions.PREVENTDAMAGE_SUFFOCATION.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (cause == DamageCause.SUFFOCATION && (Permissions.PREVENTDAMAGE_SUFFOCATION.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized( + user))) { event.setCancelled(true); return; } - if ((cause == DamageCause.FIRE - || cause == DamageCause.FIRE_TICK) - && (Permissions.PREVENTDAMAGE_FIRE.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if ((cause == DamageCause.FIRE || cause == DamageCause.FIRE_TICK) && (Permissions.PREVENTDAMAGE_FIRE.isAuthorized( + user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if (cause == DamageCause.DROWNING - && (Permissions.PREVENTDAMAGE_DROWNING.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (cause == DamageCause.DROWNING && (Permissions.PREVENTDAMAGE_DROWNING.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) { event.setCancelled(true); return; } - if (cause == DamageCause.LIGHTNING - && (Permissions.PREVENTDAMAGE_LIGHTNING.isAuthorized(user) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user))) + if (cause == DamageCause.LIGHTNING && (Permissions.PREVENTDAMAGE_LIGHTNING.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized( + user))) { event.setCancelled(true); } - if (cause == DamageCause.WITHER - && (Permissions.PREVENTDAMAGE_WITHER.isAuthorized(user)) - && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)) + if (cause == DamageCause.WITHER && (Permissions.PREVENTDAMAGE_WITHER.isAuthorized(user)) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)) { event.setCancelled(true); return; @@ -173,41 +150,33 @@ public class EssentialsProtectEntityListener implements Listener final ProtectHolder settings = prot.getSettings(); final int maxHeight = settings.getData().getCreeperMaxHeight(); - if (event.getEntity() instanceof EnderDragon - && settings.getData().getPrevent().isEnderdragonBlockdamage()) + if (event.getEntity() instanceof EnderDragon && settings.getData().getPrevent().isEnderdragonBlockdamage()) { event.setCancelled(true); return; } - else if (event.getEntity() instanceof Wither - && settings.getData().getPrevent().isWitherSpawnExplosion()) + else if (event.getEntity() instanceof Wither && settings.getData().getPrevent().isWitherSpawnExplosion()) { event.setCancelled(true); return; } - else if (event.getEntity() instanceof Creeper - && (settings.getData().getPrevent().isCreeperExplosion() - || settings.getData().getPrevent().isCreeperBlockdamage() - || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))) + else if (event.getEntity() instanceof Creeper && (settings.getData().getPrevent().isCreeperExplosion() || settings.getData().getPrevent().isCreeperBlockdamage() || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))) { event.setCancelled(true); event.getLocation().getWorld().createExplosion(event.getLocation(), 0F); return; } - else if (event.getEntity() instanceof TNTPrimed - && settings.getData().getPrevent().isTntExplosion()) + else if (event.getEntity() instanceof TNTPrimed && settings.getData().getPrevent().isTntExplosion()) { event.setCancelled(true); return; } - else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) - && settings.getData().getPrevent().isFireballExplosion()) + else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) && settings.getData().getPrevent().isFireballExplosion()) { event.setCancelled(true); return; } - else if ((event.getEntity() instanceof WitherSkull) - && settings.getData().getPrevent().isWitherskullExplosion()) + else if ((event.getEntity() instanceof WitherSkull) && settings.getData().getPrevent().isWitherskullExplosion()) { event.setCancelled(true); return; @@ -217,23 +186,17 @@ public class EssentialsProtectEntityListener implements Listener @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEntityTarget(final EntityTargetEvent event) { - final Entity entity = event.getTarget(); - if(entity == null) + final Entity entity = event.getTarget(); + if (entity == null) { return; } - + if (entity.getType() == EntityType.PLAYER) { final Player user = (Player)event.getTarget(); - if ((event.getReason() == TargetReason.CLOSEST_PLAYER - || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY - || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET - || event.getReason() == TargetReason.RANDOM_TARGET - || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER - || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET) - && !prot.getSettings().getData().getPrevent().isEntitytarget() - && !Permissions.ENTITY_TARGET_BYPASS.isAuthorized(user, event.getEntity().getType().getName().toLowerCase())) + if ((event.getReason() == TargetReason.CLOSEST_PLAYER || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET || event.getReason() == TargetReason.RANDOM_TARGET || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET) && !prot.getSettings().getData().getPrevent().isEntitytarget() && !Permissions.ENTITY_TARGET_BYPASS.isAuthorized( + user, event.getEntity().getType().getName().toLowerCase())) { event.setCancelled(true); } @@ -244,8 +207,7 @@ public class EssentialsProtectEntityListener implements Listener public void onExplosionPrime(final ExplosionPrimeEvent event) { final ProtectHolder settings = prot.getSettings(); - if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) - && settings.getData().getPrevent().isFireballFire()) + if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) && settings.getData().getPrevent().isFireballFire()) { event.setFire(false); } diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java index 1f71944a0..c12dc4a52 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java @@ -22,9 +22,7 @@ public class EssentialsProtectWeatherListener implements Listener { final ProtectHolder settings = prot.getSettings(); - if (!event.isCancelled() - && settings.getData().isDisableStorm() - && event.toWeatherState()) + if (!event.isCancelled() && settings.getData().isDisableStorm() && event.toWeatherState()) { event.setCancelled(true); } @@ -35,8 +33,7 @@ public class EssentialsProtectWeatherListener implements Listener { final ProtectHolder settings = prot.getSettings(); - if (!event.isCancelled() - && settings.getData().isDisableLighting()) + if (!event.isCancelled() && settings.getData().isDisableLighting()) { event.setCancelled(true); } @@ -47,9 +44,7 @@ public class EssentialsProtectWeatherListener implements Listener { final ProtectHolder settings = prot.getSettings(); - if (!event.isCancelled() - && settings.getData().isDisableThunder() - && event.toThunderState()) + if (!event.isCancelled() && settings.getData().isDisableThunder() && event.toThunderState()) { event.setCancelled(true); } diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java index 9890231d5..7ab2c0ea5 100644 --- a/EssentialsProtect/src/net/ess3/protect/Permissions.java +++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java @@ -1,15 +1,15 @@ package net.ess3.protect; import java.util.Locale; +import org.bukkit.command.CommandSender; +import org.bukkit.permissions.PermissionDefault; import net.ess3.api.IPermission; import net.ess3.bukkit.PermissionFactory; import net.ess3.permissions.DotStarPermission; -import org.bukkit.command.CommandSender; -import org.bukkit.permissions.PermissionDefault; public enum Permissions implements IPermission -{ +{ PVP(PermissionDefault.TRUE), PREVENTDAMAGE_FALL(PermissionDefault.FALSE), PREVENTDAMAGE_CREEPER(PermissionDefault.FALSE), @@ -73,5 +73,5 @@ public enum Permissions implements IPermission return PermissionFactory.checkPermission(sender, this); } - public static DotStarPermission ENTITY_TARGET_BYPASS = new DotStarPermission("essentials.protect.entitytarget.bypass"); + public static DotStarPermission ENTITY_TARGET_BYPASS = new DotStarPermission("essentials.protect.entitytarget.bypass"); } diff --git a/EssentialsSigns/pom.xml b/EssentialsSigns/pom.xml index 4793a11c1..85a47c60b 100644 --- a/EssentialsSigns/pom.xml +++ b/EssentialsSigns/pom.xml @@ -1,21 +1,20 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsSigns</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <artifactId>EssentialsSigns</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 95876ff0f..ad6445c23 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -1,15 +1,9 @@ package net.ess3.signs; +import static net.ess3.I18n._; import java.util.HashSet; import java.util.Locale; import java.util.Set; -import static net.ess3.I18n._; -import net.ess3.api.ChargeException; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.economy.Trade; -import net.ess3.signs.signs.SignException; -import net.ess3.utils.FormatUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -17,6 +11,12 @@ import org.bukkit.block.Sign; import org.bukkit.entity.Player; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.inventory.ItemStack; +import net.ess3.api.ChargeException; +import net.ess3.api.IEssentials; +import net.ess3.api.IUser; +import net.ess3.economy.Trade; +import net.ess3.signs.signs.SignException; +import net.ess3.utils.FormatUtil; public class EssentialsSign @@ -86,8 +86,7 @@ public class EssentialsSign } try { - return SignsPermissions.USE.isAuthorized(user, signName) - && onSignInteract(sign, user, getUsername(user), ess); + return SignsPermissions.USE.isAuthorized(user, signName) && onSignInteract(sign, user, getUsername(user), ess); } catch (ChargeException ex) { @@ -107,8 +106,7 @@ public class EssentialsSign final IUser user = ess.getUserMap().getUser(player); try { - return SignsPermissions.BREAK.isAuthorized(user, signName) - && onSignBreak(sign, user, getUsername(user), ess); + return SignsPermissions.BREAK.isAuthorized(user, signName) && onSignBreak(sign, user, getUsername(user), ess); } catch (SignException ex) { @@ -214,12 +212,8 @@ public class EssentialsSign { return true; } - final BlockFace[] directions = new BlockFace[] - { - BlockFace.NORTH, - BlockFace.EAST, - BlockFace.SOUTH, - BlockFace.WEST + final BlockFace[] directions = new BlockFace[]{ + BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST }; for (BlockFace blockFace : directions) { @@ -276,8 +270,7 @@ public class EssentialsSign } } - protected final void validateTrade(final ISign sign, final int amountIndex, final int itemIndex, - final IUser player, final IEssentials ess) throws SignException + protected final void validateTrade(final ISign sign, final int amountIndex, final int itemIndex, final IUser player, final IEssentials ess) throws SignException { if (sign.getLine(itemIndex).equalsIgnoreCase("exp") || sign.getLine(itemIndex).equalsIgnoreCase("xp")) { @@ -292,8 +285,7 @@ public class EssentialsSign sign.setLine(itemIndex, sign.getLine(itemIndex).trim()); } - protected final Trade getTrade(final ISign sign, final int amountIndex, final int itemIndex, - final IUser player, final IEssentials ess) throws SignException + protected final Trade getTrade(final ISign sign, final int amountIndex, final int itemIndex, final IUser player, final IEssentials ess) throws SignException { if (sign.getLine(itemIndex).equalsIgnoreCase("exp") || sign.getLine(itemIndex).equalsIgnoreCase("xp")) { @@ -301,7 +293,8 @@ public class EssentialsSign return new Trade(amount, ess); } final ItemStack item = getItemStack(sign.getLine(itemIndex), 1, ess); - final int amount = Math.min(getIntegerPositive(sign.getLine(amountIndex)), item.getType().getMaxStackSize() * player.getPlayer().getInventory().getSize()); + final int amount = Math.min( + getIntegerPositive(sign.getLine(amountIndex)), item.getType().getMaxStackSize() * player.getPlayer().getInventory().getSize()); if (item.getTypeId() == 0 || amount < 1) { throw new SignException(_("moreThanZero")); diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java index cdd4494ea..2ac464f88 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java @@ -1,16 +1,16 @@ package net.ess3.signs; +import static net.ess3.I18n._; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; +import org.bukkit.Bukkit; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; import net.ess3.api.IEssentials; import net.ess3.api.IPlugin; import net.ess3.signs.listeners.SignBlockListener; import net.ess3.signs.listeners.SignEntityListener; import net.ess3.signs.listeners.SignPlayerListener; -import org.bukkit.Bukkit; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin diff --git a/EssentialsSigns/src/net/ess3/signs/SignConfig.java b/EssentialsSigns/src/net/ess3/signs/SignConfig.java index 7706907ec..4964333eb 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignConfig.java +++ b/EssentialsSigns/src/net/ess3/signs/SignConfig.java @@ -16,24 +16,24 @@ public class SignConfig implements StorageObject public Map<String, Boolean> getSigns() { - return signs == null - ? Collections.<String, Boolean>emptyMap() - : Collections.unmodifiableMap(signs); + return signs == null ? Collections.<String, Boolean>emptyMap() : Collections.unmodifiableMap(signs); } public void setSigns(final Map<String, Boolean> signs) { this.signs = signs; } + @Comment( - { - "How many times per second can Essentials signs be interacted with.", - "Values should be between 1-20, 20 being virtually no lag protection.", - "Lower numbers will reduce the possiblity of lag, but may annoy players." - }) + { + "How many times per second can Essentials signs be interacted with.", + "Values should be between 1-20, 20 being virtually no lag protection.", + "Lower numbers will reduce the possiblity of lag, but may annoy players." + }) private int signUsesPerSecond = 4; - public int getSignUsePerSecond() { + public int getSignUsePerSecond() + { return signUsesPerSecond > 0 ? signUsesPerSecond : 1; } diff --git a/EssentialsSigns/src/net/ess3/signs/Signs.java b/EssentialsSigns/src/net/ess3/signs/Signs.java index 6cf7aae54..f9f608cdc 100644 --- a/EssentialsSigns/src/net/ess3/signs/Signs.java +++ b/EssentialsSigns/src/net/ess3/signs/Signs.java @@ -1,23 +1,6 @@ package net.ess3.signs; -import net.ess3.signs.signs.SignBalance; -import net.ess3.signs.signs.SignBuy; -import net.ess3.signs.signs.SignDisposal; -import net.ess3.signs.signs.SignEnchant; -import net.ess3.signs.signs.SignFeed; -import net.ess3.signs.signs.SignFree; -import net.ess3.signs.signs.SignGameMode; -import net.ess3.signs.signs.SignHeal; -import net.ess3.signs.signs.SignInfo; -import net.ess3.signs.signs.SignKit; -import net.ess3.signs.signs.SignMail; -import net.ess3.signs.signs.SignRepair; -import net.ess3.signs.signs.SignSell; -import net.ess3.signs.signs.SignSpawnmob; -import net.ess3.signs.signs.SignTime; -import net.ess3.signs.signs.SignTrade; -import net.ess3.signs.signs.SignWarp; -import net.ess3.signs.signs.SignWeather; +import net.ess3.signs.signs.*; public enum Signs diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java index 9c62337c4..96d1326a4 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java +++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java @@ -2,9 +2,9 @@ package net.ess3.signs; import java.io.File; import java.util.*; +import org.bukkit.plugin.Plugin; import net.ess3.api.IEssentials; import net.ess3.storage.AsyncStorageObjectHolder; -import org.bukkit.plugin.Plugin; public class SignsConfigHolder extends AsyncStorageObjectHolder<SignConfig> diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java index 9deea4de1..d1ad37da8 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java @@ -2,14 +2,6 @@ package net.ess3.signs.listeners; import java.util.logging.Level; import java.util.logging.Logger; -import net.ess3.api.IEssentials; -import net.ess3.api.ISettings; -import net.ess3.api.IUser; -import net.ess3.permissions.Permissions; -import net.ess3.signs.EssentialsSign; -import net.ess3.signs.ISignsPlugin; -import net.ess3.signs.Signs; -import net.ess3.utils.FormatUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; @@ -18,6 +10,14 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.*; +import net.ess3.api.IEssentials; +import net.ess3.api.ISettings; +import net.ess3.api.IUser; +import net.ess3.permissions.Permissions; +import net.ess3.signs.EssentialsSign; +import net.ess3.signs.ISignsPlugin; +import net.ess3.signs.Signs; +import net.ess3.utils.FormatUtil; public class SignBlockListener implements Listener @@ -58,8 +58,7 @@ public class SignBlockListener implements Listener for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName()) - && !sign.onSignBreak(block, player, ess)) + if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName()) && !sign.onSignBreak(block, player, ess)) { return true; } @@ -73,8 +72,7 @@ public class SignBlockListener implements Listener } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockBreak(block, player, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBreak(block, player, ess)) { LOGGER.log(Level.INFO, "A block was protected by a sign."); return true; @@ -105,8 +103,7 @@ public class SignBlockListener implements Listener event.setCancelled(true); return; } - if (event.getLine(0).equalsIgnoreCase(sign.getTemplateName()) - && !sign.onSignCreate(event, ess)) + if (event.getLine(0).equalsIgnoreCase(sign.getTemplateName()) && !sign.onSignCreate(event, ess)) { event.setCancelled(true); return; @@ -123,24 +120,20 @@ public class SignBlockListener implements Listener } final Block against = event.getBlockAgainst(); - if ((against.getTypeId() == WALL_SIGN - || against.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against))) + if ((against.getTypeId() == WALL_SIGN || against.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against))) { event.setCancelled(true); return; } final Block block = event.getBlock(); - if (block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) + if (block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) { return; } for (Signs signs : Signs.values()) { final EssentialsSign sign = signs.getSign(); - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockPlace(block, event.getPlayer(), ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPlace(block, event.getPlayer(), ess)) { event.setCancelled(true); return; @@ -157,18 +150,15 @@ public class SignBlockListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockBurn(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBurn(block, ess)) { event.setCancelled(true); return; @@ -185,18 +175,15 @@ public class SignBlockListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockIgnite(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockIgnite(block, ess)) { event.setCancelled(true); return; @@ -214,18 +201,15 @@ public class SignBlockListener implements Listener for (Block block : event.getBlocks()) { - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockPush(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPush(block, ess)) { event.setCancelled(true); return; @@ -245,18 +229,15 @@ public class SignBlockListener implements Listener if (event.isSticky()) { final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == WALL_SIGN || block.getTypeId() == SIGN_POST) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockPush(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockPush(block, ess)) { event.setCancelled(true); return; diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java index 2be907813..8fdebce8e 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java @@ -1,8 +1,5 @@ package net.ess3.signs.listeners; -import net.ess3.api.IEssentials; -import net.ess3.signs.EssentialsSign; -import net.ess3.signs.ISignsPlugin; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; @@ -10,6 +7,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityExplodeEvent; +import net.ess3.api.IEssentials; +import net.ess3.signs.EssentialsSign; +import net.ess3.signs.ISignsPlugin; public class SignEntityListener implements Listener @@ -33,10 +33,8 @@ public class SignEntityListener implements Listener for (Block block : event.blockList()) { - if (((block.getTypeId() == Material.WALL_SIGN.getId() - || block.getTypeId() == Material.SIGN_POST.getId()) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; @@ -61,18 +59,15 @@ public class SignEntityListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == Material.WALL_SIGN.getId() - || block.getTypeId() == Material.SIGN_POST.getId()) - && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) - || EssentialsSign.checkIfBlockBreaksSigns(block)) + if (((block.getTypeId() == Material.WALL_SIGN.getId() || block.getTypeId() == Material.SIGN_POST.getId()) && EssentialsSign.isValidSign( + new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { event.setCancelled(true); return; } for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockBreak(block, ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockBreak(block, ess)) { event.setCancelled(true); return; diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java index 8c6fc6899..f1460f411 100644 --- a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java +++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java @@ -1,8 +1,5 @@ package net.ess3.signs.listeners; -import net.ess3.api.IEssentials; -import net.ess3.signs.EssentialsSign; -import net.ess3.signs.ISignsPlugin; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; @@ -11,6 +8,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; +import net.ess3.api.IEssentials; +import net.ess3.signs.EssentialsSign; +import net.ess3.signs.ISignsPlugin; public class SignPlayerListener implements Listener @@ -55,8 +55,7 @@ public class SignPlayerListener implements Listener { for (EssentialsSign sign : plugin.getSettings().getEnabledSigns()) { - if (sign.getBlocks().contains(block.getType()) - && !sign.onBlockInteract(block, event.getPlayer(), ess)) + if (sign.getBlocks().contains(block.getType()) && !sign.onBlockInteract(block, event.getPlayer(), ess)) { event.setCancelled(true); return; diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java index 365de9557..90acd26f4 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java @@ -1,15 +1,15 @@ package net.ess3.signs.signs; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.ItemStack; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.bukkit.Enchantments; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemStack; public class SignEnchant extends EssentialsSign @@ -90,10 +90,8 @@ public class SignEnchant extends EssentialsSign } final ItemStack playerHand = player.getPlayer().getItemInHand(); - if (playerHand == null - || playerHand.getAmount() != 1 - || (playerHand.containsEnchantment(enchantment) - && playerHand.getEnchantmentLevel(enchantment) == level)) + if (playerHand == null || playerHand.getAmount() != 1 || (playerHand.containsEnchantment(enchantment) && playerHand.getEnchantmentLevel( + enchantment) == level)) { throw new SignException(_("missingItems", 1, sign.getLine(1))); } diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java b/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java index ab5151caf..a1c6abc29 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignFeed.java @@ -14,14 +14,14 @@ public class SignFeed extends EssentialsSign { super("Feed"); } - + @Override protected boolean onSignCreate(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException { validateTrade(sign, 1, ess); return true; } - + @Override protected boolean onSignInteract(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException, ChargeException { diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java index cf7ffed50..fb9a27254 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java @@ -1,13 +1,13 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.craftbukkit.InventoryWorkaround; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; public class SignFree extends EssentialsSign diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java index 52972e9cd..159e85d4a 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignGameMode.java @@ -1,13 +1,13 @@ package net.ess3.signs.signs; -import java.util.Locale; import static net.ess3.I18n._; +import java.util.Locale; +import org.bukkit.GameMode; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.GameMode; public class SignGameMode extends EssentialsSign diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java index ed8fb075b..847816db8 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java @@ -53,13 +53,14 @@ public class SignKit extends EssentialsSign { final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH); final String group = sign.getLine(2); - if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) - || (group.isEmpty() && Permissions.KITS.isAuthorized(player, kitName))) + if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && Permissions.KITS.isAuthorized( + player, kitName))) { final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player); try - {; + { + ; final Kit kit = ess.getKits().getKit(kitName); ess.getKits().checkTime(player, kit); ess.getKits().sendKit(player, kit); diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java index 2f93aadb0..aca55a6ea 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java @@ -1,7 +1,7 @@ package net.ess3.signs.signs; -import java.util.List; import static net.ess3.I18n._; +import java.util.List; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.signs.EssentialsSign; diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java index 5b60c348c..cd3d9dc93 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignRepair.java @@ -40,9 +40,8 @@ public class SignRepair extends EssentialsSign Commandrepair command = new Commandrepair(); command.init(ess, "repair"); - String[] args = new String[] - { - sign.getLine(1) + String[] args = new String[]{ + sign.getLine(1) }; try { diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java b/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java index 39b1b0db5..bf52f5d50 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignSpawnmob.java @@ -4,7 +4,6 @@ import net.ess3.SpawnMob; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; -import net.ess3.commands.Commandspawnmob; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java b/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java index d6d65f76d..77e992f60 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java @@ -1,12 +1,12 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.World; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.World; public class SignTime extends EssentialsSign diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java index 798fb1733..79479e96c 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java @@ -1,6 +1,7 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.inventory.ItemStack; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; @@ -8,7 +9,7 @@ import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; import net.ess3.signs.SignsPermissions; import net.ess3.utils.FormatUtil; -import org.bukkit.inventory.ItemStack; + //TODO: Sell Enchantment on Trade signs? public class SignTrade extends EssentialsSign @@ -77,10 +78,8 @@ public class SignTrade extends EssentialsSign { final Trade trade = getTrade(sign, 2, false, false, ess); ItemStack itemInHand = player.getPlayer().getItemInHand(); - if (trade.getItemStack() != null && itemInHand != null - && trade.getItemStack().getTypeId() == itemInHand.getTypeId() - && trade.getItemStack().getDurability() == itemInHand.getDurability() - && trade.getItemStack().getEnchantments().equals(itemInHand.getEnchantments())) + if (trade.getItemStack() != null && itemInHand != null && trade.getItemStack().getTypeId() == itemInHand.getTypeId() && trade.getItemStack().getDurability() == itemInHand.getDurability() && trade.getItemStack().getEnchantments().equals( + itemInHand.getEnchantments())) { int amount = itemInHand.getAmount(); amount -= amount % trade.getItemStack().getAmount(); @@ -100,8 +99,7 @@ public class SignTrade extends EssentialsSign @Override protected boolean onSignBreak(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException { - if ((sign.getLine(3).length() > 3 && sign.getLine(3).substring(2).equalsIgnoreCase(username)) - || SignsPermissions.TRADE_OVERRIDE.isAuthorized(player)) + if ((sign.getLine(3).length() > 3 && sign.getLine(3).substring(2).equalsIgnoreCase(username)) || SignsPermissions.TRADE_OVERRIDE.isAuthorized(player)) { try { @@ -174,8 +172,7 @@ public class SignTrade extends EssentialsSign { throw new SignException(_("moreThanZero")); } - if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) - && getItemStack(split[1], amount, ess).getTypeId() == 0) + if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], amount, ess).getTypeId() == 0) { throw new SignException(_("moreThanZero")); } @@ -197,8 +194,7 @@ public class SignTrade extends EssentialsSign { throw new SignException(_("moreThanZero")); } - if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) - && getItemStack(split[1], stackamount, ess).getTypeId() == 0) + if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], stackamount, ess).getTypeId() == 0) { throw new SignException(_("moreThanZero")); } diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java index 08c9795ef..8cad890e9 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java @@ -1,12 +1,12 @@ package net.ess3.signs.signs; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.permissions.Permissions; import net.ess3.signs.EssentialsSign; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; public class SignWarp extends EssentialsSign @@ -52,8 +52,8 @@ public class SignWarp extends EssentialsSign final String warpName = sign.getLine(1); final String group = sign.getLine(2); - if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) - || (group.isEmpty() && Permissions.WARPS.isAuthorized(player, warpName))) + if ((!group.isEmpty() && ("§2Everyone".equals(group) || ess.getRanks().inGroup(player, group))) || (group.isEmpty() && Permissions.WARPS.isAuthorized( + player, warpName))) { final Trade charge = getTrade(sign, 3, ess); try diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java index 0d428f11d..d96c40355 100644 --- a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java +++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java @@ -1,12 +1,12 @@ package net.ess3.signs.signs; import static net.ess3.I18n._; +import org.bukkit.World; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; import net.ess3.signs.EssentialsSign; -import org.bukkit.World; public class SignWeather extends EssentialsSign diff --git a/EssentialsUpdate/pom.xml b/EssentialsUpdate/pom.xml index 2ea170a83..89c76dda8 100644 --- a/EssentialsUpdate/pom.xml +++ b/EssentialsUpdate/pom.xml @@ -1,22 +1,21 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsUpdate</artifactId> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - </dependency> - </dependencies> + <artifactId>EssentialsUpdate</artifactId> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + <scope>test</scope> + </dependency> + </dependencies> </project> diff --git a/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java index 7a927d4db..e63508464 100644 --- a/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java +++ b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java @@ -10,6 +10,7 @@ public abstract class AbstractWorkListener this.plugin = plugin; this.newVersionInfo = newVersionInfo; } + private final transient Plugin plugin; private final transient VersionInfo newVersionInfo; diff --git a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java index a45b85117..b2da16187 100644 --- a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java +++ b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java @@ -1,6 +1,5 @@ package net.ess3.update; -import net.ess3.update.chat.*; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -13,6 +12,7 @@ import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; +import net.ess3.update.chat.*; public class EssentialsHelp implements Listener @@ -50,7 +50,8 @@ public class EssentialsHelp implements Listener chatUser = (Player)sender; ircBot = null; sender.sendMessage("You will be connected to the Essentials Help Chat."); - sender.sendMessage("All your chat messages will be forwarded to the channel. You can't chat with other players on your server while in help chat, but you can use commands."); + sender.sendMessage( + "All your chat messages will be forwarded to the channel. You can't chat with other players on your server while in help chat, but you can use commands."); sender.sendMessage("Please be patient, if noone is available, check back later."); sender.sendMessage("Type !help to get a list of all commands."); sender.sendMessage("Type !quit to leave the channel."); diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java index 98a9983e8..51ebe9d1e 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java @@ -48,7 +48,8 @@ public class UpdateCheck public void scheduleUpdateTask() { - plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() + plugin.getServer().getScheduler().scheduleAsyncRepeatingTask( + plugin, new Runnable() { @Override public void run() @@ -187,7 +188,8 @@ public class UpdateCheck private int getBukkitVersion() { - final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(plugin.getServer().getVersion()); + final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher( + plugin.getServer().getVersion()); if (versionMatch.matches()) { return Integer.parseInt(versionMatch.group(1)); diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java index cdab65600..7a44a2ade 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java @@ -1,10 +1,6 @@ package net.ess3.update; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; +import java.io.*; import java.math.BigInteger; import java.security.KeyFactory; import java.security.PublicKey; @@ -25,7 +21,9 @@ public class UpdateFile { private final static Logger LOGGER = Bukkit.getLogger(); private final static String UPDATE_URL = "http://goo.gl/67jev"; - private final static BigInteger PUBLIC_KEY = new BigInteger("5ha6a2d4qdy17ttkg8evh74sl5a87djojwenu12k1lvy8ui6003e6l06rntczpoh99mhc3txj8mqlxw111oyy9yl7s7qpyluyzix3j1odxrxx4u52gxvyu6qiteapczkzvi7rxgeqsozz7b19rdx73a7quo9ybwpz1cr82r7x5k0pg2a73pjjsv2j1awr13azo7klrcxp9y5xxwf5qv1s3tw4zqftli18u0ek5qkbzfbgk1v5n2f11pkwwk6p0mibrn26wnjbv11vyiqgu95o7busmt6vf5q7grpcenl637w83mbin56s3asj1131b2mscj9xep3cbj7la9tgsxl5bj87vzy8sk2d34kzwqdqgh9nry43nqqus12l1stmiv184r8r3jcy8w43e8h1u1mzklldb5eytkuhayqik8l3ns04hwt8sgacvw534be8sx26qrn5s1", 36); + private final static BigInteger PUBLIC_KEY = new BigInteger( + "5ha6a2d4qdy17ttkg8evh74sl5a87djojwenu12k1lvy8ui6003e6l06rntczpoh99mhc3txj8mqlxw111oyy9yl7s7qpyluyzix3j1odxrxx4u52gxvyu6qiteapczkzvi7rxgeqsozz7b19rdx73a7quo9ybwpz1cr82r7x5k0pg2a73pjjsv2j1awr13azo7klrcxp9y5xxwf5qv1s3tw4zqftli18u0ek5qkbzfbgk1v5n2f11pkwwk6p0mibrn26wnjbv11vyiqgu95o7busmt6vf5q7grpcenl637w83mbin56s3asj1131b2mscj9xep3cbj7la9tgsxl5bj87vzy8sk2d34kzwqdqgh9nry43nqqus12l1stmiv184r8r3jcy8w43e8h1u1mzklldb5eytkuhayqik8l3ns04hwt8sgacvw534be8sx26qrn5s1", + 36); private final transient File file; private final transient Plugin plugin; private final transient TreeMap<Version, VersionInfo> versions = new TreeMap<Version, VersionInfo>(); @@ -105,8 +103,7 @@ public class UpdateFile { break; } - else if ((cur >= '0' && cur <= '9') - || (cur >= 'a' && cur <= 'z')) + else if ((cur >= '0' && cur <= '9') || (cur >= 'a' && cur <= 'z')) { if (isSignature) { diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java index f96cdd18f..774dd4ac1 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java @@ -1,8 +1,5 @@ package net.ess3.update; -import net.ess3.update.states.InstallationFinishedEvent; -import net.ess3.update.states.StateMachine; -import net.ess3.update.tasks.SelfUpdate; import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -13,6 +10,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.Plugin; +import net.ess3.update.states.InstallationFinishedEvent; +import net.ess3.update.states.StateMachine; +import net.ess3.update.tasks.SelfUpdate; + // TODO: This whole thing should make use of the conversations api public class UpdateProcess implements Listener @@ -43,40 +44,37 @@ public class UpdateProcess implements Listener currentPlayer.sendMessage("A newer version of EssentialsUpdate is found. Downloading new file and reloading server."); } Bukkit.getLogger().log(Level.INFO, "A newer version of EssentialsUpdate is found. Downloading new file and reloading server."); - new SelfUpdate(new AbstractWorkListener(plugin, updateCheck.getNewVersionInfo()) - { - @Override - public void onWorkAbort(final String message) - { - if (message != null && !message.isEmpty() - && UpdateProcess.this.currentPlayer != null - && UpdateProcess.this.currentPlayer.isOnline()) - { - UpdateProcess.this.currentPlayer.sendMessage(message); - } - if (message != null && !message.isEmpty()) + new SelfUpdate( + new AbstractWorkListener(plugin, updateCheck.getNewVersionInfo()) { - Bukkit.getLogger().log(Level.SEVERE, message); - } - UpdateProcess.this.currentPlayer = null; - } + @Override + public void onWorkAbort(final String message) + { + if (message != null && !message.isEmpty() && UpdateProcess.this.currentPlayer != null && UpdateProcess.this.currentPlayer.isOnline()) + { + UpdateProcess.this.currentPlayer.sendMessage(message); + } + if (message != null && !message.isEmpty()) + { + Bukkit.getLogger().log(Level.SEVERE, message); + } + UpdateProcess.this.currentPlayer = null; + } - @Override - public void onWorkDone(final String message) - { - if (message != null && !message.isEmpty() - && UpdateProcess.this.currentPlayer != null - && UpdateProcess.this.currentPlayer.isOnline()) - { - UpdateProcess.this.currentPlayer.sendMessage(message); - } - if (message != null && !message.isEmpty()) - { - Bukkit.getLogger().log(Level.INFO, message); - } - UpdateProcess.this.currentPlayer = null; - } - }).start(); + @Override + public void onWorkDone(final String message) + { + if (message != null && !message.isEmpty() && UpdateProcess.this.currentPlayer != null && UpdateProcess.this.currentPlayer.isOnline()) + { + UpdateProcess.this.currentPlayer.sendMessage(message); + } + if (message != null && !message.isEmpty()) + { + Bukkit.getLogger().log(Level.INFO, message); + } + UpdateProcess.this.currentPlayer = null; + } + }).start(); return true; } if (updateCheck.getResult() == UpdateCheck.CheckResult.NEW_ESS_BUKKIT) @@ -142,13 +140,16 @@ public class UpdateProcess implements Listener switch (result) { case NEW_ESS: - player.sendMessage("The new version " + updateCheck.getNewVersion().toString() + " for Essentials is available. Please type /essentialsupdate to update."); + player.sendMessage( + "The new version " + updateCheck.getNewVersion().toString() + " for Essentials is available. Please type /essentialsupdate to update."); break; case NEW_BUKKIT: - player.sendMessage("Your bukkit version is not the recommended build for Essentials, please update to version " + updateCheck.getNewBukkitVersion() + "."); + player.sendMessage( + "Your bukkit version is not the recommended build for Essentials, please update to version " + updateCheck.getNewBukkitVersion() + "."); break; case NEW_ESS_BUKKIT: - player.sendMessage("There is a new version " + updateCheck.getNewVersion().toString() + " of Essentials for Bukkit " + updateCheck.getNewBukkitVersion()); + player.sendMessage( + "There is a new version " + updateCheck.getNewVersion().toString() + " of Essentials for Bukkit " + updateCheck.getNewBukkitVersion()); break; default: } @@ -187,7 +188,8 @@ public class UpdateProcess implements Listener private void startWork() { currentPlayer.sendMessage("Installation wizard done. Starting installation."); - Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + plugin, new Runnable() { @Override public void run() diff --git a/EssentialsUpdate/src/net/ess3/update/Version.java b/EssentialsUpdate/src/net/ess3/update/Version.java index 5fc10eb18..ee449186f 100644 --- a/EssentialsUpdate/src/net/ess3/update/Version.java +++ b/EssentialsUpdate/src/net/ess3/update/Version.java @@ -30,6 +30,7 @@ public class Version implements Comparable<Version> { return type; } + private final transient int major; private final transient int minor; private final transient int build; diff --git a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java index 2e6d44f20..d01d0790f 100644 --- a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java @@ -1,11 +1,9 @@ package net.ess3.update.chat; -import net.ess3.update.PastieUpload; import java.io.*; import java.nio.charset.Charset; - -import net.ess3.update.PastieUpload; import org.bukkit.plugin.Plugin; +import net.ess3.update.PastieUpload; public abstract class AbstractFileCommand implements Command diff --git a/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java index 10ce9ad8a..348a9ae44 100644 --- a/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java +++ b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java @@ -94,9 +94,8 @@ public class IrcBot extends PircBot } @Override - protected void onKick(final String channel, final String kickerNick, - final String kickerLogin, final String kickerHostname, - final String recipientNick, final String reason) + protected void onKick( + final String channel, final String kickerNick, final String kickerLogin, final String kickerHostname, final String recipientNick, final String reason) { if (recipientNick.equals(getNick())) { @@ -112,33 +111,29 @@ public class IrcBot extends PircBot } @Override - protected void onMessage(final String channel, final String sender, - final String login, final String hostname, - final String message) + protected void onMessage( + final String channel, final String sender, final String login, final String hostname, final String message) { player.sendMessage(formatChatMessage(sender, message, false)); } @Override - protected void onAction(final String sender, final String login, - final String hostname, final String target, - final String action) + protected void onAction( + final String sender, final String login, final String hostname, final String target, final String action) { player.sendMessage(formatChatMessage(sender, action, true)); } @Override - protected void onNotice(final String sourceNick, final String sourceLogin, - final String sourceHostname, final String target, - final String notice) + protected void onNotice( + final String sourceNick, final String sourceLogin, final String sourceHostname, final String target, final String notice) { player.sendMessage(formatChatMessage(sourceNick, notice, false)); } @Override - protected void onTopic(final String channel, final String topic, - final String setBy, final long date, - final boolean changed) + protected void onTopic( + final String channel, final String topic, final String setBy, final long date, final boolean changed) { player.sendMessage(formatChatMessage(channel, topic, false)); } diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java index 5d4e03a2c..ba202c1ff 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java @@ -1,8 +1,7 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.AbstractWorkListener; import org.bukkit.entity.Player; +import net.ess3.update.AbstractWorkListener; public abstract class AbstractState @@ -66,11 +65,8 @@ public abstract class AbstractState public final AbstractState reactOnAnswer(final Player sender, final String answer) { final String trimmedAnswer = answer.trim(); - if (trimmedAnswer.equalsIgnoreCase("quit") - || trimmedAnswer.equalsIgnoreCase("bye") - || trimmedAnswer.equalsIgnoreCase("abort") - || trimmedAnswer.equalsIgnoreCase("cancel") - || trimmedAnswer.equalsIgnoreCase("exit")) + if (trimmedAnswer.equalsIgnoreCase("quit") || trimmedAnswer.equalsIgnoreCase("bye") || trimmedAnswer.equalsIgnoreCase( + "abort") || trimmedAnswer.equalsIgnoreCase("cancel") || trimmedAnswer.equalsIgnoreCase("exit")) { abort(); return null; diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java index 3ee7d0ee2..e84046224 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java @@ -22,22 +22,18 @@ public abstract class AbstractYesNoState extends AbstractState @Override public AbstractState getNextState() { - return answer - ? (yesState == null ? null : getState(yesState)) - : (noState == null ? null : getState(noState)); + return answer ? (yesState == null ? null : getState(yesState)) : (noState == null ? null : getState(noState)); } @Override public boolean reactOnAnswer(final String answer) { - if (answer.equalsIgnoreCase("yes") - || answer.equalsIgnoreCase("y")) + if (answer.equalsIgnoreCase("yes") || answer.equalsIgnoreCase("y")) { this.answer = true; return true; } - if (answer.equalsIgnoreCase("no") - || answer.equalsIgnoreCase("n")) + if (answer.equalsIgnoreCase("no") || answer.equalsIgnoreCase("n")) { this.answer = false; return true; diff --git a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java index 42fdc8ca2..033106041 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java +++ b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java @@ -1,9 +1,9 @@ package net.ess3.update.states; -import net.ess3.update.UpdateCheck; -import net.ess3.update.VersionInfo; import java.util.List; import org.bukkit.entity.Player; +import net.ess3.update.UpdateCheck; +import net.ess3.update.VersionInfo; public class Changelog extends AbstractState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java index a62735f5e..9fa9d763c 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java @@ -1,10 +1,10 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; public class EssentialsChat extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java index cd1865b42..7ac34fa22 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java @@ -1,11 +1,10 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; -import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; public class EssentialsGeoIP extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java index bb3a841a7..e2c33cd9b 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java @@ -1,11 +1,10 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; -import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; public class EssentialsProtect extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java index b66ca4c58..76bfec87e 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java @@ -1,13 +1,11 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.UpdateCheck; import java.util.Iterator; - -import net.ess3.update.UpdateCheck; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.UpdateCheck; public class StateMachine extends AbstractWorkListener implements Runnable @@ -16,6 +14,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable { ABORT, WAIT, DONE, NONE } + + private final transient StateMap states = new StateMap(); private transient AbstractState current; private transient Player player; @@ -84,6 +84,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable } return result; } + private transient Iterator<AbstractState> iterator; public void startWork() @@ -97,7 +98,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable { if (!iterator.hasNext()) { - Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() @@ -120,7 +122,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable public void onWorkAbort(final String message) { finish(); - Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() @@ -136,7 +139,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable @Override public void onWorkDone(final String message) { - Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() diff --git a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java index c7bd5127a..4a4b9e862 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java +++ b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java @@ -1,8 +1,7 @@ package net.ess3.update.states; -import net.ess3.update.UpdateCheck; -import net.ess3.update.UpdateCheck; import org.bukkit.entity.Player; +import net.ess3.update.UpdateCheck; public class UpdateOrInstallation extends AbstractState diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java index 1f7742026..c6df0cae7 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java @@ -1,17 +1,13 @@ package net.ess3.update.tasks; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.GetFile; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.GetFile; -import net.ess3.update.ModuleInfo; -import net.ess3.update.VersionInfo; import java.io.File; import java.net.URL; import java.util.logging.Level; - -import net.ess3.update.VersionInfo; import org.bukkit.Bukkit; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.GetFile; +import net.ess3.update.ModuleInfo; +import net.ess3.update.VersionInfo; public class InstallModule implements Runnable, Task diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java index bc0d65b5e..2ff6da55c 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java @@ -1,8 +1,7 @@ package net.ess3.update.tasks; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; +import net.ess3.update.AbstractWorkListener; public class SelfUpdate extends AbstractWorkListener implements Task, Runnable @@ -25,7 +24,8 @@ public class SelfUpdate extends AbstractWorkListener implements Task, Runnable public void onWorkDone(final String message) { listener.onWorkDone(message); - Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() @@ -44,7 +44,8 @@ public class SelfUpdate extends AbstractWorkListener implements Task, Runnable @Override public void run() { - Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleAsyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() diff --git a/EssentialsUpdate/test/net/ess3/update/VersionTest.java b/EssentialsUpdate/test/net/ess3/update/VersionTest.java index 1187eecd7..b0b47fd6c 100644 --- a/EssentialsUpdate/test/net/ess3/update/VersionTest.java +++ b/EssentialsUpdate/test/net/ess3/update/VersionTest.java @@ -1,9 +1,8 @@ package net.ess3.update; -import net.ess3.update.Version.Type; import java.util.TreeSet; import junit.framework.TestCase; -import net.ess3.update.Version; +import net.ess3.update.Version.Type; import org.junit.Test; diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml index 1d2a6fe0a..dc75b7470 100644 --- a/EssentialsXMPP/pom.xml +++ b/EssentialsXMPP/pom.xml @@ -1,50 +1,49 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <parent> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>EssentialsXMPP</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>Essentials</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>jivesoftware</groupId> - <artifactId>smack</artifactId> - <version>3.1.0</version> - </dependency> - </dependencies> + <artifactId>EssentialsXMPP</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Essentials</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>jivesoftware</groupId> + <artifactId>smack</artifactId> + <version>3.1.0</version> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <includes> - <include>jivesoftware:smack</include> - </includes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>jivesoftware:smack</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java index 68609207d..05106145e 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java @@ -1,9 +1,9 @@ package net.ess3.xmpp; +import org.bukkit.command.CommandSender; import net.ess3.Console; import net.ess3.commands.EssentialsCommand; import net.ess3.commands.NotEnoughArgumentsException; -import org.bukkit.command.CommandSender; public class Commandxmpp extends EssentialsCommand diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java index ca78962f6..0be64d91a 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java @@ -1,10 +1,10 @@ package net.ess3.xmpp; import java.util.List; -import net.ess3.commands.EssentialsCommand; -import net.ess3.commands.NotEnoughArgumentsException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.ess3.commands.EssentialsCommand; +import net.ess3.commands.NotEnoughArgumentsException; public class Commandxmppspy extends EssentialsCommand diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java index b8e7545e6..d7241d57b 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java @@ -1,20 +1,19 @@ package net.ess3.xmpp; +import static net.ess3.I18n._; import java.util.List; import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; -import static net.ess3.I18n._; -import net.ess3.api.ICommandHandler; -import net.ess3.api.IEssentials; -import net.ess3.api.IPlugin; -import net.ess3.api.IUser; -import net.ess3.commands.EssentialsCommandHandler; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import org.bukkit.command.TabExecutor; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.command.TabExecutor; +import net.ess3.api.IEssentials; +import net.ess3.api.IPlugin; +import net.ess3.api.IUser; +import net.ess3.commands.EssentialsCommandHandler; public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java index 647ff6ac3..c2cd8428d 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java @@ -1,12 +1,12 @@ package net.ess3.xmpp; -import net.ess3.api.IEssentials; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; +import net.ess3.api.IEssentials; class EssentialsXMPPPlayerListener implements Listener diff --git a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java index 789ccddc9..a464dc398 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java @@ -1,9 +1,9 @@ package net.ess3.xmpp; import java.util.List; -import net.ess3.api.IUser; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; +import net.ess3.api.IUser; public interface IEssentialsXMPP extends Plugin diff --git a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java index c80680445..56da0d7e7 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java @@ -5,8 +5,8 @@ import java.io.IOException; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import net.ess3.api.IReload; import org.bukkit.configuration.file.YamlConfiguration; +import net.ess3.api.IReload; public class UserManager implements IReload diff --git a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java index bf88aad8b..ac6dddff6 100644 --- a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java @@ -6,11 +6,11 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; import net.ess3.api.IReload; import net.ess3.api.IUser; import net.ess3.utils.FormatUtil; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; import org.jivesoftware.smack.*; import org.jivesoftware.smack.Roster.SubscriptionMode; import org.jivesoftware.smack.packet.Message; @@ -234,68 +234,70 @@ public final class XMPPManager extends Handler implements MessageListener, ChatM private void startLoggerThread() { - loggerThread = new Thread(new Runnable() - { - @Override - public void run() - { - final Set<LogRecord> copy = new HashSet<LogRecord>(); - final Set<String> failedUsers = new HashSet<String>(); - while (threadrunning) + loggerThread = new Thread( + new Runnable() { - synchronized (logrecords) - { - if (!logrecords.isEmpty()) - { - copy.addAll(logrecords); - logrecords.clear(); - } - } - if (!copy.isEmpty()) + @Override + public void run() { - for (String user : logUsers) + final Set<LogRecord> copy = new HashSet<LogRecord>(); + final Set<String> failedUsers = new HashSet<String>(); + while (threadrunning) { - try + synchronized (logrecords) + { + if (!logrecords.isEmpty()) + { + copy.addAll(logrecords); + logrecords.clear(); + } + } + if (!copy.isEmpty()) { - XMPPManager.this.startChat(user); - for (LogRecord logRecord : copy) + for (String user : logUsers) { - final String message = String.format("[" + logRecord.getLevel().getLocalizedName() + "] " + logRecord.getMessage(), logRecord.getParameters()); - if (!XMPPManager.this.sendMessage(user, message)) + try + { + XMPPManager.this.startChat(user); + for (LogRecord logRecord : copy) + { + final String message = String.format( + "[" + logRecord.getLevel().getLocalizedName() + "] " + logRecord.getMessage(), logRecord.getParameters()); + if (!XMPPManager.this.sendMessage(user, message)) + { + failedUsers.add(user); + break; + } + + } + } + catch (XMPPException ex) { failedUsers.add(user); - break; + LOGGER.removeHandler(XMPPManager.this); + LOGGER.log(Level.SEVERE, "Failed to deliver log message! Disabling logging to XMPP.", ex); } - } + logUsers.removeAll(failedUsers); + if (logUsers.isEmpty()) + { + LOGGER.removeHandler(XMPPManager.this); + threadrunning = false; + } + copy.clear(); } - catch (XMPPException ex) + try { - failedUsers.add(user); - LOGGER.removeHandler(XMPPManager.this); - LOGGER.log(Level.SEVERE, "Failed to deliver log message! Disabling logging to XMPP.", ex); + Thread.sleep(2000); + } + catch (InterruptedException ex) + { + threadrunning = false; } } - logUsers.removeAll(failedUsers); - if (logUsers.isEmpty()) - { - LOGGER.removeHandler(XMPPManager.this); - threadrunning = false; - } - copy.clear(); - } - try - { - Thread.sleep(2000); + LOGGER.removeHandler(XMPPManager.this); } - catch (InterruptedException ex) - { - threadrunning = false; - } - } - LOGGER.removeHandler(XMPPManager.this); - } - }); + }); loggerThread.start(); } diff --git a/packager.xml b/packager.xml index f5c2b161a..f7c3d0704 100644 --- a/packager.xml +++ b/packager.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project default="collect"> - <target name="collect"> - <mkdir dir="jars"/> - <copy todir="jars"> - <fileset dir="."> - <include name="**/Essentials/src/config.yml" /> - <include name="**/target/classes/messages*.properties" /> - <include name="**/target/classes/items.csv" /> - </fileset> - <flattenmapper/> - </copy> - </target> + <target name="collect"> + <mkdir dir="jars"/> + <copy todir="jars"> + <fileset dir="."> + <include name="**/Essentials/src/config.yml"/> + <include name="**/target/classes/messages*.properties"/> + <include name="**/target/classes/items.csv"/> + </fileset> + <flattenmapper/> + </copy> + </target> </project> @@ -1,119 +1,147 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>net.essentials3</groupId> - <artifactId>BuildAll</artifactId> - <version>3.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>BuildAll</name> - <url>http://tiny.cc/EssentialsWiki</url> + <groupId>net.essentials3</groupId> + <artifactId>BuildAll</artifactId> + <version>3.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>BuildAll</name> + <url>http://tiny.cc/EssentialsWiki</url> - <modules> - <module>Essentials</module> - <module>Essentials2Compat</module> - <module>EssentialsChat</module> - <module>EssentialsExtra</module> - <module>EssentialsGeoIP</module> - <module>EssentialsGroupBridge</module> - <module>EssentialsGroupManager</module> - <module>EssentialsProtect</module> - <module>EssentialsSigns</module> - <module>EssentialsUpdate</module> - <module>EssentialsXMPP</module> - <module>EssentialsAntiBuild</module> - </modules> + <modules> + <module>Essentials</module> + <module>Essentials2Compat</module> + <module>EssentialsChat</module> + <module>EssentialsExtra</module> + <module>EssentialsGeoIP</module> + <module>EssentialsGroupBridge</module> + <module>EssentialsGroupManager</module> + <module>EssentialsProtect</module> + <module>EssentialsSigns</module> + <module>EssentialsUpdate</module> + <module>EssentialsXMPP</module> + <module>EssentialsAntiBuild</module> + </modules> - <repositories> - <repository> - <id>essentials-repo</id> - <url>http://ess.ementalo.com/nexus/content/groups/public/</url> - </repository> - </repositories> + <repositories> + <repository> + <id>essentials-repo</id> + <url>http://ess.ementalo.com/nexus/content/groups/public/</url> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>org.bukkit</groupId> - <artifactId>bukkit</artifactId> - <version>${bukkit.version}</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.bukkit</groupId> + <artifactId>bukkit</artifactId> + <version>${bukkit.version}</version> + </dependency> + </dependencies> - <build> - <finalName>${project.name}</finalName> - <sourceDirectory>${project.basedir}/src</sourceDirectory> - <testSourceDirectory>${project.basedir}/test</testSourceDirectory> - <resources> - <resource> - <directory>${project.basedir}/src</directory> - <filtering>true</filtering> - <includes> - <include>*.*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <outputDirectory>../jars</outputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <build> + <finalName>${project.name}</finalName> + <sourceDirectory>${project.basedir}/src</sourceDirectory> + <testSourceDirectory>${project.basedir}/test</testSourceDirectory> + <resources> + <resource> + <directory>${project.basedir}/src</directory> + <filtering>true</filtering> + <includes> + <include>*.*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <outputDirectory>../jars</outputDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <bukkit.version>1.4.5-R0.1-SNAPSHOT</bukkit.version> - <build.number>Unknown</build.number> - <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> - <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> - <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab> - <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>2</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size> - <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>120</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width> - <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap> - <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader>0</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass>2</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>false</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder>*</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch>false</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups>false</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast>false</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab> - <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size> - </properties> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <bukkit.version>1.4.5-R0.1-SNAPSHOT</bukkit.version> + <build.number>Unknown</build.number> + <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> + <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> + <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab> + <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>2</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size> + <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>120</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width> + <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap> + <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader>0 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass>2 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder>* + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>4 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine>true + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast>false + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>4 + </org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab> + <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size> + </properties> </project> |