From 85cd71cb8a02f2b4b19832bd3cb167a3ce4b8b8e Mon Sep 17 00:00:00 2001 From: "main()" Date: Tue, 23 Oct 2012 16:47:21 +0200 Subject: [PATCH] Fixed high priority style warnings --- .../com/onarandombox/MultiverseCore/MultiverseCore.java | 7 +++++-- .../java/com/onarandombox/MultiverseCore/api/Core.java | 8 +------- .../onarandombox/MultiverseCore/api/MVWorldManager.java | 4 ++-- .../MultiverseCore/configuration/SubSpawnSettings.java | 7 +++---- .../MultiverseCore/listeners/MVPlayerListener.java | 2 +- .../com/onarandombox/MultiverseCore/utils/FileUtils.java | 6 +++--- .../MultiverseCore/utils/SimpleBlockSafety.java | 9 +++++---- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index 99d8fe18..376501f1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -147,7 +147,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen * @param teleportee The name of the player that was teleported. */ public static void addPlayerToTeleportQueue(String teleporter, String teleportee) { - Logging.finest( "Adding mapping '%s' => '%s' to teleport queue", teleporter, teleportee); + Logging.finest("Adding mapping '%s' => '%s' to teleport queue", teleporter, teleportee); teleportQueue.put(teleportee, teleporter); } @@ -251,6 +251,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen /** * {@inheritDoc} + * @deprecated Now using Vault. */ @Override @Deprecated @@ -349,7 +350,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen private boolean setupVaultEconomy() { if (Bukkit.getPluginManager().getPlugin("Vault") != null) { final RegisteredServiceProvider economyProvider - = getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class); + = getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class); if (economyProvider != null) { Logging.fine("Vault economy enabled."); vaultEco = economyProvider.getProvider(); @@ -1045,6 +1046,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen /** * {@inheritDoc} + * @deprecated Now using Vault. */ @Override @Deprecated @@ -1054,6 +1056,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen /** * {@inheritDoc} + * @deprecated Now using Vault. */ @Override @Deprecated diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/Core.java b/src/main/java/com/onarandombox/MultiverseCore/api/Core.java index f8c59283..8f6f5287 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/Core.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/Core.java @@ -11,13 +11,7 @@ import buscript.Buscript; import com.fernferret.allpay.AllPay; import com.fernferret.allpay.GenericBank; import com.onarandombox.MultiverseCore.destination.DestinationFactory; -import com.onarandombox.MultiverseCore.utils.AnchorManager; -import com.onarandombox.MultiverseCore.utils.MVPermissions; -import com.onarandombox.MultiverseCore.utils.MVPlayerSession; -import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety; -import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation; -import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter; -import com.onarandombox.MultiverseCore.utils.WorldManager; +import com.onarandombox.MultiverseCore.utils.*; import com.pneumaticraft.commandhandler.CommandHandler; import net.milkbowl.vault.economy.Economy; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java index 5905636c..9e3f46d5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java @@ -89,9 +89,9 @@ public interface MVWorldManager { * @return True if success, false if failure. */ boolean deleteWorld(String name, boolean removeConfig); - + /** - * + * * @param name The name of the world to remove * @param removeFromConfig If true(default), we'll remove the entries from the * config. If false, they'll stay and the world may come back. diff --git a/src/main/java/com/onarandombox/MultiverseCore/configuration/SubSpawnSettings.java b/src/main/java/com/onarandombox/MultiverseCore/configuration/SubSpawnSettings.java index 8d66d9e3..5f9b1d72 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/configuration/SubSpawnSettings.java +++ b/src/main/java/com/onarandombox/MultiverseCore/configuration/SubSpawnSettings.java @@ -59,15 +59,14 @@ public class SubSpawnSettings extends SerializationConfig { public List getExceptions() { return exceptions; } - + /** - * - * @param The new spawn rate + * @param rate The new spawn rate */ public void setSpawnRate(int rate) { this.spawnrate = rate; } - + /** * @return The spawn rate */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java index 632b5b36..516b796f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java @@ -324,7 +324,7 @@ public class MVPlayerListener implements Listener { Logging.finest("To World: %s", world); player.setGameMode(world.getGameMode()); } else { - Logging.fine("The gamemode was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'", player.getName(), player.getWorld().getName(), world.getName()); + Logging.fine("The gamemode was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'", player.getName(), player.getWorld().getName(), world.getName()); } } }, 1L); diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java b/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java index 476f4333..6452185a 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java @@ -44,10 +44,10 @@ public class FileUtils { return false; } } - + /** - * Used to delete the contents of a folder, without deleting the folder itself - * + * Used to delete the contents of a folder, without deleting the folder itself. + * * @param file The folder whose contents to delete. * @return true if the contents were successfully deleted */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleBlockSafety.java b/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleBlockSafety.java index fd667d68..46387b1c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleBlockSafety.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/SimpleBlockSafety.java @@ -27,10 +27,11 @@ import java.util.Set; */ public class SimpleBlockSafety implements BlockSafety { private final Core plugin; - private final static Set AROUND_BLOCK = new HashSet(){{ add(BlockFace.NORTH); add(BlockFace.NORTH_EAST); - add(BlockFace.EAST); add(BlockFace.SOUTH_EAST); - add(BlockFace.SOUTH); add(BlockFace.SOUTH_WEST); - add(BlockFace.WEST); add(BlockFace.NORTH_WEST); }}; + private static final Set AROUND_BLOCK = new HashSet() {{ + add(BlockFace.NORTH); add(BlockFace.NORTH_EAST); add(BlockFace.EAST); add(BlockFace.SOUTH_EAST); + add(BlockFace.SOUTH); add(BlockFace.SOUTH_WEST); add(BlockFace.WEST); add(BlockFace.NORTH_WEST); + } + }; public SimpleBlockSafety(Core plugin) { this.plugin = plugin;