From 101098ae7b494ef8a5f5241d73fd5693ae06f146 Mon Sep 17 00:00:00 2001 From: drtshock Date: Mon, 25 May 2015 21:06:22 -0500 Subject: [PATCH] Apparently needed to reformat. --- pom.xml | 2 +- .../drtshock/playervaults/PlayerVaults.java | 2 +- .../playervaults/listeners/Listeners.java | 5 +-- .../drtshock/playervaults/util/Updater.java | 3 +- .../vaultmanagement/CachedVaults.java | 37 +++++++++---------- .../vaultmanagement/CachedVaultsMap.java | 13 +++---- .../vaultmanagement/UUIDVaultManager.java | 28 +++++++------- 7 files changed, 43 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 8582574..d581bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.drtshock PlayerVaults - 3.5.4-SNAPSHOT + 3.5.5-SNAPSHOT PlayerVaults http://dev.bukkit.org/bukkit-plugins/playervaults/ diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java index 23c3f7c..62ce308 100644 --- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java +++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java @@ -120,7 +120,7 @@ public class PlayerVaults extends JavaPlugin { player.closeInventory(); } - + saveSignsFile(); } diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index 80f5110..dfa85f1 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -21,7 +21,6 @@ import com.drtshock.playervaults.util.Lang; import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager; import com.drtshock.playervaults.vaultmanagement.VaultOperations; import com.drtshock.playervaults.vaultmanagement.VaultViewInfo; - import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.Sign; @@ -57,7 +56,7 @@ public class Listeners implements Listener { Inventory inv = player.getOpenInventory().getTopInventory(); if (inv.getViewers().size() == 1) { VaultViewInfo info = PlayerVaults.getInstance().getInVault().get(player.getUniqueId().toString()); - if(Bukkit.isPrimaryThread() && player.getUniqueId().equals(info.getHolderUUID())){ + if (Bukkit.isPrimaryThread() && player.getUniqueId().equals(info.getHolderUUID())) { // Running in main thread, and it's the player's own vault. So we can just cache this until logout. UUIDVaultManager.getInstance().getCachedVaults().setCachedVault(info.getHolderUUID(), info.getNumber(), inv); } else { @@ -77,7 +76,7 @@ public class Listeners implements Listener { } } - public void flushVaultCache(Player player){ + public void flushVaultCache(Player player) { UUIDVaultManager.getInstance().getCachedVaults().flushVaultCacheToFile(player.getUniqueId()); } diff --git a/src/main/java/com/drtshock/playervaults/util/Updater.java b/src/main/java/com/drtshock/playervaults/util/Updater.java index d1dc9bd..6d5beb6 100644 --- a/src/main/java/com/drtshock/playervaults/util/Updater.java +++ b/src/main/java/com/drtshock/playervaults/util/Updater.java @@ -24,7 +24,8 @@ import java.util.zip.ZipFile; * AT ALL.
If you fail to include this option in your config, your plugin will be REJECTED when you * attempt to submit it to dev.bukkit.org. *

