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/vaultmanagement/Base64Serialization.java
-109
View File
@@ -1,109 +0,0 @@
/*
* PlayerVaultsX
* Copyright (C) 2013 Trent Hensler, Laxwashere
*
* 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.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
import org.bukkit.Bukkit;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.io.BukkitObjectInputStream;
import org.bukkit.util.io.BukkitObjectOutputStream;
import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.logging.Level;
/**
* Created by Lax on 6/6/2017.
*/
public class Base64Serialization {
public static String toBase64(Inventory inventory, int size) {
return toBase64(inventory, size, null);
}
public static String toBase64(Inventory inventory, int size, String target) {
try {
ByteArrayOutputStream finalOutputStream = new ByteArrayOutputStream();
ByteArrayOutputStream temporaryOutputStream = new ByteArrayOutputStream();
BukkitObjectOutputStream dataOutput = new BukkitObjectOutputStream(temporaryOutputStream);
int failedItems = 0;
// Write the size of the inventory
dataOutput.writeInt(size);
// Save every element in the list
for (int i = 0; i < inventory.getSize(); i++) {
try {
dataOutput.writeObject(inventory.getItem(i));
} catch (Exception ignored) {
failedItems++;
temporaryOutputStream.reset();
} finally {
if (temporaryOutputStream.size() == 0) {
dataOutput.writeObject(null);
}
finalOutputStream.write(temporaryOutputStream.toByteArray());
temporaryOutputStream.reset();
}
}
if (failedItems > 0) {
PlayerVaults.getInstance().getLogger().severe("Failed to save " + failedItems + " invalid items to vault " + target);
}
PlayerVaults.debug("Serialized " + inventory.getSize() + " items");
// Serialize that array
dataOutput.close();
return Base64Coder.encodeLines(finalOutputStream.toByteArray());
} catch (Exception e) {
throw new IllegalStateException("Cannot into itemstacksz!", e);
}
}
public static String toBase64(ItemStack[] is, int size) {
Inventory inventory = Bukkit.createInventory(null, size);
inventory.setContents(is);
return toBase64(inventory, size);
}
public static Inventory fromBase64(String data) {
return fromBase64(data, null);
}
public static Inventory fromBase64(String data, String target) {
try {
ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data));
BukkitObjectInputStream dataInput = new BukkitObjectInputStream(inputStream);
Inventory inventory = Bukkit.getServer().createInventory(null, dataInput.readInt());
// Read the serialized inventory
for (int i = 0; i < inventory.getSize(); i++) {
inventory.setItem(i, (ItemStack) dataInput.readObject());
}
dataInput.close();
PlayerVaults.debug("Read " + inventory.getSize() + " items");
return inventory;
} catch (Exception e) {
PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Failed to load vault " + target, e);
}
return null;
}
}
src/main/java/com/drtshock/playervaults/vaultmanagement/CardboardBoxSerialization.java
+84
View File
@@ -0,0 +1,84 @@
package com.drtshock.playervaults.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
import org.bukkit.Material;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.io.BukkitObjectInputStream;
import org.kitteh.cardboardbox.CardboardBox;
import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.logging.Level;
public class CardboardBoxSerialization {
public static String toStorage(Inventory inventory, String target) {
try {
return Base64Coder.encodeLines(writeInventory(inventory.getContents()));
} catch (IOException e) {
throw new IllegalStateException("Failed to save items for " + target, e);
}
}
public static ItemStack[] fromStorage(String data, String target) {
if (data == null || data.isEmpty()) {
ItemStack[] i = new ItemStack[6 * 9];
for (int x = 0; x < i.length; x++) {
i[x] = new ItemStack(Material.AIR);
}
return i;
}
try {
return readInventory(Base64Coder.decodeLines(data));
} catch (IOException e) {
PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Failed to load items for " + target, e);
return null;
}
}
private static byte[] writeInventory(ItemStack[] contents) throws IOException {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(bytes);
out.writeInt(contents.length);
for (ItemStack content : contents) {
byte[] item = CardboardBox.serializeItem(content);
out.writeInt(item.length);
out.write(item);
}
out.close();
return bytes.toByteArray();
}
private static ItemStack[] readInventory(byte[] data) throws IOException {
DataInputStream input = new DataInputStream(new ByteArrayInputStream(data));
ItemStack[] contents = new ItemStack[input.readInt()];
for (int i = 0; i < contents.length; i++) {
int len = input.readInt();
byte[] itemBytes = new byte[len];
input.readFully(itemBytes);
contents[i] = CardboardBox.deserializeItem(itemBytes);
}
return contents;
}
public static String convert(String data, String target) {
try {
ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data));
BukkitObjectInputStream dataInput = new BukkitObjectInputStream(inputStream);
ItemStack[] contents = new ItemStack[dataInput.readInt()];
// Read the serialized inventory
for (int i = 0; i < contents.length; i++) {
contents[i] = (ItemStack) dataInput.readObject();
}
dataInput.close();
return Base64Coder.encodeLines(writeInventory(contents));
} catch (Exception e) {
PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Failed to convert vault " + target, e);
}
return null;
}
}
src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java
+5 -7
View File
@@ -19,9 +19,7 @@
package com.drtshock.playervaults.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import net.milkbowl.vault.economy.EconomyResponse;
import org.bukkit.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
@@ -53,7 +51,7 @@ public class EconomyOperations {
double cost = PlayerVaults.getInstance().getConf().getEconomy().getFeeToOpen();
EconomyResponse resp = PlayerVaults.getInstance().getEconomy().withdrawPlayer(player, cost);
if (resp.transactionSuccess()) {
player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_OPEN.toString().replaceAll("%price", "" + cost));
PlayerVaults.getInstance().getTL().costToOpen().title().with("price", cost + "").send(player);
return true;
}
}
@@ -75,7 +73,7 @@ public class EconomyOperations {
double cost = PlayerVaults.getInstance().getConf().getEconomy().getFeeToCreate();
EconomyResponse resp = PlayerVaults.getInstance().getEconomy().withdrawPlayer(player, cost);
if (resp.transactionSuccess()) {
player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_CREATE.toString().replaceAll("%price", "" + cost));
PlayerVaults.getInstance().getTL().costToCreate().title().with("price", cost + "").send(player);
return true;
}
@@ -98,18 +96,18 @@ public class EconomyOperations {
if (playerFile.exists()) {
YamlConfiguration playerData = YamlConfiguration.loadConfiguration(playerFile);
if (playerData.getString("vault" + number) == null) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
PlayerVaults.getInstance().getTL().vaultDoesNotExist().title().send(player);
return false;
}
} else {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
PlayerVaults.getInstance().getTL().vaultDoesNotExist().title().send(player);
return false;
}
double cost = PlayerVaults.getInstance().getConf().getEconomy().getRefundOnDelete();
EconomyResponse resp = PlayerVaults.getInstance().getEconomy().depositPlayer(player, cost);
if (resp.transactionSuccess()) {
player.sendMessage(Lang.TITLE.toString() + Lang.REFUND_AMOUNT.toString().replaceAll("%price", String.valueOf(cost)));
PlayerVaults.getInstance().getTL().refundAmount().title().with("price", cost + "").send(player);
return true;
}
src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
+5 -1
View File
@@ -27,7 +27,11 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
-345
View File
@@ -1,345 +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.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.scheduler.BukkitRunnable;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
/**
* Class to handle vault operations with new UUIDs.
*/
@Deprecated
public class UUIDVaultManager {
private static UUIDVaultManager instance;
private final File directory = PlayerVaults.getInstance().getUuidData();
private final Map<String, YamlConfiguration> cachedVaultFiles = new ConcurrentHashMap<>();
public UUIDVaultManager() {
instance = this;
}
/**
* Get the instance of this class.
*
* @return - instance of this class.
*/
public static UUIDVaultManager getInstance() {
return instance;
}
/**
* Saves the inventory to the specified player and vault number.
*
* @param inventory The inventory to be saved.
* @param target The player of whose file to save to.
* @param number The vault number.
*/
public void saveVault(Inventory inventory, String target, int number) {
int size = inventory.getSize();
YamlConfiguration yaml = getPlayerVaultFile(target);
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[0]);
for (int x = 0; x < ser.length; x++) {
if (!ser[x].equalsIgnoreCase("null")) {
yaml.set("vault" + number + "." + x, ser[x]);
}
}
saveFileSync(target, 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 = PlayerVaults.getInstance().getDefaultVaultSize();
}
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", player.getName());
VaultViewInfo info = new VaultViewInfo(player.getUniqueId().toString(), number);
Inventory inv;
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().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, title);
vaultHolder.setInventory(inv);
} else {
player.sendMessage(Lang.TITLE.toString() + Lang.INSUFFICIENT_FUNDS.toString());
return null;
}
} else {
Inventory i = getInventory(playerFile, size, number, title);
if (i == null) {
return null;
} else {
inv = i;
}
}
PlayerVaults.getInstance().getOpenInventories().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(String holder, int number, int size) {
if (size % 9 != 0) {
size = PlayerVaults.getInstance().getDefaultVaultSize();
}
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", PlayerVaults.getInstance().getNameIfPlayer(holder));
VaultViewInfo info = new VaultViewInfo(holder, number);
Inventory inv;
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
Inventory i = getInventory(playerFile, size, number, title);
if (i == null) {
return null;
} else {
inv = i;
}
PlayerVaults.getInstance().getOpenInventories().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, String title) {
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, title);
}
/**
* 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);
ConfigurationSection section = playerFile.getConfigurationSection("vault" + number);
int maxSize = VaultOperations.getMaxVaultSize(holder.toString());
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number));
if (section == null) {
VaultHolder vaultHolder = new VaultHolder(number);
Inventory inv = Bukkit.createInventory(vaultHolder, maxSize, title);
vaultHolder.setInventory(inv);
return inv;
} else {
List<String> data = new ArrayList<>();
for (String s : section.getKeys(false)) {
String value = section.getString(s);
data.add(value);
}
return Serialization.toInventory(data, number, maxSize, title);
}
}
/**
* Checks if a vault exists.
*
* @param holder holder of the vault.
* @param number vault number.
* @return true if the vault file and vault number exist in that file, otherwise false.
*/
public boolean vaultExists(String holder, int number) {
File file = new File(directory, holder + ".yml");
if (!file.exists()) {
return false;
}
return getPlayerVaultFile(holder).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, final String holder, final int number) throws IOException {
new BukkitRunnable() {
@Override
public void run() {
File file = new File(directory, holder + ".yml");
if (!file.exists()) {
return;
}
YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
if (file.exists()) {
playerFile.set("vault" + number, null);
if (cachedVaultFiles.containsKey(holder)) {
cachedVaultFiles.put(holder, playerFile);
}
try {
playerFile.save(file);
} catch (IOException ignored) {
}
}
}
}.runTaskAsynchronously(PlayerVaults.getInstance());
OfflinePlayer player = Bukkit.getPlayer(holder);
if (player != null) {
if (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()));
}
}
String uuid = sender instanceof Player ? ((Player) sender).getUniqueId().toString() : holder;
PlayerVaults.getInstance().getOpenInventories().remove(new VaultViewInfo(holder, number).toString());
}
// Should only be run asynchronously
public void cachePlayerVaultFile(String holder) {
YamlConfiguration config = this.loadPlayerVaultFile(holder, false);
if (config != null) {
this.cachedVaultFiles.put(holder, config);
}
}
public void removeCachedPlayerVaultFile(String holder) {
cachedVaultFiles.remove(holder);
}
/**
* Use below method for getting it via String.
*/
@Deprecated
public YamlConfiguration getPlayerVaultFile(UUID holder) {
return getPlayerVaultFile(holder.toString());
}
/**
* 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(String holder) {
if (cachedVaultFiles.containsKey(holder)) {
return cachedVaultFiles.get(holder);
}
return loadPlayerVaultFile(holder);
}
public YamlConfiguration loadPlayerVaultFile(String holder) {
return this.loadPlayerVaultFile(holder, true);
}
public YamlConfiguration loadPlayerVaultFile(String uniqueId, boolean createIfNotFound) {
if (!this.directory.exists()) {
this.directory.mkdir();
}
File file = new File(this.directory, uniqueId + ".yml");
if (!file.exists()) {
if (createIfNotFound) {
try {
file.createNewFile();
} catch (IOException e) {
// Who cares?
}
} else {
return null;
}
}
return YamlConfiguration.loadConfiguration(file);
}
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 + ".yml");
if (file.exists() && backups) {
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, e);
}
}
}
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+17 -13
View File
@@ -19,7 +19,6 @@
package com.drtshock.playervaults.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
@@ -45,8 +44,10 @@ public class VaultManager {
private static VaultManager instance;
private final File directory = PlayerVaults.getInstance().getVaultData();
private final Map<String, YamlConfiguration> cachedVaultFiles = new ConcurrentHashMap<>();
private final PlayerVaults plugin;
public VaultManager() {
public VaultManager(PlayerVaults plugin) {
this.plugin = plugin;
instance = this;
}
@@ -69,7 +70,7 @@ public class VaultManager {
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, target);
String serialized = CardboardBoxSerialization.toStorage(inventory, target);
yaml.set(String.format(VAULTKEY, number), serialized);
saveFileSync(target, yaml);
}
@@ -87,7 +88,7 @@ public class VaultManager {
PlayerVaults.debug("Loading self vault for " + player.getName() + " (" + player.getUniqueId() + ')');
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", player.getName());
String title = PlayerVaults.getInstance().getVaultTitle(String.valueOf(number));
VaultViewInfo info = new VaultViewInfo(player.getUniqueId().toString(), number);
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
PlayerVaults.debug("Already open");
@@ -129,7 +130,7 @@ public class VaultManager {
// Not a player
}
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", holder);
String title = PlayerVaults.getInstance().getVaultTitle(String.valueOf(number));
VaultViewInfo info = new VaultViewInfo(name, number);
Inventory inv;
VaultHolder vaultHolder = new VaultHolder(number);
@@ -161,23 +162,23 @@ public class VaultManager {
Inventory inventory = Bukkit.createInventory(owner, size, title);
String data = playerFile.getString(String.format(VAULTKEY, number));
Inventory deserialized = Base64Serialization.fromBase64(data, ownerName);
ItemStack[] deserialized = CardboardBoxSerialization.fromStorage(data, ownerName);
if (deserialized == null) {
PlayerVaults.debug("Loaded vault as null");
PlayerVaults.debug("Loaded vault for " + ownerName + " as null");
return inventory;
}
// Check if deserialized has more used slots than the limit here.
// Happens on change of permission or if people used the broken version.
// In this case, players will lose items.
if (deserialized.getContents().length > size) {
for (ItemStack stack : deserialized.getContents()) {
if (deserialized.length > size) {
for (ItemStack stack : deserialized) {
if (stack != null) {
inventory.addItem(stack);
}
}
} else {
inventory.setContents(deserialized.getContents());
inventory.setContents(deserialized);
}
PlayerVaults.debug("Loaded vault");
@@ -194,7 +195,10 @@ public class VaultManager {
public Inventory getVault(String holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder, true);
String serialized = playerFile.getString(String.format(VAULTKEY, number));
return Base64Serialization.fromBase64(serialized, holder);
ItemStack[] contents = CardboardBoxSerialization.fromStorage(serialized, holder);
Inventory inventory = Bukkit.createInventory(null, contents.length, holder + " vault " + number);
inventory.setContents(contents);
return inventory;
}
/**
@@ -279,9 +283,9 @@ public class VaultManager {
OfflinePlayer player = Bukkit.getPlayer(holder);
if (player != null) {
if (sender.getName().equalsIgnoreCase(player.getName())) {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT.toString().replace("%v", String.valueOf(number)));
this.plugin.getTL().deleteVault().title().with("vault", String.valueOf(number)).send(sender);
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT.toString().replace("%v", String.valueOf(number)).replaceAll("%p", player.getName()));
this.plugin.getTL().deleteOtherVault().title().with("vault", String.valueOf(number)).with("player", player.getName()).send(sender);
}
}
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
+28 -30
View File
@@ -19,9 +19,7 @@
package com.drtshock.playervaults.vaultmanagement;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -60,7 +58,7 @@ public class VaultOperations {
InventoryView view = player.getOpenInventory();
if (view.getTopInventory().getHolder() instanceof VaultHolder) {
player.closeInventory();
player.sendMessage(Lang.TITLE + Lang.LOCKED.toString());
PlayerVaults.getInstance().getTL().locked().title().send(player);
}
}
}
@@ -111,7 +109,7 @@ public class VaultOperations {
*/
public static int getMaxVaultSize(OfflinePlayer player) {
if (player == null || !player.isOnline()) {
return PlayerVaults.getInstance().getDefaultVaultSize();
return 6 * 9;
}
for (int i = 6; i != 0; i--) {
if (player.getPlayer().hasPermission("playervaults.size." + i)) {
@@ -125,7 +123,7 @@ public class VaultOperations {
* Open a player's own vault.
*
* @param player The player to open to.
* @param arg The vault number to open.
* @param arg The vault number to open.
* @return Whether or not the player was allowed to open it.
*/
public static boolean openOwnVault(Player player, String arg) {
@@ -150,7 +148,7 @@ public class VaultOperations {
return false;
}
} catch (NumberFormatException nfe) {
player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER.toString());
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(player);
return false;
}
@@ -174,15 +172,15 @@ public class VaultOperations {
PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
if (send) {
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
PlayerVaults.getInstance().getTL().openVault().title().with("vault", arg).send(player);
}
return true;
} else {
player.sendMessage(Lang.TITLE.toString() + Lang.INSUFFICIENT_FUNDS);
PlayerVaults.getInstance().getTL().insufficientFunds().title().send(player);
return false;
}
} else {
player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
PlayerVaults.getInstance().getTL().noPerms().title().send(player);
}
return false;
}
@@ -190,8 +188,8 @@ public class VaultOperations {
/**
* Open a player's own vault. If player is using a command, they'll need the required permission.
*
* @param player The player to open to.
* @param arg The vault number to open.
* @param player The player to open to.
* @param arg The vault number to open.
* @param isCommand - if player is opening via a command or not.
* @return Whether or not the player was allowed to open it.
*/
@@ -199,16 +197,16 @@ public class VaultOperations {
if (isCommand && player.hasPermission("playervaults.commands.use")) {
return openOwnVault(player, arg);
}
player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS.toString());
PlayerVaults.getInstance().getTL().noPerms().title().send(player);
return false;
}
/**
* Open another player's vault.
*
* @param player The player to open to.
* @param player The player to open to.
* @param vaultOwner The name of the vault owner.
* @param arg The vault number to open.
* @param arg The vault number to open.
* @return Whether or not the player was allowed to open it.
*/
public static boolean openOtherVault(Player player, String vaultOwner, String arg) {
@@ -230,11 +228,11 @@ public class VaultOperations {
try {
number = Integer.parseInt(arg);
if (number < 1) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(player);
return false;
}
} catch (NumberFormatException nfe) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(player);
}
Inventory inv = VaultManager.getInstance().loadOtherVault(vaultOwner, number, getMaxVaultSize(vaultOwner));
@@ -247,7 +245,7 @@ public class VaultOperations {
}
if (inv == null) {
player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
PlayerVaults.getInstance().getTL().vaultDoesNotExist().title().send(player);
} else {
player.openInventory(inv);
@@ -257,7 +255,7 @@ public class VaultOperations {
return false; // inventory open event was cancelled.
}
if (send) {
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", name));
PlayerVaults.getInstance().getTL().openOtherVault().title().with("vault", arg).with("player", name).send(player);
}
PlayerVaults.debug("opening other vault", time);
@@ -276,7 +274,7 @@ public class VaultOperations {
* Delete a player's own vault.
*
* @param player The player to delete.
* @param arg The vault number to delete.
* @param arg The vault number to delete.
*/
public static void deleteOwnVault(Player player, String arg) {
if (isLocked()) {
@@ -287,20 +285,20 @@ public class VaultOperations {
try {
number = Integer.parseInt(arg);
if (number == 0) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(player);
return;
}
} catch (NumberFormatException nfe) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(player);
}
if (EconomyOperations.refundOnDelete(player, number)) {
VaultManager.getInstance().deleteVault(player, player.getUniqueId().toString(), number);
player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT.toString().replaceAll("%v", arg));
PlayerVaults.getInstance().getTL().deleteVault().title().with("vault", arg).send(player);
}
} else {
player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(player);
}
}
@@ -309,7 +307,7 @@ public class VaultOperations {
*
* @param sender The sender executing the deletion.
* @param holder The user to whom the deleted vault belongs.
* @param arg The vault number to delete.
* @param arg The vault number to delete.
*/
public static void deleteOtherVault(CommandSender sender, String holder, String arg) {
if (isLocked()) {
@@ -321,20 +319,20 @@ public class VaultOperations {
try {
number = Integer.parseInt(arg);
if (number == 0) {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(sender);
return;
}
} catch (NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(sender);
}
VaultManager.getInstance().deleteVault(sender, holder, number);
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT.toString().replaceAll("%v", arg).replaceAll("%p", holder));
PlayerVaults.getInstance().getTL().deleteOtherVault().title().with("vault", arg).with("player", holder).send(sender);
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
PlayerVaults.getInstance().getTL().mustBeNumber().title().send(sender);
}
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
PlayerVaults.getInstance().getTL().noPerms().title().send(sender);
}
}
@@ -353,7 +351,7 @@ public class VaultOperations {
VaultManager.getInstance().deleteAllVaults(holder);
PlayerVaults.getInstance().getLogger().info(String.format("%s deleted ALL vaults belonging to %s", sender.getName(), holder));
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
PlayerVaults.getInstance().getTL().noPerms().title().send(sender);
}
}