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

Handle UUIDs.

Browse Source
This commit is contained in:
drtshock
2014-03-12 21:02:21 -05:00
parent 1342a5584e
commit a6cf925a78
7 changed files with 351 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+9 -4
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.drtshock</groupId>
<artifactId>PlayerVaults</artifactId>
<version>3.4.5-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<name>PlayerVaults</name>
<url>http://dev.bukkit.org/server-mods/playervaults/</url>
@@ -29,8 +29,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
@@ -56,7 +56,12 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.5.2-R0.1</version>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
src/main/java/com/drtshock/playervaults/PlayerVaults.java
+3
View File
@@ -20,6 +20,7 @@ import com.drtshock.playervaults.commands.Commands;
import com.drtshock.playervaults.commands.SignSetInfo;
import com.drtshock.playervaults.listeners.Listeners;
import com.drtshock.playervaults.tasks.Cleanup;
import com.drtshock.playervaults.tasks.UUIDConversion;
import com.drtshock.playervaults.util.Lang;
import com.drtshock.playervaults.util.Metrics;
import com.drtshock.playervaults.util.Updater;
@@ -41,6 +42,7 @@ import java.util.logging.Logger;
public class PlayerVaults extends JavaPlugin {
// TODO: *reads down* really..? :c
public static PlayerVaults PLUGIN;
public static Logger LOG;
public static boolean UPDATE = false;
@@ -66,6 +68,7 @@ public class PlayerVaults extends JavaPlugin {
@Override
public void onEnable() {
getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUID first. Class checks if necessary.
loadLang();
LOG = getServer().getLogger();
getServer().getPluginManager().registerEvents(listener = new Listeners(this), this);
src/main/java/com/drtshock/playervaults/commands/Commands.java
+16 -4
View File
@@ -18,9 +18,12 @@ package com.drtshock.playervaults.commands;
import com.drtshock.playervaults.PlayerVaults;
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.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
@@ -40,7 +43,12 @@ public class Commands implements CommandExecutor {
if (VaultOperations.openOwnVault(p, args[0])) {
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(sender.getName(), Integer.parseInt(args[0])));
} else if (sender.hasPermission("playervaults.admin")) {
YamlConfiguration file = PlayerVaults.VM.getPlayerVaultFile(args[0]);
OfflinePlayer player = Bukkit.getOfflinePlayer(args[0]);
if(player == null) {
sender.sendMessage(Lang.TITLE.toString() + "Cannot find player " + args[0]);
break;
}
YamlConfiguration file = UUIDVaultManager.getInstance().getPlayerVaultFile(player.getUniqueId());
if (file == null) {
sender.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
} else {
@@ -56,10 +64,12 @@ public class Commands implements CommandExecutor {
}
break;
case 2:
if (VaultOperations.openOtherVault(p, args[0], args[1])) {
Player player = Bukkit.getPlayer(args[0]);
if (player == null) break;
if (VaultOperations.openOtherVault(p, player, args[1])) {
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(args[0], Integer.parseInt(args[1])));
} else {
// ????
sender.sendMessage(Lang.TITLE.toString() + "Failed to open vault.");
}
break;
default:
@@ -80,7 +90,9 @@ public class Commands implements CommandExecutor {
}
break;
case 2:
VaultOperations.deleteOtherVault(sender, args[0], args[1]);
Player player = Bukkit.getPlayer(args[0]);
if (player == null) break;
VaultOperations.deleteOtherVault(sender, player, args[1]);
break;
default:
sender.sendMessage(Lang.TITLE + "/pvdel <number>");
src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java
+49
View File
@@ -0,0 +1,49 @@
package com.drtshock.playervaults.tasks;
import com.drtshock.playervaults.PlayerVaults;
import net.minecraft.util.org.apache.commons.io.FileUtils;
import net.minecraft.util.org.apache.commons.io.FilenameUtils;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.scheduler.BukkitRunnable;
import java.io.File;
import java.io.IOException;
import java.util.UUID;
import java.util.logging.Level;
/**
* Class to convert vaults by name to vaults by UUID.
*/
public final class UUIDConversion extends BukkitRunnable {
@Override
public void run() {
if (new File(PlayerVaults.PLUGIN.getDataFolder(), "uuidvaults").exists()) {
PlayerVaults.LOG.log(Level.INFO, "Files already converted to UUID.");
return;
}
PlayerVaults.LOG.log(Level.INFO, "********** Starting PlayerVault conversion to UUIDs **********");
PlayerVaults.LOG.log(Level.INFO, "This might take awhile.");
PlayerVaults.LOG.log(Level.INFO, "plugins/PlayerVaults/vaults will still be there as a backup but unused.");
for (File file : new File(PlayerVaults.PLUGIN.getDataFolder() + File.separator + "vaults").listFiles()) {
OfflinePlayer player = Bukkit.getOfflinePlayer(FilenameUtils.removeExtension(file.toString()).replace(".yml", ""));
if (player == null) {
PlayerVaults.LOG.log(Level.WARNING, "Unable to convert file because player never joined the server: " + file.getName());
break;
}
UUID uuid = player.getUniqueId();
File newFile = new File(PlayerVaults.PLUGIN.getDataFolder(), "uuidvaults" + uuid.toString() + ".yml");
file.mkdirs();
try {
FileUtils.copyFile(file, newFile);
PlayerVaults.LOG.log(Level.INFO, "Successfully converted vault file for " + player.getName());
} catch (IOException e) {
PlayerVaults.LOG.log(Level.SEVERE, "Couldn't convert vault file for " + player.getName());
}
}
PlayerVaults.LOG.log(Level.INFO, "********** Conversion done ;D **********");
}
}
src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
+255
View File
@@ -0,0 +1,255 @@
package com.drtshock.playervaults.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
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;
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.
*/
public class UUIDVaultManager {
private static UUIDVaultManager instance;
public UUIDVaultManager() {
instance = this;
}
private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "uuidvaults";
/**
* Saves the inventory to the specified player and vault number.
*
* @param inventory The inventory to be saved.
* @param player The player of whose file to save to.
* @param number The vault number.
*
* @throws java.io.IOException Uh oh!
*/
public void saveVault(Inventory inventory, UUID player, int number) throws IOException {
int size = inventory.getSize();
YamlConfiguration yaml = getPlayerVaultFile(player);
if (size == 54) {
yaml.set("vault" + number, null);
} else {
for (int x = 0; x < size; x++) {
yaml.set("vault" + number + "." + x, null);
}
}
List<String> list = Serialization.toString(inventory);
String[] ser = list.toArray(new String[list.size()]);
for (int x = 0; x < ser.length; x++) {
if (!ser[x].equalsIgnoreCase("null")) {
yaml.set("vault" + number + "." + x, ser[x]);
}
}
saveFile(player, yaml);
}
/**
* Load the player's vault and return it.
*
* @param player The holder of the vault.
* @param number The vault number.
*/
public Inventory loadOwnVault(Player player, int number, int size) {
if (size % 9 != 0) {
size = 54;
}
VaultViewInfo info = new VaultViewInfo(player.getUniqueId().toString(), number);
Inventory inv = null;
if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) {
inv = PlayerVaults.OPENINVENTORIES.get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(player.getUniqueId());
if (playerFile.getConfigurationSection("vault" + number) == null) {
VaultHolder vaultHolder = new VaultHolder(number);
if (EconomyOperations.payToCreate(player)) {
inv = Bukkit.createInventory(vaultHolder, size, Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", player.getName()));
vaultHolder.setInventory(inv);
} else {
player.sendMessage(Lang.TITLE.toString() + Lang.INSUFFICIENT_FUNDS.toString());
return null;
}
} else {
if (getInventory(playerFile, size, number) == null) {
return null;
} else {
inv = getInventory(playerFile, size, number);
}
}
PlayerVaults.OPENINVENTORIES.put(info.toString(), inv);
}
return inv;
}
/**
* Load the player's vault and return it.
*
* @param holder The holder of the vault.
* @param number The vault number.
*/
public Inventory loadOtherVault(UUID holder, int number, int size) {
if (size % 9 != 0) {
size = 54;
}
VaultViewInfo info = new VaultViewInfo(holder.toString(), number);
Inventory inv = null;
if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) {
inv = PlayerVaults.OPENINVENTORIES.get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
if (playerFile.getConfigurationSection("vault" + number) == null) {
return null;
} else {
if (getInventory(playerFile, size, number) == null) {
return null;
} else {
inv = getInventory(playerFile, size, number);
}
}
PlayerVaults.OPENINVENTORIES.put(info.toString(), inv);
}
return inv;
}
/**
* Get an inventory from file. Returns null if the inventory doesn't exist. SHOULD ONLY BE USED INTERNALLY
*
* @param playerFile the YamlConfiguration file.
* @param size the size of the vault.
* @param number the vault number.
*
* @return inventory if exists, otherwise null.
*/
private Inventory getInventory(YamlConfiguration playerFile, int size, int number) {
List<String> data = new ArrayList<>();
for (int x = 0; x < size; x++) {
String line = playerFile.getString("vault" + number + "." + x);
if (line != null) {
data.add(line);
} else {
data.add("null");
}
}
return Serialization.toInventory(data, number, size);
}
/**
* Gets an inventory without storing references to it. Used for dropping a players inventories on death.
*
* @param holder The holder of the vault.
* @param number The vault number.
*
* @return The inventory of the specified holder and vault number.
*/
public Inventory getVault(UUID holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
List<String> data = playerFile.getStringList("vault" + number);
OfflinePlayer player = Bukkit.getPlayer(holder);
if (player == null) return null;
if (data == null) {
VaultHolder vaultHolder = new VaultHolder(number);
Inventory inv = Bukkit.createInventory(vaultHolder, VaultOperations.getMaxVaultSize(player), Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", player.getName()));
vaultHolder.setInventory(inv);
return inv;
} else {
Inventory inv = Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(player));
return inv;
}
}
public boolean vaultExists(UUID holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
return playerFile.contains("vault" + number);
}
/**
* Deletes a players vault.
*
* @param sender The sender of whom to send messages to.
* @param holder The vault holder.
* @param number The vault number.
*
* @throws IOException Uh oh!
*/
public void deleteVault(CommandSender sender, UUID holder, int number) throws IOException {
String name = holder.toString();
File file = new File(directory + File.separator + name.toLowerCase() + ".yml");
if (!file.exists()) {
return;
}
FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
if (file.exists()) {
playerFile.set("vault" + number, null);
playerFile.save(file);
}
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()));
}
}
/**
* Get the holder's vault file. Create if doesn't exist.
*
* @param holder The vault holder.
*
* @return The holder's vault config file.
*/
public YamlConfiguration getPlayerVaultFile(UUID holder) {
File folder = new File(directory);
if (!folder.exists()) {
folder.mkdir();
}
File file = new File(directory + File.separator + holder.toString() + ".yml");
if (!file.exists()) {
try {
file.createNewFile();
} catch (IOException e) {
// Who cares?
}
}
YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
return playerFile;
}
/**
* Save the players vault file.
*
* @param holder The vault holder of whose file to save.
* @param yaml The config to save.
*
* @throws IOException Uh oh!
*/
public void saveFile(UUID holder, YamlConfiguration yaml) throws IOException {
File file = new File(directory + File.separator + holder.toString() + ".yml");
if (file.exists()) {
file.renameTo(new File(directory + File.separator + "backups" + File.separator + holder.toString() + ".yml"));
}
yaml.save(file);
}
/**
* Get the instance of this class.
*
* @return - instance of this class.
*/
public static UUIDVaultManager getInstance() {
return instance;
}
}
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+9
View File
@@ -52,6 +52,7 @@ public class VaultManager {
*
* @throws IOException Uh oh!
*/
@Deprecated
public void saveVault(Inventory inventory, String player, int number) throws IOException {
int size = inventory.getSize();
YamlConfiguration yaml = getPlayerVaultFile(player);
@@ -78,6 +79,7 @@ public class VaultManager {
* @param holder The holder of the vault.
* @param number The vault number.
*/
@Deprecated
public Inventory loadOwnVault(String holder, int number, int size) {
if (size % 9 != 0) {
size = 54;
@@ -119,6 +121,7 @@ public class VaultManager {
* @param holder The holder of the vault.
* @param number The vault number.
*/
@Deprecated
public Inventory loadOtherVault(String holder, int number, int size) {
if (size % 9 != 0) {
size = 54;
@@ -152,6 +155,7 @@ public class VaultManager {
*
* @return inventory if exists, otherwise null.
*/
@Deprecated
private Inventory getInventory(YamlConfiguration playerFile, int size, int number) {
List<String> data = new ArrayList<String>();
for (int x = 0; x < size; x++) {
@@ -173,6 +177,7 @@ public class VaultManager {
*
* @return The inventory of the specified holder and vault number.
*/
@Deprecated
public Inventory getVault(String holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
List<String> data = playerFile.getStringList("vault" + number);
@@ -187,6 +192,7 @@ public class VaultManager {
}
}
@Deprecated
public boolean vaultExists(String holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
return playerFile.contains("vault" + number);
@@ -201,6 +207,7 @@ public class VaultManager {
*
* @throws IOException Uh oh!
*/
@Deprecated
public void deleteVault(CommandSender sender, String holder, int number) throws IOException {
String name = holder.toLowerCase();
File file = new File(directory + File.separator + name.toLowerCase() + ".yml");
@@ -226,6 +233,7 @@ public class VaultManager {
*
* @return The holder's vault config file.
*/
@Deprecated
public YamlConfiguration getPlayerVaultFile(String holder) {
File folder = new File(directory);
if (!folder.exists()) {
@@ -251,6 +259,7 @@ public class VaultManager {
*
* @throws IOException Uh oh!
*/
@Deprecated
public void saveFile(String holder, YamlConfiguration yaml) throws IOException {
File file = new File(directory + File.separator + holder.toLowerCase() + ".yml");
if (file.exists()) {
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
+9 -10
View File
@@ -16,10 +16,9 @@
*/
package com.drtshock.playervaults.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.util.Lang;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
@@ -55,7 +54,7 @@ public class VaultOperations {
*
* @return max size as integer. If no max size is set then it will default to 54.
*/
public static int getMaxVaultSize(Player player) {
public static int getMaxVaultSize(OfflinePlayer player) {
if (player == null) {
return 54;
}
@@ -87,7 +86,7 @@ public class VaultOperations {
}
if (checkPerms(player, number)) {
if (EconomyOperations.payToOpen(player, number)) {
Inventory inv = PlayerVaults.VM.loadOwnVault(player.getName(), number, getMaxVaultSize(player));
Inventory inv = UUIDVaultManager.getInstance().loadOwnVault(player, number, getMaxVaultSize(player));
player.openInventory(inv);
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
return true;
@@ -110,7 +109,7 @@ public class VaultOperations {
*
* @return Whether or not the player was allowed to open it.
*/
public static boolean openOtherVault(Player player, String holder, String arg) {
public static boolean openOtherVault(Player player, Player holder, String arg) {
if (player.hasPermission("playervaults.admin")) {
int number = 0;
try {
@@ -121,12 +120,12 @@ public class VaultOperations {
} catch (NumberFormatException nfe) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
Inventory inv = PlayerVaults.VM.loadOtherVault(holder, number, getMaxVaultSize(Bukkit.getPlayerExact(holder)));
Inventory inv = UUIDVaultManager.getInstance().loadOtherVault(holder.getUniqueId(), number, getMaxVaultSize(holder));
if (inv == null) {
player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
} else {
player.openInventory(inv);
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", holder));
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", holder.getName()));
return true;
}
} else {
@@ -155,7 +154,7 @@ public class VaultOperations {
}
try {
if (EconomyOperations.refundOnDelete(player, number)) {
PlayerVaults.VM.deleteVault(player, player.getName(), number);
UUIDVaultManager.getInstance().deleteVault(player, player.getUniqueId(), number);
}
} catch (IOException e) {
player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
@@ -172,7 +171,7 @@ public class VaultOperations {
* @param holder The user to whom the deleted vault belongs.
* @param arg The vault number to delete.
*/
public static void deleteOtherVault(CommandSender sender, String holder, String arg) {
public static void deleteOtherVault(CommandSender sender, Player holder, String arg) {
if (sender.hasPermission("playervaults.delete")) {
if (arg.matches("^[0-9]{1,2}$")) {
int number = 0;
@@ -186,7 +185,7 @@ public class VaultOperations {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
try {
PlayerVaults.VM.deleteVault(sender, holder, number);
UUIDVaultManager.getInstance().deleteVault(sender, holder.getUniqueId(), number);
} catch (IOException e) {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
}