- * An example of a good configuration option would be something similar to 'auto-update: true' - if this value is set to + * An example of a good configuration option would be something similar to 'auto-update: true' - if this value is set + * to * false you may NOT run the auto-updater.
If you are unsure about these rules, please read the plugin submission * guidelines: http://goo.gl/8iU5l * diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaults.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaults.java index 93919f8..70039b6 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaults.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaults.java @@ -1,47 +1,46 @@ package com.drtshock.playervaults.vaultmanagement; +import org.bukkit.inventory.Inventory; + import java.io.IOException; import java.util.HashMap; import java.util.UUID; -import org.bukkit.inventory.Inventory; - -@SuppressWarnings("serial") -public class CachedVaults extends HashMap { - public void setCachedVault(UUID playerUUID, int id, Inventory inventory){ +@SuppressWarnings("serial") public class CachedVaults extends HashMap { + public void setCachedVault(UUID playerUUID, int id, Inventory inventory) { CachedVaultsMap vaultCacheMap = this.containsKey(playerUUID) ? this.get(playerUUID) : new CachedVaultsMap(); vaultCacheMap.setCachedVault(id, inventory); this.put(playerUUID, vaultCacheMap); } - - public Inventory getCachedVault(UUID playerUUID, int id){ + + public Inventory getCachedVault(UUID playerUUID, int id) { return this.containsKey(playerUUID) ? this.get(playerUUID).getCachedVault(id) : null; } - - public boolean hasVaultCached(UUID playerUUID, int id){ + + public boolean hasVaultCached(UUID playerUUID, int id) { return this.containsKey(playerUUID) && this.get(playerUUID).getCachedVault(id) != null; } - - public void clearVaultCache(UUID playerUUID){ - if(this.containsKey(playerUUID)){ + + public void clearVaultCache(UUID playerUUID) { + if (this.containsKey(playerUUID)) { this.get(playerUUID).clear(); } } - - public void deleteVaultCache(UUID playerUUID){ + + public void deleteVaultCache(UUID playerUUID) { this.remove(playerUUID); } - - public void flushVaultCacheToFile(UUID playerUUID){ - if(this.containsKey(playerUUID)){ - for(java.util.Map.Entry data : this.get(playerUUID).entrySet()){ + + public void flushVaultCacheToFile(UUID playerUUID) { + if (this.containsKey(playerUUID)) { + for (java.util.Map.Entry data : this.get(playerUUID).entrySet()) { try { UUIDVaultManager.getInstance().saveVault(data.getValue(), playerUUID, data.getKey()); } catch (IOException e) { e.printStackTrace(); } } - + this.deleteVaultCache(playerUUID); } } diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaultsMap.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaultsMap.java index 16c77b4..5b1828a 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaultsMap.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/CachedVaultsMap.java @@ -1,16 +1,15 @@ package com.drtshock.playervaults.vaultmanagement; -import java.util.HashMap; - import org.bukkit.inventory.Inventory; -@SuppressWarnings("serial") -public class CachedVaultsMap extends HashMap { - public void setCachedVault(int id, Inventory inventory){ +import java.util.HashMap; + +@SuppressWarnings("serial") public class CachedVaultsMap extends HashMap { + public void setCachedVault(int id, Inventory inventory) { this.put(id, inventory); } - - public Inventory getCachedVault(int id){ + + public Inventory getCachedVault(int id) { return this.containsKey(id) ? this.get(id) : null; } } diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java index 6112fe8..73d25af 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java @@ -1,12 +1,7 @@ package com.drtshock.playervaults.vaultmanagement; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; - +import com.drtshock.playervaults.PlayerVaults; +import com.drtshock.playervaults.util.Lang; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; @@ -15,8 +10,11 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; -import com.drtshock.playervaults.PlayerVaults; -import com.drtshock.playervaults.util.Lang; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; /** * Class to handle vault operations with new UUIDs. @@ -33,7 +31,7 @@ public class UUIDVaultManager { private final File directory = PlayerVaults.getInstance().getVaultData(); - public CachedVaults getCachedVaults(){ + public CachedVaults getCachedVaults() { return cachedVaults; } @@ -73,7 +71,7 @@ public class UUIDVaultManager { * @param number The vault number. */ public Inventory loadOwnVault(Player player, int number, int size) { - if(cachedVaults.hasVaultCached(player.getUniqueId(), number)){ + if (cachedVaults.hasVaultCached(player.getUniqueId(), number)) { return cachedVaults.getCachedVault(player.getUniqueId(), number); } @@ -119,7 +117,7 @@ public class UUIDVaultManager { * @param number The vault number. */ public Inventory loadOtherVault(UUID holder, int number, int size) { - if(cachedVaults.hasVaultCached(holder, number)){ + if (cachedVaults.hasVaultCached(holder, number)) { return cachedVaults.getCachedVault(holder, number); } @@ -145,7 +143,7 @@ public class UUIDVaultManager { } PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv); } - + cachedVaults.setCachedVault(holder, number, inv); return inv; } @@ -212,11 +210,11 @@ public class UUIDVaultManager { * @throws IOException Uh oh! */ public void deleteVault(CommandSender sender, UUID holder, int number) throws IOException { - File file = new File(directory, holder.toString() + ".yml"); + File file = new File(directory, holder.toString() + ".yml"); if (!file.exists()) { return; } - + cachedVaults.clearVaultCache(holder); FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);