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

Introduce MiniMessage, new lang, and fix storage quirks

Browse Source
This commit is contained in:
mbax
2020-12-25 12:19:55 -05:00
parent f5cea1214e
commit 5e3deaa8e2
23 changed files with 754 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/tasks/Base64Conversion.java
+32 -14
View File
@@ -19,15 +19,15 @@
package com.drtshock.playervaults.tasks;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager;
import com.drtshock.playervaults.vaultmanagement.VaultManager;
import com.drtshock.playervaults.vaultmanagement.CardboardBoxSerialization;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.UUID;
import java.util.logging.Logger;
@@ -41,24 +41,36 @@ public final class Base64Conversion implements Runnable {
Logger logger = PlayerVaults.getInstance().getLogger();
File newDir = PlayerVaults.getInstance().getVaultData();
File oldVaults = PlayerVaults.getInstance().getDataFolder().toPath().resolve("base64vaults").toFile();
File reallyOldVaults = PlayerVaults.getInstance().getDataFolder().toPath().resolve("uuidvaults").toFile();
if (newDir.exists()) {
PlayerVaults.getInstance().getDataFolder().toPath().resolve("oldVaultsData").toFile().mkdirs();
if (oldVaults.exists()) {
try {
Files.move(oldVaults.toPath(), PlayerVaults.getInstance().getDataFolder().toPath().resolve("oldVaultsData").resolve("base64vaults"));
} catch (IOException e) {
PlayerVaults.getInstance().getLogger().warning("Failed to move old vaults dir: " + e.getMessage());
}
}
if (reallyOldVaults.exists()) {
try {
Files.move(reallyOldVaults.toPath(), PlayerVaults.getInstance().getDataFolder().toPath().resolve("oldVaultsData").resolve("uuidvaults"));
} catch (IOException e) {
PlayerVaults.getInstance().getLogger().warning("Failed to move old vaults dir: " + e.getMessage());
}
}
return;
}
newDir.mkdirs();
File oldVaults = PlayerVaults.getInstance().getUuidData();
if (!oldVaults.exists()) {
logger.info("No uuidvaults found to convert to base64.");
logger.info("No base64vaults found to convert to new format.");
return;
}
newDir.mkdirs();
UUIDVaultManager oldManager = UUIDVaultManager.getInstance();
VaultManager manager = VaultManager.getInstance();
logger.info("********** Starting conversion to Base64 for PlayerVaults **********");
logger.info("********** Starting conversion from Base64 for PlayerVaults **********");
logger.info("This might take awhile.");
logger.info(oldVaults.toString() + " will remain as a backup.");
@@ -92,21 +104,27 @@ public final class Base64Conversion implements Runnable {
continue;
}
int vaultNumber = Integer.valueOf(key.replace("vault", ""));
int vaultNumber = Integer.parseInt(key.replace("vault", ""));
try {
Inventory inventory = oldManager.getVault(holderUUID, vaultNumber);
manager.saveVault(inventory, holderUUID.toString(), vaultNumber);
String data = uuidFile.getString(key);
String newData = CardboardBoxSerialization.convert(data, holderUUID + " " + key);
uuidFile.set(key, newData);
vaults++;
} catch (Exception e) {
logger.severe("Failed to parse vault " + vaultNumber + " for " + holderUUID);
failed++;
}
}
try {
uuidFile.save(newDir.toPath().resolve(file.getName()).toFile());
} catch (IOException e) {
logger.severe("Failed to save new file " + file.getName());
}
players++;
}
logger.info(String.format("Converted %d vaults for %d players to base64. %d failed to convert", vaults, players, failed));
logger.info(String.format("Converted %d vaults for %d players to new storage. %d failed to convert", vaults, players, failed));
}
}
src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java
-73
View File
@@ -1,73 +0,0 @@
/*
* PlayerVaultsX
* Copyright (C) 2013 Trent Hensler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.drtshock.playervaults.tasks;
import com.drtshock.playervaults.PlayerVaults;
import com.google.common.io.Files;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import java.io.File;
import java.io.IOException;
import java.util.logging.Logger;
/**
* Class to convert vaults by name to vaults by UUID.
*/
public final class UUIDConversion implements Runnable {
@Override
public void run() {
Logger logger = PlayerVaults.getInstance().getLogger();
File newDir = PlayerVaults.getInstance().getVaultData();
if (newDir.exists()) {
return;
}
File oldVaults = new File(PlayerVaults.getInstance().getDataFolder() + File.separator + "vaults");
if (oldVaults.exists()) {
logger.info("********** Starting conversion to UUIDs for PlayerVaults **********");
logger.info("This might take awhile.");
logger.info(oldVaults.toString() + " will remain as a backup.");
for (File file : oldVaults.listFiles()) {
if (file.isDirectory()) {
continue; // backups folder.
}
OfflinePlayer player = Bukkit.getOfflinePlayer(file.getName().replace(".yml", ""));
if (player == null) {
logger.warning("Unable to convert file because player never joined the server: " + file.getName());
break;
}
File newFile = new File(PlayerVaults.getInstance().getVaultData(), player.getUniqueId().toString() + ".yml");
file.mkdirs();
try {
Files.copy(file, newFile);
logger.info("Successfully converted vault file for " + player.getName());
} catch (IOException e) {
logger.severe("Couldn't convert vault file for " + player.getName());
}
}
logger.info("********** Conversion done ;D **********");
}
}
}