cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework operations to allow for owners of vaults to be Strings, which is more friendly to third party or group vaults. Fixes compatibility with FactionsUUID.

Browse Source
This commit is contained in:
Trent Hensler
2018-12-16 22:13:13 -08:00
parent 55cbea8582
commit 181bb89ac0
17 changed files with 121 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+41 -36
View File
@@ -31,7 +31,7 @@ public class VaultManager {
}
private final File directory = PlayerVaults.getInstance().getVaultData();
private final Map<UUID, YamlConfiguration> cachedVaultFiles = new ConcurrentHashMap<>();
private final Map<String, YamlConfiguration> cachedVaultFiles = new ConcurrentHashMap<>();
/**
* Saves the inventory to the specified player and vault number.
@@ -40,8 +40,8 @@ public class VaultManager {
* @param target The player of whose file to save to.
* @param number The vault number.
*/
public void saveVault(Inventory inventory, UUID target, int number) {
YamlConfiguration yaml = getPlayerVaultFile(target);
public void saveVault(Inventory inventory, String target, int number) {
YamlConfiguration yaml = getPlayerVaultFile(target, true);
int size = VaultOperations.getMaxVaultSize(target);
String serialized = Base64Serialization.toBase64(inventory, size);
yaml.set(String.format(VAULTKEY, number), serialized);
@@ -60,13 +60,13 @@ public class VaultManager {
}
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", player.getName());
VaultViewInfo info = new VaultViewInfo(player.getUniqueId(), number);
VaultViewInfo info = new VaultViewInfo(player.getUniqueId().toString(), number);
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
return PlayerVaults.getInstance().getOpenInventories().get(info.toString());
}
Inventory inv;
YamlConfiguration playerFile = getPlayerVaultFile(player.getUniqueId());
YamlConfiguration playerFile = getPlayerVaultFile(player.getUniqueId().toString(), true);
VaultHolder vaultHolder = new VaultHolder(number);
if (playerFile.getString(String.format(VAULTKEY, number)) == null) {
inv = Bukkit.createInventory(vaultHolder, size, title);
@@ -86,28 +86,32 @@ public class VaultManager {
/**
* Load the player's vault and return it.
*
* @param holder The holder of the vault.
* @param name The holder of the vault.
* @param number The vault number.
*/
public Inventory loadOtherVault(UUID holder, int number, int size) {
public Inventory loadOtherVault(String name, int number, int size) {
if (size % 9 != 0) {
size = 54;
}
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(holder);
String name = "null";
if (offlinePlayer != null) {
name = offlinePlayer.getName();
String holder = name;
try {
UUID uuid = UUID.fromString(name);
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid);
holder = offlinePlayer.getUniqueId().toString();
} catch (Exception e) {
// Not a player
}
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", name);
VaultViewInfo info = new VaultViewInfo(holder, number);
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", holder);
VaultViewInfo info = new VaultViewInfo(name, number);
Inventory inv;
VaultHolder vaultHolder = new VaultHolder(number);
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
YamlConfiguration playerFile = getPlayerVaultFile(holder, true);
Inventory i = getInventory(vaultHolder, playerFile, size, number, title);
if (i == null) {
return null;
@@ -159,8 +163,8 @@ public class VaultManager {
* @param number The vault number.
* @return The inventory of the specified holder and vault number. Can be null.
*/
public Inventory getVault(UUID holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
public Inventory getVault(String holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder, true);
String serialized = playerFile.getString(String.format(VAULTKEY, number));
return Base64Serialization.fromBase64(serialized);
}
@@ -172,13 +176,13 @@ public class VaultManager {
* @param number vault number.
* @return true if the vault file and vault number exist in that file, otherwise false.
*/
public boolean vaultExists(UUID holder, int number) {
public boolean vaultExists(String holder, int number) {
File file = new File(directory, holder + ".yml");
if (!file.exists()) {
return false;
}
return getPlayerVaultFile(holder).contains(String.format(VAULTKEY, number));
return getPlayerVaultFile(holder, true).contains(String.format(VAULTKEY, number));
}
/**
@@ -187,9 +191,9 @@ public class VaultManager {
* @param holder
* @return a set of Integers, which are player's vaults' numbers (fuck grammar).
*/
public Set<Integer> getVaultNumbers(UUID holder) {
public Set<Integer> getVaultNumbers(String holder) {
Set<Integer> vaults = new HashSet<>();
YamlConfiguration file = getPlayerVaultFile(holder);
YamlConfiguration file = getPlayerVaultFile(holder, true);
if (file == null) {
return vaults;
}
@@ -208,7 +212,7 @@ public class VaultManager {
return vaults;
}
public void deleteAllVaults(UUID holder) {
public void deleteAllVaults(String holder) {
removeCachedPlayerVaultFile(holder);
deletePlayerVaultFile(holder);
}
@@ -221,7 +225,7 @@ public class VaultManager {
* @param number The vault number.
* @throws IOException Uh oh!
*/
public void deleteVault(CommandSender sender, final UUID holder, final int number) {
public void deleteVault(CommandSender sender, final String holder, final int number) {
new BukkitRunnable() {
@Override
public void run() {
@@ -253,11 +257,12 @@ public class VaultManager {
}
}
PlayerVaults.getInstance().getOpenInventories().remove(new VaultViewInfo(holder, number).toString());
String vaultName = sender instanceof Player ? ((Player)sender).getUniqueId().toString() : holder;
PlayerVaults.getInstance().getOpenInventories().remove(new VaultViewInfo(vaultName, number).toString());
}
// Should only be run asynchronously
public void cachePlayerVaultFile(UUID holder) {
public void cachePlayerVaultFile(String holder) {
YamlConfiguration config = this.loadPlayerVaultFile(holder, false);
if (config != null) {
this.cachedVaultFiles.put(holder, config);
@@ -265,7 +270,7 @@ public class VaultManager {
}
}
public void removeCachedPlayerVaultFile(UUID holder) {
public void removeCachedPlayerVaultFile(String holder) {
cachedVaultFiles.remove(holder);
}
@@ -275,14 +280,14 @@ public class VaultManager {
* @param holder The vault holder.
* @return The holder's vault config file.
*/
public YamlConfiguration getPlayerVaultFile(UUID holder) {
public YamlConfiguration getPlayerVaultFile(String holder, boolean createIfNotFound) {
if (cachedVaultFiles.containsKey(holder)) {
return cachedVaultFiles.get(holder);
}
return loadPlayerVaultFile(holder);
return loadPlayerVaultFile(holder, createIfNotFound);
}
public YamlConfiguration loadPlayerVaultFile(UUID holder) {
public YamlConfiguration loadPlayerVaultFile(String holder) {
return this.loadPlayerVaultFile(holder, true);
}
@@ -292,19 +297,19 @@ public class VaultManager {
* @param holder UUID of the holder.
* @return true if successful, otherwise false.
*/
public void deletePlayerVaultFile(UUID holder) {
File file = new File(this.directory, holder.toString() + ".yml");
public void deletePlayerVaultFile(String holder) {
File file = new File(this.directory, holder + ".yml");
if (file.exists()) {
file.delete();
}
}
public YamlConfiguration loadPlayerVaultFile(UUID uniqueId, boolean createIfNotFound) {
public YamlConfiguration loadPlayerVaultFile(String uniqueId, boolean createIfNotFound) {
if (!this.directory.exists()) {
this.directory.mkdir();
}
File file = new File(this.directory, uniqueId.toString() + ".yml");
File file = new File(this.directory, uniqueId + ".yml");
if (!file.exists()) {
if (createIfNotFound) {
try {
@@ -320,21 +325,21 @@ public class VaultManager {
return YamlConfiguration.loadConfiguration(file);
}
public void saveFileSync(final UUID holder, final YamlConfiguration yaml) {
public void saveFileSync(final String holder, final YamlConfiguration yaml) {
if (cachedVaultFiles.containsKey(holder)) {
cachedVaultFiles.put(holder, yaml);
}
final boolean backups = PlayerVaults.getInstance().isBackupsEnabled();
final File backupsFolder = PlayerVaults.getInstance().getBackupsFolder();
final File file = new File(directory, holder.toString() + ".yml");
final File file = new File(directory, holder + ".yml");
if (file.exists() && backups) {
file.renameTo(new File(backupsFolder, holder.toString() + ".yml"));
file.renameTo(new File(backupsFolder, holder + ".yml"));
}
try {
yaml.save(file);
} catch (IOException e) {
PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Failed to save vault file for: " + holder.toString(), e);
PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Failed to save vault file for: " + holder, e);
}
}