From f1c30c6a37fbcde0c3b277e28ec82f3858bcff13 Mon Sep 17 00:00:00 2001 From: drtshock Date: Mon, 27 Apr 2015 14:09:34 -0500 Subject: [PATCH] Some more cleanup and formatting. --- .../com/drtshock/playervaults/PlayerVaults.java | 16 +--------------- .../playervaults/listeners/Listeners.java | 13 +++++-------- .../vaultmanagement/Serialization.java | 1 - .../vaultmanagement/UUIDVaultManager.java | 4 ++-- .../vaultmanagement/VaultOperations.java | 2 +- 5 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java index e07209a..2f34a75 100644 --- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java +++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java @@ -42,20 +42,16 @@ public class PlayerVaults extends JavaPlugin { private static PlayerVaults instance; private boolean update = false; private String newVersion = ""; - private String link = ""; private HashMap setSign = new HashMap<>(); // Player name - VaultViewInfo private HashMap inVault = new HashMap<>(); // VaultViewInfo - Inventory private HashMap openInventories = new HashMap<>(); private Economy economy = null; - private boolean dropOnDeath = false; private boolean useVault = false; - private int inventoriesToDrop = 0; private YamlConfiguration signs; private File signsFile; private boolean saveQueued; - private String name = ""; private File configFile; private boolean backupsEnabled; private File backupsFolder = null; @@ -81,11 +77,6 @@ public class PlayerVaults extends JavaPlugin { getCommand("pvconvert").setExecutor(new ConvertCommand()); useVault = setupEconomy(); - if (getConfig().getBoolean("drop-on-death.enabled")) { - dropOnDeath = true; - inventoriesToDrop = getConfig().getInt("drop-on-death.inventories"); - } - if (getConfig().getBoolean("cleanup.enable", false)) { getServer().getScheduler().runTaskAsynchronously(this, new Cleanup(getConfig().getInt("cleanup.lastEdit", 30))); } @@ -134,7 +125,7 @@ public class PlayerVaults extends JavaPlugin { @Override public void run() { update = updater.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE; - name = updater.getLatestName(); + newVersion = updater.getLatestName(); if (updater.getResult() == Updater.UpdateResult.SUCCESS) { getLogger().log(Level.INFO, "Successfully updated PlayerVaults to version {0} for next restart!", updater.getLatestName()); } else if (updater.getResult() == Updater.UpdateResult.NO_UPDATE) { @@ -156,7 +147,6 @@ public class PlayerVaults extends JavaPlugin { } economy = provider.getProvider(); - return economy != null; } @@ -328,10 +318,6 @@ public class PlayerVaults extends JavaPlugin { return this.newVersion; } - public String getLink() { - return this.link; - } - public Economy getEconomy() { return this.economy; } diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index 8be198b..8d9dfa9 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -81,8 +81,8 @@ public class Listeners implements Listener { public void onJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); if (PlayerVaults.getInstance().needsUpdate() && (player.isOp() || player.hasPermission("playervaults.notify"))) { - player.sendMessage(ChatColor.GREEN + "Version " + PlayerVaults.getInstance().getNewVersion() + " of PlayerVaults is available for download!"); - player.sendMessage(ChatColor.GREEN + PlayerVaults.getInstance().getLink() + " to view the changelog and download!"); + player.sendMessage(ChatColor.GREEN + "Version " + ChatColor.RED + PlayerVaults.getInstance().getNewVersion() + ChatColor.GREEN + " of PlayerVaults is available for download!"); + player.sendMessage(ChatColor.GOLD + "http://dev.bukkit.org/pancakes/playervaults" + ChatColor.GREEN + " to view the changelog and download!"); } } @@ -114,10 +114,7 @@ public class Listeners implements Listener { if (PlayerVaults.getInstance().getSetSign().containsKey(player.getName())) { int i = PlayerVaults.getInstance().getSetSign().get(player.getName()).getChest(); boolean self = PlayerVaults.getInstance().getSetSign().get(player.getName()).isSelf(); - String owner = null; - if (!self) { - owner = PlayerVaults.getInstance().getSetSign().get(player.getName()).getOwner(); - } + String owner = self ? null : PlayerVaults.getInstance().getSetSign().get(player.getName()).getOwner(); PlayerVaults.getInstance().getSetSign().remove(player.getName()); event.setCancelled(true); if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { @@ -164,7 +161,7 @@ public class Listeners implements Listener { } if (self) { // We already checked that they can use signs, now lets check if they have this many vaults. - if(VaultOperations.checkPerms(player, num)) { + if (VaultOperations.checkPerms(player, num)) { Inventory inv = UUIDVaultManager.getInstance().loadOwnVault(player, num, VaultOperations.getMaxVaultSize(player)); player.openInventory(inv); } else { @@ -173,7 +170,7 @@ public class Listeners implements Listener { } } else { Inventory inv = UUIDVaultManager.getInstance().loadOtherVault(offlinePlayer.getUniqueId(), num, VaultOperations.getMaxVaultSize(offlinePlayer)); - if(inv == null) { + if (inv == null) { player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString()); } else { player.openInventory(inv); diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java index 436ed01..3db3f2a 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java @@ -17,7 +17,6 @@ package com.drtshock.playervaults.vaultmanagement; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java index ed692f0..642cf30 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java @@ -87,7 +87,7 @@ public class UUIDVaultManager { } } else { Inventory i = getInventory(playerFile, size, number, title); - if(i == null) { + if (i == null) { return null; } else { inv = i; @@ -120,7 +120,7 @@ public class UUIDVaultManager { return null; } else { Inventory i = getInventory(playerFile, size, number, title); - if(i == null) { + if (i == null) { return null; } else { inv = i; diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java index 6bd9093..f763e66 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java @@ -172,7 +172,7 @@ public class VaultOperations { return false; } if (player.hasPermission("playervaults.admin")) { - if(!holder.hasPlayedBefore()) { + if (!holder.hasPlayedBefore()) { player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString()); return false; }