From f51efcfab2c9bf9f479d35b9ff28b28045e4097a Mon Sep 17 00:00:00 2001 From: kashike Date: Sat, 27 Jun 2015 09:37:10 -0700 Subject: [PATCH] Quick cleanup --- .../com/drtshock/playervaults/PlayerVaults.java | 8 ++++---- .../playervaults/commands/ConvertCommand.java | 4 ++-- .../drtshock/playervaults/commands/SignSetInfo.java | 2 +- .../drtshock/playervaults/converters/Converter.java | 6 +++--- .../drtshock/playervaults/listeners/Listeners.java | 4 ++-- .../listeners/VaultPreloadListener.java | 2 +- .../com/drtshock/playervaults/tasks/Cleanup.java | 2 +- .../java/com/drtshock/playervaults/util/Lang.java | 4 ++-- .../com/drtshock/playervaults/util/Updater.java | 2 +- .../vaultmanagement/EconomyOperations.java | 4 ++-- .../vaultmanagement/UUIDVaultManager.java | 13 ++++++------- .../vaultmanagement/VaultOperations.java | 2 +- .../playervaults/vaultmanagement/VaultViewInfo.java | 4 ++-- 13 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java index f208409..0ac6a4c 100644 --- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java +++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java @@ -49,11 +49,11 @@ public class PlayerVaults extends JavaPlugin { private static PlayerVaults instance; private boolean update = false; private String newVersion = ""; - private HashMap setSign = new HashMap<>(); + private final HashMap setSign = new HashMap<>(); // Player name - VaultViewInfo - private HashMap inVault = new HashMap<>(); + private final HashMap inVault = new HashMap<>(); // VaultViewInfo - Inventory - private HashMap openInventories = new HashMap<>(); + private final HashMap openInventories = new HashMap<>(); private Economy economy = null; private boolean useVault = false; private YamlConfiguration signs; @@ -62,7 +62,7 @@ public class PlayerVaults extends JavaPlugin { private boolean backupsEnabled; private File backupsFolder = null; private File vaultData; - private Set blockedMats = new HashSet<>(); + private final Set blockedMats = new HashSet<>(); @Override public void onEnable() { diff --git a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java index 664d4e6..667a7a0 100644 --- a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java +++ b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java @@ -17,8 +17,8 @@ import java.util.*; public class ConvertCommand implements CommandExecutor { - private List converters = new ArrayList<>(); - private ServiceProvider uuidProvider; + private final List converters = new ArrayList<>(); + private final ServiceProvider uuidProvider; public ConvertCommand() { converters.add(new BackpackConverter()); diff --git a/src/main/java/com/drtshock/playervaults/commands/SignSetInfo.java b/src/main/java/com/drtshock/playervaults/commands/SignSetInfo.java index 9a2ff53..dcfdea9 100644 --- a/src/main/java/com/drtshock/playervaults/commands/SignSetInfo.java +++ b/src/main/java/com/drtshock/playervaults/commands/SignSetInfo.java @@ -23,7 +23,7 @@ package com.drtshock.playervaults.commands; public class SignSetInfo { private String owner; - private int number; + private final int number; private boolean self = false; /** diff --git a/src/main/java/com/drtshock/playervaults/converters/Converter.java b/src/main/java/com/drtshock/playervaults/converters/Converter.java index 402cedb..6f03fa6 100644 --- a/src/main/java/com/drtshock/playervaults/converters/Converter.java +++ b/src/main/java/com/drtshock/playervaults/converters/Converter.java @@ -18,7 +18,7 @@ public interface Converter { * * @return the number of vaults converted. Returns 0 on none converted or -1 if no vaults were converted. */ - public int run(CommandSender initiator, ServiceProvider uuidProvider); + int run(CommandSender initiator, ServiceProvider uuidProvider); /** * Determines if this converter is applicable for converting to PlayerVaults. This may check for the existance of a @@ -26,13 +26,13 @@ public interface Converter { * * @return true if this converter can convert, false otherwise */ - public boolean canConvert(); + boolean canConvert(); /** * Gets the name of this converter * * @return the converter name */ - public String getName(); + String getName(); } diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index 0bafa21..06dc288 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -44,8 +44,8 @@ import java.io.IOException; public class Listeners implements Listener { - public PlayerVaults plugin; - UUIDVaultManager vm = UUIDVaultManager.getInstance(); + public final PlayerVaults plugin; + final UUIDVaultManager vm = UUIDVaultManager.getInstance(); public Listeners(PlayerVaults playerVaults) { this.plugin = playerVaults; diff --git a/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java b/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java index 8793ee0..5d670de 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java +++ b/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java @@ -12,7 +12,7 @@ import org.bukkit.scheduler.BukkitRunnable; import java.util.UUID; public class VaultPreloadListener implements Listener { - UUIDVaultManager vm = UUIDVaultManager.getInstance(); + final UUIDVaultManager vm = UUIDVaultManager.getInstance(); @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(PlayerJoinEvent event) { diff --git a/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java b/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java index 0a45165..822e8a2 100644 --- a/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java +++ b/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java @@ -6,7 +6,7 @@ import java.io.File; public class Cleanup implements Runnable { - private long diff; + private final long diff; public Cleanup(int diff) { this.diff = diff * 86400; diff --git a/src/main/java/com/drtshock/playervaults/util/Lang.java b/src/main/java/com/drtshock/playervaults/util/Lang.java index 0209558..1bdd67f 100644 --- a/src/main/java/com/drtshock/playervaults/util/Lang.java +++ b/src/main/java/com/drtshock/playervaults/util/Lang.java @@ -53,8 +53,8 @@ public enum Lang { HELP("help", "/pv "), BLOCKED_ITEM("blocked-item", "&6%m &cis blocked from vaults"); - private String path; - private String def; + private final String path; + private final String def; private static YamlConfiguration LANG; /** diff --git a/src/main/java/com/drtshock/playervaults/util/Updater.java b/src/main/java/com/drtshock/playervaults/util/Updater.java index 6d5beb6..2adc870 100644 --- a/src/main/java/com/drtshock/playervaults/util/Updater.java +++ b/src/main/java/com/drtshock/playervaults/util/Updater.java @@ -406,7 +406,7 @@ public class Updater { String version = plugin.getDescription().getVersion(); if (title.split("v").length == 2) { String remoteVersion = title.split("v")[1].split(" ")[0]; // Get the newest file's version number - int remVer = -1, curVer = 0; + int remVer, curVer = 0; try { remVer = calVer(remoteVersion); curVer = calVer(version); diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java index eee7557..b810328 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java @@ -30,8 +30,8 @@ import java.io.File; * A class that handles all economy operations. */ public class EconomyOperations { - private static PlayerVaults PLUGIN = PlayerVaults.getInstance(); - private static FileConfiguration BUKKIT_CONFIG = PLUGIN.getConfig(); + private static final PlayerVaults PLUGIN = PlayerVaults.getInstance(); + private static final FileConfiguration BUKKIT_CONFIG = PLUGIN.getConfig(); /** * Have a player pay to open a vault. diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java index 2eeb7f0..91b5372 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java @@ -5,7 +5,6 @@ import com.drtshock.playervaults.util.Lang; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; -import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; @@ -228,10 +227,12 @@ public class UUIDVaultManager { }.runTaskAsynchronously(PlayerVaults.getInstance()); OfflinePlayer player = Bukkit.getPlayer(holder); - if (player != null && sender.getName().equalsIgnoreCase(player.getName())) { - sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT.toString().replace("%v", String.valueOf(number))); - } else { - sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT.toString().replace("%v", String.valueOf(number)).replaceAll("%p", player.getName())); + if (player != null) { + if (sender.getName().equalsIgnoreCase(player.getName())) { + sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT.toString().replace("%v", String.valueOf(number))); + } else { + sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT.toString().replace("%v", String.valueOf(number)).replaceAll("%p", player.getName())); + } } PlayerVaults.getInstance().getOpenInventories().remove(new VaultViewInfo(holder.toString(), number).toString()); @@ -282,8 +283,6 @@ public class UUIDVaultManager { * * @param holder The vault holder of whose file to save. * @param yaml The config to save. - * - * @throws IOException Uh oh! */ public void saveFile(final UUID holder, final YamlConfiguration yaml) { if (cachedVaultFiles.containsKey(holder)) { diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java index cc6bf33..beed1bf 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class VaultOperations { - private static AtomicBoolean LOCKED = new AtomicBoolean(false); + private static final AtomicBoolean LOCKED = new AtomicBoolean(false); /** * Gets whether or not player vaults are locked diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultViewInfo.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultViewInfo.java index f6c1476..8dcbb82 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultViewInfo.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultViewInfo.java @@ -26,8 +26,8 @@ import java.util.UUID; public class VaultViewInfo { UUID uuid; - String holder; - int number; + final String holder; + final int number; /** * Make a VaultViewObject