From 1d6c1bd6d173d2da9751d048de47d6684c0a55bb Mon Sep 17 00:00:00 2001 From: Joshua Popoff Date: Mon, 5 May 2014 09:27:33 -0700 Subject: [PATCH 1/3] Fix saving of vaults and use guava Files instead of nms apache commons Files --- pom.xml | 4 ++-- .../java/com/drtshock/playervaults/listeners/Listeners.java | 5 ++--- .../com/drtshock/playervaults/tasks/UUIDConversion.java | 6 ++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6e86939..81735ce 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.milkbowl.vault Vault - 1.2.25-SNAPSHOT + 1.2.32 org.codehaus.jackson @@ -81,7 +81,7 @@ vault-repo - http://ci.herocraftonline.com/plugin/repository/everything + http://nexus.theyeticave.net/content/repositories/pub_releases/ diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index fd305c7..bde0582 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -19,7 +19,6 @@ package com.drtshock.playervaults.listeners; import com.drtshock.playervaults.PlayerVaults; import com.drtshock.playervaults.util.Lang; import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager; -import com.drtshock.playervaults.vaultmanagement.VaultManager; import com.drtshock.playervaults.vaultmanagement.VaultOperations; import com.drtshock.playervaults.vaultmanagement.VaultViewInfo; import org.bukkit.*; @@ -49,7 +48,7 @@ public class Listeners implements Listener { this.plugin = playerVaults; } - VaultManager vm = new VaultManager(plugin); + UUIDVaultManager vm = UUIDVaultManager.getInstance(); public void saveVault(Player player) { if (PlayerVaults.getInstance().getInVault().containsKey(player.getName())) { @@ -57,7 +56,7 @@ public class Listeners implements Listener { if (inv.getViewers().size() == 1) { VaultViewInfo info = PlayerVaults.getInstance().getInVault().get(player.getName()); try { - vm.saveVault(inv, info.getHolder(), info.getNumber()); + vm.saveVault(inv, player.getUniqueId(), info.getNumber()); } catch (IOException e) { } PlayerVaults.getInstance().getOpenInventories().remove(info.toString()); diff --git a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java index 3144408..9d776cf 100644 --- a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java +++ b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java @@ -1,7 +1,7 @@ package com.drtshock.playervaults.tasks; import com.drtshock.playervaults.PlayerVaults; -import net.minecraft.util.org.apache.commons.io.FileUtils; +import com.google.common.io.Files; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.scheduler.BukkitRunnable; @@ -36,16 +36,18 @@ public final class UUIDConversion extends BukkitRunnable { PlayerVaults.getInstance().getLogger().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.getInstance().getDataFolder(), "uuidvaults" + File.separator + uuid.toString() + ".yml"); file.mkdirs(); try { - FileUtils.copyFile(file, newFile); + Files.copy(file, newFile); PlayerVaults.getInstance().getLogger().log(Level.INFO, "Successfully converted vault file for " + player.getName()); } catch (IOException e) { PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Couldn't convert vault file for " + player.getName()); } } + PlayerVaults.getInstance().getLogger().log(Level.INFO, "********** Conversion done ;D **********"); } } From 5721e98e7780e6f706320dfa0e0f4e3d26845ae2 Mon Sep 17 00:00:00 2001 From: Joshua Popoff Date: Mon, 5 May 2014 09:28:38 -0700 Subject: [PATCH 2/3] I hate spaces --- .../java/com/drtshock/playervaults/tasks/UUIDConversion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java index 9d776cf..f4e9488 100644 --- a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java +++ b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java @@ -41,7 +41,7 @@ public final class UUIDConversion extends BukkitRunnable { File newFile = new File(PlayerVaults.getInstance().getDataFolder(), "uuidvaults" + File.separator + uuid.toString() + ".yml"); file.mkdirs(); try { - Files.copy(file, newFile); + Files.copy(file, newFile); PlayerVaults.getInstance().getLogger().log(Level.INFO, "Successfully converted vault file for " + player.getName()); } catch (IOException e) { PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Couldn't convert vault file for " + player.getName()); From abb37ab4b08e4c1eb9cb611495066b18ac74a076 Mon Sep 17 00:00:00 2001 From: Joshua Popoff Date: Mon, 5 May 2014 09:38:53 -0700 Subject: [PATCH 3/3] We want to continue, not break --- .../java/com/drtshock/playervaults/tasks/UUIDConversion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java index f4e9488..7a6568c 100644 --- a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java +++ b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java @@ -30,7 +30,7 @@ public final class UUIDConversion extends BukkitRunnable { PlayerVaults.getInstance().getLogger().log(Level.INFO, "plugins/PlayerVaults/vaults will still be there as a backup but unused."); for (File file : new File(PlayerVaults.getInstance().getDataFolder() + File.separator + "vaults").listFiles()) { - if (file.isDirectory()) break; // backups folder. + if (file.isDirectory()) continue; // backups folder. OfflinePlayer player = Bukkit.getOfflinePlayer(file.getName().replace(".yml", "")); if (player == null) { PlayerVaults.getInstance().getLogger().log(Level.WARNING, "Unable to convert file because player never joined the server: " + file.getName());