Merge pull request #29 from koalaaaa/master
General cleanup of everything I can see right now.
This commit is contained in:
@@ -1,24 +1,24 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>com.drtshock</groupId>
|
<groupId>com.drtshock</groupId>
|
||||||
<artifactId>PlayerVaults</artifactId>
|
<artifactId>PlayerVaults</artifactId>
|
||||||
<version>3.5.0-SNAPSHOT</version>
|
<version>3.5.0-SNAPSHOT</version>
|
||||||
<name>PlayerVaults</name>
|
<name>PlayerVaults</name>
|
||||||
<url>http://dev.bukkit.org/server-mods/playervaults/</url>
|
<url>http://dev.bukkit.org/bukkit-plugins/playervaults/</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<defaultGoal>clean package install</defaultGoal>
|
<defaultGoal>clean install</defaultGoal>
|
||||||
<finalName>PlayerVaults</finalName>
|
<finalName>PlayerVaults</finalName>
|
||||||
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
|
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
<targetPath>.</targetPath>
|
|
||||||
<filtering>true</filtering>
|
<filtering>true</filtering>
|
||||||
<directory>${basedir}/src/main/resources/</directory>
|
<directory>src/main/resources/</directory>
|
||||||
<includes>
|
<includes>
|
||||||
<include>*.yml</include>
|
<include>*.yml</include>
|
||||||
</includes>
|
</includes>
|
||||||
@@ -33,55 +33,30 @@
|
|||||||
<target>1.7</target>
|
<target>1.7</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<descriptors>
|
|
||||||
<descriptor>src/main/assembly/package.xml</descriptor>
|
|
||||||
</descriptors>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>build</id>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>single</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>bukkit-repo</id>
|
||||||
|
<url>http://repo.bukkit.org/content/groups/public/</url>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>vault-repo</id>
|
||||||
|
<url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>bukkit</artifactId>
|
<artifactId>bukkit</artifactId>
|
||||||
<version>LATEST</version>
|
<version>LATEST</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>LATEST</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.milkbowl.vault</groupId>
|
<groupId>net.milkbowl.vault</groupId>
|
||||||
<artifactId>Vault</artifactId>
|
<artifactId>Vault</artifactId>
|
||||||
<version>1.2.32</version>
|
<version>1.2.32</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.jackson</groupId>
|
|
||||||
<artifactId>jackson-core-asl</artifactId>
|
|
||||||
<version>1.9.12</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>bukkit-repo</id>
|
|
||||||
<url>http://repo.bukkit.org/content/groups/public/</url>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>vault-repo</id>
|
|
||||||
<url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
|
|
||||||
<id>bin</id>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<files>
|
|
||||||
<file>
|
|
||||||
<source>${project.build.directory}/${artifactId}.jar</source>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<destName>${project.name}.jar</destName>
|
|
||||||
</file>
|
|
||||||
</files>
|
|
||||||
</assembly>
|
|
||||||
@@ -57,7 +57,6 @@ public class PlayerVaults extends JavaPlugin {
|
|||||||
private int inventoriesToDrop = 0;
|
private int inventoriesToDrop = 0;
|
||||||
private YamlConfiguration signs;
|
private YamlConfiguration signs;
|
||||||
private File signsFile;
|
private File signsFile;
|
||||||
private Listeners listener;
|
|
||||||
private String name = "";
|
private String name = "";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -66,7 +65,7 @@ public class PlayerVaults extends JavaPlugin {
|
|||||||
getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUID first. Class checks if necessary.
|
getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUID first. Class checks if necessary.
|
||||||
loadLang();
|
loadLang();
|
||||||
new UUIDVaultManager();
|
new UUIDVaultManager();
|
||||||
getServer().getPluginManager().registerEvents(listener = new Listeners(this), this);
|
getServer().getPluginManager().registerEvents(new Listeners(this), this);
|
||||||
loadConfig();
|
loadConfig();
|
||||||
loadSigns();
|
loadSigns();
|
||||||
checkUpdate();
|
checkUpdate();
|
||||||
@@ -248,7 +247,7 @@ public class PlayerVaults extends JavaPlugin {
|
|||||||
lang.createNewFile();
|
lang.createNewFile();
|
||||||
if (defLangStream != null) {
|
if (defLangStream != null) {
|
||||||
out = new FileOutputStream(lang);
|
out = new FileOutputStream(lang);
|
||||||
int read = 0;
|
int read;
|
||||||
byte[] bytes = new byte[1024];
|
byte[] bytes = new byte[1024];
|
||||||
|
|
||||||
while ((read = defLangStream.read(bytes)) != -1) {
|
while ((read = defLangStream.read(bytes)) != -1) {
|
||||||
@@ -322,7 +321,11 @@ public class PlayerVaults extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Economy getEconomy() {
|
public Economy getEconomy() {
|
||||||
return this.econ;
|
return econ;
|
||||||
|
}
|
||||||
|
|
||||||
|
public File getVaultData() {
|
||||||
|
return new File(this.getDataFolder(), "uuidvaults");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PlayerVaults getInstance() {
|
public static PlayerVaults getInstance() {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class DeleteCommand implements CommandExecutor {
|
|||||||
case 2:
|
case 2:
|
||||||
Player player = Bukkit.getPlayer(args[0]);
|
Player player = Bukkit.getPlayer(args[0]);
|
||||||
if (player == null) {
|
if (player == null) {
|
||||||
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PLAYER_FOUND.toString().replaceAll("%p", args[0]));
|
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PLAYER_FOUND.toString().replaceAll("%p", args[0]));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,13 +43,12 @@ import java.io.IOException;
|
|||||||
public class Listeners implements Listener {
|
public class Listeners implements Listener {
|
||||||
|
|
||||||
public PlayerVaults plugin;
|
public PlayerVaults plugin;
|
||||||
|
UUIDVaultManager vm = UUIDVaultManager.getInstance();
|
||||||
|
|
||||||
public Listeners(PlayerVaults playerVaults) {
|
public Listeners(PlayerVaults playerVaults) {
|
||||||
this.plugin = playerVaults;
|
this.plugin = playerVaults;
|
||||||
}
|
}
|
||||||
|
|
||||||
UUIDVaultManager vm = UUIDVaultManager.getInstance();
|
|
||||||
|
|
||||||
public void saveVault(Player player) {
|
public void saveVault(Player player) {
|
||||||
if (PlayerVaults.getInstance().getInVault().containsKey(player.getName())) {
|
if (PlayerVaults.getInstance().getInVault().containsKey(player.getName())) {
|
||||||
Inventory inv = player.getOpenInventory().getTopInventory();
|
Inventory inv = player.getOpenInventory().getTopInventory();
|
||||||
@@ -58,7 +57,9 @@ public class Listeners implements Listener {
|
|||||||
try {
|
try {
|
||||||
vm.saveVault(inv, player.getUniqueId(), info.getNumber());
|
vm.saveVault(inv, player.getUniqueId(), info.getNumber());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
// ignore
|
||||||
}
|
}
|
||||||
|
|
||||||
PlayerVaults.getInstance().getOpenInventories().remove(info.toString());
|
PlayerVaults.getInstance().getOpenInventories().remove(info.toString());
|
||||||
}
|
}
|
||||||
PlayerVaults.getInstance().getInVault().remove(player.getName());
|
PlayerVaults.getInstance().getInVault().remove(player.getName());
|
||||||
@@ -72,31 +73,28 @@ public class Listeners implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onQuit(PlayerQuitEvent event) {
|
public void onQuit(PlayerQuitEvent event) {
|
||||||
Player player = event.getPlayer();
|
saveVault(event.getPlayer());
|
||||||
saveVault(player);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onJoin(PlayerJoinEvent event) {
|
public void onJoin(PlayerJoinEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
if (PlayerVaults.getInstance().needsUpdate() && (player.isOp() || player.hasPermission("playervaults.notify"))) {
|
if (PlayerVaults.getInstance().needsUpdate() && (player.isOp() || player.hasPermission("playervaults.notify"))) {
|
||||||
player.sendMessage(ChatColor.GREEN + "Version " + PlayerVaults.getInstance().getNewVersion() + " of PlayerVaults is up for download!");
|
player.sendMessage(ChatColor.GREEN + "Version " + PlayerVaults.getInstance().getNewVersion() + " of PlayerVaults is available for download!");
|
||||||
player.sendMessage(ChatColor.GREEN + PlayerVaults.getInstance().getLink() + " to view the changelog and download!");
|
player.sendMessage(ChatColor.GREEN + PlayerVaults.getInstance().getLink() + " to view the changelog and download!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onDeath(PlayerDeathEvent event) {
|
public void onDeath(PlayerDeathEvent event) {
|
||||||
Player player = event.getEntity();
|
saveVault(event.getEntity());
|
||||||
saveVault(player);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onClose(InventoryCloseEvent event) {
|
public void onClose(InventoryCloseEvent event) {
|
||||||
HumanEntity he = event.getPlayer();
|
HumanEntity he = event.getPlayer();
|
||||||
if (he instanceof Player) {
|
if (he instanceof Player) {
|
||||||
Player player = (Player) he;
|
saveVault((Player) he);
|
||||||
saveVault(player);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +135,7 @@ public class Listeners implements Listener {
|
|||||||
int y = l.getBlockY();
|
int y = l.getBlockY();
|
||||||
int z = l.getBlockZ();
|
int z = l.getBlockZ();
|
||||||
if (self) {
|
if (self) {
|
||||||
plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".self", self);
|
plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".self", true);
|
||||||
} else {
|
} else {
|
||||||
plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".owner", owner);
|
plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".owner", owner);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,10 +13,9 @@ public class Cleanup extends BukkitRunnable {
|
|||||||
this.diff = diff * 86400;
|
this.diff = diff * 86400;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
File file = new File(PlayerVaults.getInstance().getDataFolder(), "vaults");
|
File file = PlayerVaults.getInstance().getVaultData();
|
||||||
if (!file.exists()) return;
|
if (!file.exists()) return;
|
||||||
|
|
||||||
long time = System.currentTimeMillis();
|
long time = System.currentTimeMillis();
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public final class UUIDConversion extends BukkitRunnable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
File newDir = new File(PlayerVaults.getInstance().getDataFolder(), "uuidvaults");
|
File newDir = PlayerVaults.getInstance().getVaultData();
|
||||||
if (newDir.exists()) {
|
if (newDir.exists()) {
|
||||||
PlayerVaults.getInstance().getLogger().log(Level.INFO, "Files already converted to UUID.");
|
PlayerVaults.getInstance().getLogger().log(Level.INFO, "Files already converted to UUID.");
|
||||||
return;
|
return;
|
||||||
@@ -38,7 +38,7 @@ public final class UUIDConversion extends BukkitRunnable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UUID uuid = player.getUniqueId();
|
UUID uuid = player.getUniqueId();
|
||||||
File newFile = new File(PlayerVaults.getInstance().getDataFolder(), "uuidvaults" + File.separator + uuid.toString() + ".yml");
|
File newFile = new File(PlayerVaults.getInstance().getVaultData(), uuid.toString() + ".yml");
|
||||||
file.mkdirs();
|
file.mkdirs();
|
||||||
try {
|
try {
|
||||||
Files.copy(file, newFile);
|
Files.copy(file, newFile);
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public enum Lang {
|
|||||||
INVALID_ARGS("invalid-args", "&cInvalid args!"),
|
INVALID_ARGS("invalid-args", "&cInvalid args!"),
|
||||||
DELETE_VAULT("delete-vault", "&fDeleted vault &a%v"),
|
DELETE_VAULT("delete-vault", "&fDeleted vault &a%v"),
|
||||||
DELETE_OTHER_VAULT("delete-other-vault", "&fDeleted vault &a%v &fof &a%p"),
|
DELETE_OTHER_VAULT("delete-other-vault", "&fDeleted vault &a%v &fof &a%p"),
|
||||||
PLAYER_ONLY("player-only", "Sorry but that can only be run by a player!"),
|
PLAYER_ONLY("player-only", "&cSorry but that can only be run by a player!"),
|
||||||
MUST_BE_NUMBER("must-be-number", "&cYou need to specify a number between 1-99"),
|
MUST_BE_NUMBER("must-be-number", "&cYou need to specify a number between 1-99"),
|
||||||
DELETE_VAULT_ERROR("delete-vault-error", "&cError deleting vault :("),
|
DELETE_VAULT_ERROR("delete-vault-error", "&cError deleting vault :("),
|
||||||
NO_PERMS("no-permissions", "&cYou don''t have permission for that!"),
|
NO_PERMS("no-permissions", "&cYou don''t have permission for that!"),
|
||||||
|
|||||||
@@ -38,10 +38,10 @@ public class Serialization {
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public static Map<String, Object> toMap(JSONObject object) throws JSONException {
|
public static Map<String, Object> toMap(JSONObject object) throws JSONException {
|
||||||
Map<String, Object> map = new HashMap<String, Object>();
|
Map<String, Object> map = new HashMap<>();
|
||||||
Iterator<String> keys = object.keys();
|
Iterator<String> keys = object.keys();
|
||||||
while (keys.hasNext()) {
|
while (keys.hasNext()) {
|
||||||
String key = (String) keys.next();
|
String key = keys.next();
|
||||||
map.put(key, fromJson(object.get(key)));
|
map.put(key, fromJson(object.get(key)));
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
@@ -60,7 +60,7 @@ public class Serialization {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<Object> toList(JSONArray array) throws JSONException {
|
public static List<Object> toList(JSONArray array) throws JSONException {
|
||||||
List<Object> list = new ArrayList<Object>();
|
List<Object> list = new ArrayList<>();
|
||||||
for (int i = 0; i < array.length(); i++) {
|
for (int i = 0; i < array.length(); i++) {
|
||||||
list.add(fromJson(array.get(i)));
|
list.add(fromJson(array.get(i)));
|
||||||
}
|
}
|
||||||
@@ -68,11 +68,9 @@ public class Serialization {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> toString(Inventory inv) {
|
public static List<String> toString(Inventory inv) {
|
||||||
List<String> result = new ArrayList<String>();
|
List<String> result = new ArrayList<>();
|
||||||
List<ConfigurationSerializable> items = new ArrayList<ConfigurationSerializable>();
|
List<ConfigurationSerializable> items = new ArrayList<>();
|
||||||
for (ItemStack is : inv.getContents()) {
|
Collections.addAll(items, inv.getContents());
|
||||||
items.add(is);
|
|
||||||
}
|
|
||||||
for (ConfigurationSerializable cs : items) {
|
for (ConfigurationSerializable cs : items) {
|
||||||
if (cs == null) {
|
if (cs == null) {
|
||||||
result.add("null");
|
result.add("null");
|
||||||
@@ -87,7 +85,7 @@ public class Serialization {
|
|||||||
VaultHolder holder = new VaultHolder(number);
|
VaultHolder holder = new VaultHolder(number);
|
||||||
Inventory inv = Bukkit.createInventory(holder, size, ChatColor.RED + "Vault #" + number);
|
Inventory inv = Bukkit.createInventory(holder, size, ChatColor.RED + "Vault #" + number);
|
||||||
holder.setInventory(inv);
|
holder.setInventory(inv);
|
||||||
List<ItemStack> contents = new ArrayList<ItemStack>();
|
List<ItemStack> contents = new ArrayList<>();
|
||||||
for (String piece : stringItems) {
|
for (String piece : stringItems) {
|
||||||
if (piece.equalsIgnoreCase("null")) {
|
if (piece.equalsIgnoreCase("null")) {
|
||||||
contents.add(null);
|
contents.add(null);
|
||||||
@@ -137,7 +135,7 @@ public class Serialization {
|
|||||||
return serialized;
|
return serialized;
|
||||||
}
|
}
|
||||||
public static Map<String, Object> recreateMap(Map<String, Object> original) {
|
public static Map<String, Object> recreateMap(Map<String, Object> original) {
|
||||||
Map<String, Object> map = new HashMap<String, Object>();
|
Map<String, Object> map = new HashMap<>();
|
||||||
map.putAll(original);
|
map.putAll(original);
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public class UUIDVaultManager {
|
|||||||
instance = this;
|
instance = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "uuidvaults";
|
private final File directory = PlayerVaults.getInstance().getVaultData();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Saves the inventory to the specified player and vault number.
|
* Saves the inventory to the specified player and vault number.
|
||||||
@@ -108,7 +108,7 @@ public class UUIDVaultManager {
|
|||||||
size = 54;
|
size = 54;
|
||||||
}
|
}
|
||||||
VaultViewInfo info = new VaultViewInfo(holder.toString(), number);
|
VaultViewInfo info = new VaultViewInfo(holder.toString(), number);
|
||||||
Inventory inv = null;
|
Inventory inv;
|
||||||
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
|
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
|
||||||
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
|
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
|
||||||
} else {
|
} else {
|
||||||
@@ -168,8 +168,7 @@ public class UUIDVaultManager {
|
|||||||
vaultHolder.setInventory(inv);
|
vaultHolder.setInventory(inv);
|
||||||
return inv;
|
return inv;
|
||||||
} else {
|
} else {
|
||||||
Inventory inv = Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(player));
|
return Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(player));
|
||||||
return inv;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,7 +187,7 @@ public class UUIDVaultManager {
|
|||||||
*/
|
*/
|
||||||
public void deleteVault(CommandSender sender, UUID holder, int number) throws IOException {
|
public void deleteVault(CommandSender sender, UUID holder, int number) throws IOException {
|
||||||
String name = holder.toString();
|
String name = holder.toString();
|
||||||
File file = new File(directory + File.separator + name.toLowerCase() + ".yml");
|
File file = new File(directory, name.toLowerCase() + ".yml");
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -217,11 +216,10 @@ public class UUIDVaultManager {
|
|||||||
* @return The holder's vault config file.
|
* @return The holder's vault config file.
|
||||||
*/
|
*/
|
||||||
public YamlConfiguration getPlayerVaultFile(UUID holder) {
|
public YamlConfiguration getPlayerVaultFile(UUID holder) {
|
||||||
File folder = new File(directory);
|
if (!directory.exists()) {
|
||||||
if (!folder.exists()) {
|
directory.mkdir();
|
||||||
folder.mkdir();
|
|
||||||
}
|
}
|
||||||
File file = new File(directory + File.separator + holder.toString() + ".yml");
|
File file = new File(directory, holder.toString() + ".yml");
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
try {
|
try {
|
||||||
file.createNewFile();
|
file.createNewFile();
|
||||||
@@ -229,8 +227,7 @@ public class UUIDVaultManager {
|
|||||||
// Who cares?
|
// Who cares?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
|
return YamlConfiguration.loadConfiguration(file);
|
||||||
return playerFile;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -242,9 +239,9 @@ public class UUIDVaultManager {
|
|||||||
* @throws IOException Uh oh!
|
* @throws IOException Uh oh!
|
||||||
*/
|
*/
|
||||||
public void saveFile(UUID holder, YamlConfiguration yaml) throws IOException {
|
public void saveFile(UUID holder, YamlConfiguration yaml) throws IOException {
|
||||||
File file = new File(directory + File.separator + holder.toString() + ".yml");
|
File file = new File(directory, holder.toString() + ".yml");
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
file.renameTo(new File(directory + File.separator + "backups" + File.separator + holder.toString() + ".yml"));
|
file.renameTo(new File(directory, "backups" + File.separator + holder.toString() + ".yml"));
|
||||||
}
|
}
|
||||||
yaml.save(file);
|
yaml.save(file);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ public class VaultManager {
|
|||||||
size = 54;
|
size = 54;
|
||||||
}
|
}
|
||||||
VaultViewInfo info = new VaultViewInfo(holder, number);
|
VaultViewInfo info = new VaultViewInfo(holder, number);
|
||||||
Inventory inv = null;
|
Inventory inv;
|
||||||
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
|
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
|
||||||
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
|
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
|
||||||
} else {
|
} else {
|
||||||
@@ -127,7 +127,7 @@ public class VaultManager {
|
|||||||
size = 54;
|
size = 54;
|
||||||
}
|
}
|
||||||
VaultViewInfo info = new VaultViewInfo(holder, number);
|
VaultViewInfo info = new VaultViewInfo(holder, number);
|
||||||
Inventory inv = null;
|
Inventory inv;
|
||||||
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
|
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
|
||||||
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
|
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
|
||||||
} else {
|
} else {
|
||||||
@@ -157,7 +157,7 @@ public class VaultManager {
|
|||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
private Inventory getInventory(YamlConfiguration playerFile, int size, int number) {
|
private Inventory getInventory(YamlConfiguration playerFile, int size, int number) {
|
||||||
List<String> data = new ArrayList<String>();
|
List<String> data = new ArrayList<>();
|
||||||
for (int x = 0; x < size; x++) {
|
for (int x = 0; x < size; x++) {
|
||||||
String line = playerFile.getString("vault" + number + "." + x);
|
String line = playerFile.getString("vault" + number + "." + x);
|
||||||
if (line != null) {
|
if (line != null) {
|
||||||
@@ -187,8 +187,7 @@ public class VaultManager {
|
|||||||
vaultHolder.setInventory(inv);
|
vaultHolder.setInventory(inv);
|
||||||
return inv;
|
return inv;
|
||||||
} else {
|
} else {
|
||||||
Inventory inv = Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(Bukkit.getPlayerExact(holder)));
|
return Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(Bukkit.getPlayerExact(holder)));
|
||||||
return inv;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,8 +246,7 @@ public class VaultManager {
|
|||||||
// Who cares?
|
// Who cares?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
|
return YamlConfiguration.loadConfiguration(file);
|
||||||
return playerFile;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ public class VaultOperations {
|
|||||||
number = Integer.parseInt(arg);
|
number = Integer.parseInt(arg);
|
||||||
if (number == 0) {
|
if (number == 0) {
|
||||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# PlayerVaults by drsthock and gomeow!
|
# PlayerVaults by drsthock and gomeow!
|
||||||
# http://dev.bukkit.org/server-mods/playervaults
|
# http://dev.bukkit.org/bukkit-plugins/playervaults/
|
||||||
# Made with love :3
|
# Made with love :3
|
||||||
|
|
||||||
# Whether or not you want to check for updates.
|
# Whether or not you want to check for updates.
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ open-vault: "&fOpening vault &a%v"
|
|||||||
open-other-vault: "&fOpening vault &a%v &fof &a%p"
|
open-other-vault: "&fOpening vault &a%v &fof &a%p"
|
||||||
delete-vault: "&fDeleted vault &a%v"
|
delete-vault: "&fDeleted vault &a%v"
|
||||||
delete-other-vault: "&fDeleted vault &a%v &fof &a%p"
|
delete-other-vault: "&fDeleted vault &a%v &fof &a%p"
|
||||||
player-only: "Sorry but that can only be run by a player!"
|
player-only: "&cSorry but that can only be run by a player!"
|
||||||
must-be-number: "&cYou need to specify a number between 1-99"
|
must-be-number: "&cYou need to specify a number between 1-99"
|
||||||
invalid-args: "&cInvalid args!"
|
invalid-args: "&cInvalid args!"
|
||||||
delete-vault-error: "&cError deleting vault :("
|
delete-vault-error: "&cError deleting vault :("
|
||||||
|
|||||||
Reference in New Issue
Block a user