diff --git a/pom.xml b/pom.xml index 81735ce..fc604d2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,24 +1,24 @@ 4.0.0 + com.drtshock PlayerVaults 3.5.0-SNAPSHOT PlayerVaults - http://dev.bukkit.org/server-mods/playervaults/ + http://dev.bukkit.org/bukkit-plugins/playervaults/ UTF-8 + - clean package install + clean install PlayerVaults - ${basedir}/src/main/java - . true - ${basedir}/src/main/resources/ + src/main/resources/ *.yml @@ -33,55 +33,30 @@ 1.7 - - maven-assembly-plugin - - - src/main/assembly/package.xml - - - - - build - package - - single - - - - + + + + bukkit-repo + http://repo.bukkit.org/content/groups/public/ + + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases/ + + + org.bukkit bukkit LATEST - - org.bukkit - craftbukkit - LATEST - net.milkbowl.vault Vault 1.2.32 - - org.codehaus.jackson - jackson-core-asl - 1.9.12 - - - - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - - - vault-repo - http://nexus.theyeticave.net/content/repositories/pub_releases/ - - diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml deleted file mode 100644 index 8d59a5f..0000000 --- a/src/main/assembly/package.xml +++ /dev/null @@ -1,13 +0,0 @@ - - bin - false - - - ${project.build.directory}/${artifactId}.jar - / - ${project.name}.jar - - - \ No newline at end of file diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java index 03178f2..5c91a70 100644 --- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java +++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java @@ -57,7 +57,6 @@ public class PlayerVaults extends JavaPlugin { private int inventoriesToDrop = 0; private YamlConfiguration signs; private File signsFile; - private Listeners listener; private String name = ""; @Override @@ -66,7 +65,7 @@ public class PlayerVaults extends JavaPlugin { getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUID first. Class checks if necessary. loadLang(); new UUIDVaultManager(); - getServer().getPluginManager().registerEvents(listener = new Listeners(this), this); + getServer().getPluginManager().registerEvents(new Listeners(this), this); loadConfig(); loadSigns(); checkUpdate(); @@ -248,7 +247,7 @@ public class PlayerVaults extends JavaPlugin { lang.createNewFile(); if (defLangStream != null) { out = new FileOutputStream(lang); - int read = 0; + int read; byte[] bytes = new byte[1024]; while ((read = defLangStream.read(bytes)) != -1) { @@ -322,7 +321,11 @@ public class PlayerVaults extends JavaPlugin { } public Economy getEconomy() { - return this.econ; + return econ; + } + + public File getVaultData() { + return new File(this.getDataFolder(), "uuidvaults"); } public static PlayerVaults getInstance() { diff --git a/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java b/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java index 360544f..747d80c 100644 --- a/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java +++ b/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java @@ -23,7 +23,7 @@ public class DeleteCommand implements CommandExecutor { case 2: Player player = Bukkit.getPlayer(args[0]); 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; } diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index bde0582..b21dbfa 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -43,13 +43,12 @@ import java.io.IOException; public class Listeners implements Listener { public PlayerVaults plugin; + UUIDVaultManager vm = UUIDVaultManager.getInstance(); public Listeners(PlayerVaults playerVaults) { this.plugin = playerVaults; } - UUIDVaultManager vm = UUIDVaultManager.getInstance(); - public void saveVault(Player player) { if (PlayerVaults.getInstance().getInVault().containsKey(player.getName())) { Inventory inv = player.getOpenInventory().getTopInventory(); @@ -58,7 +57,9 @@ public class Listeners implements Listener { try { vm.saveVault(inv, player.getUniqueId(), info.getNumber()); } catch (IOException e) { + // ignore } + PlayerVaults.getInstance().getOpenInventories().remove(info.toString()); } PlayerVaults.getInstance().getInVault().remove(player.getName()); @@ -72,31 +73,28 @@ public class Listeners implements Listener { @EventHandler public void onQuit(PlayerQuitEvent event) { - Player player = event.getPlayer(); - saveVault(player); + saveVault(event.getPlayer()); } @EventHandler public void onJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); 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!"); } } @EventHandler public void onDeath(PlayerDeathEvent event) { - Player player = event.getEntity(); - saveVault(player); + saveVault(event.getEntity()); } @EventHandler public void onClose(InventoryCloseEvent event) { HumanEntity he = event.getPlayer(); if (he instanceof Player) { - Player player = (Player) he; - saveVault(player); + saveVault((Player) he); } } @@ -137,7 +135,7 @@ public class Listeners implements Listener { int y = l.getBlockY(); int z = l.getBlockZ(); if (self) { - plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".self", self); + plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".self", true); } else { plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".owner", owner); } diff --git a/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java b/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java index 52a5e4b..7a04862 100644 --- a/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java +++ b/src/main/java/com/drtshock/playervaults/tasks/Cleanup.java @@ -13,10 +13,9 @@ public class Cleanup extends BukkitRunnable { this.diff = diff * 86400; } - @Override public void run() { - File file = new File(PlayerVaults.getInstance().getDataFolder(), "vaults"); + File file = PlayerVaults.getInstance().getVaultData(); if (!file.exists()) return; long time = System.currentTimeMillis(); diff --git a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java index 7a6568c..3125f42 100644 --- a/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java +++ b/src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java @@ -18,7 +18,7 @@ public final class UUIDConversion extends BukkitRunnable { @Override public void run() { - File newDir = new File(PlayerVaults.getInstance().getDataFolder(), "uuidvaults"); + File newDir = PlayerVaults.getInstance().getVaultData(); if (newDir.exists()) { PlayerVaults.getInstance().getLogger().log(Level.INFO, "Files already converted to UUID."); return; @@ -38,7 +38,7 @@ public final class UUIDConversion extends BukkitRunnable { } 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(); try { Files.copy(file, newFile); diff --git a/src/main/java/com/drtshock/playervaults/util/Lang.java b/src/main/java/com/drtshock/playervaults/util/Lang.java index a220c86..4cef941 100644 --- a/src/main/java/com/drtshock/playervaults/util/Lang.java +++ b/src/main/java/com/drtshock/playervaults/util/Lang.java @@ -30,7 +30,7 @@ public enum Lang { INVALID_ARGS("invalid-args", "&cInvalid args!"), DELETE_VAULT("delete-vault", "&fDeleted vault &a%v"), 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"), DELETE_VAULT_ERROR("delete-vault-error", "&cError deleting vault :("), NO_PERMS("no-permissions", "&cYou don''t have permission for that!"), diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java index ebc25cc..507dfe2 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java @@ -38,10 +38,10 @@ public class Serialization { @SuppressWarnings("unchecked") public static Map toMap(JSONObject object) throws JSONException { - Map map = new HashMap(); + Map map = new HashMap<>(); Iterator keys = object.keys(); while (keys.hasNext()) { - String key = (String) keys.next(); + String key = keys.next(); map.put(key, fromJson(object.get(key))); } return map; @@ -60,7 +60,7 @@ public class Serialization { } public static List toList(JSONArray array) throws JSONException { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < array.length(); i++) { list.add(fromJson(array.get(i))); } @@ -68,11 +68,9 @@ public class Serialization { } public static List toString(Inventory inv) { - List result = new ArrayList(); - List items = new ArrayList(); - for (ItemStack is : inv.getContents()) { - items.add(is); - } + List result = new ArrayList<>(); + List items = new ArrayList<>(); + Collections.addAll(items, inv.getContents()); for (ConfigurationSerializable cs : items) { if (cs == null) { result.add("null"); @@ -87,7 +85,7 @@ public class Serialization { VaultHolder holder = new VaultHolder(number); Inventory inv = Bukkit.createInventory(holder, size, ChatColor.RED + "Vault #" + number); holder.setInventory(inv); - List contents = new ArrayList(); + List contents = new ArrayList<>(); for (String piece : stringItems) { if (piece.equalsIgnoreCase("null")) { contents.add(null); @@ -137,7 +135,7 @@ public class Serialization { return serialized; } public static Map recreateMap(Map original) { - Map map = new HashMap(); + Map map = new HashMap<>(); map.putAll(original); return map; } diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java index c13d831..f0e48e7 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java @@ -27,7 +27,7 @@ public class UUIDVaultManager { 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. @@ -108,7 +108,7 @@ public class UUIDVaultManager { size = 54; } VaultViewInfo info = new VaultViewInfo(holder.toString(), number); - Inventory inv = null; + Inventory inv; if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) { inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString()); } else { @@ -168,8 +168,7 @@ public class UUIDVaultManager { vaultHolder.setInventory(inv); return inv; } else { - Inventory inv = Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(player)); - return inv; + return Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(player)); } } @@ -188,7 +187,7 @@ public class UUIDVaultManager { */ 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"); + File file = new File(directory, name.toLowerCase() + ".yml"); if (!file.exists()) { return; } @@ -217,11 +216,10 @@ public class UUIDVaultManager { * @return The holder's vault config file. */ public YamlConfiguration getPlayerVaultFile(UUID holder) { - File folder = new File(directory); - if (!folder.exists()) { - folder.mkdir(); + if (!directory.exists()) { + directory.mkdir(); } - File file = new File(directory + File.separator + holder.toString() + ".yml"); + File file = new File(directory, holder.toString() + ".yml"); if (!file.exists()) { try { file.createNewFile(); @@ -229,8 +227,7 @@ public class UUIDVaultManager { // Who cares? } } - YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file); - return playerFile; + return YamlConfiguration.loadConfiguration(file); } /** @@ -242,9 +239,9 @@ public class UUIDVaultManager { * @throws IOException Uh oh! */ 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()) { - 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); } diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java index 8cc201b..dfac8cb 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java @@ -85,7 +85,7 @@ public class VaultManager { size = 54; } VaultViewInfo info = new VaultViewInfo(holder, number); - Inventory inv = null; + Inventory inv; if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) { inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString()); } else { @@ -127,7 +127,7 @@ public class VaultManager { size = 54; } VaultViewInfo info = new VaultViewInfo(holder, number); - Inventory inv = null; + Inventory inv; if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) { inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString()); } else { @@ -157,7 +157,7 @@ public class VaultManager { */ @Deprecated private Inventory getInventory(YamlConfiguration playerFile, int size, int number) { - List data = new ArrayList(); + List data = new ArrayList<>(); for (int x = 0; x < size; x++) { String line = playerFile.getString("vault" + number + "." + x); if (line != null) { @@ -187,8 +187,7 @@ public class VaultManager { vaultHolder.setInventory(inv); return inv; } else { - Inventory inv = Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(Bukkit.getPlayerExact(holder))); - return inv; + return Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(Bukkit.getPlayerExact(holder))); } } @@ -247,8 +246,7 @@ public class VaultManager { // Who cares? } } - YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file); - return playerFile; + return YamlConfiguration.loadConfiguration(file); } /** diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java index c8a77fc..b8a49fa 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java @@ -148,7 +148,7 @@ public class VaultOperations { number = Integer.parseInt(arg); if (number == 0) { player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); - return; + return; } } catch (NumberFormatException nfe) { player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 1cdf08a..4786702 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,5 @@ # PlayerVaults by drsthock and gomeow! -# http://dev.bukkit.org/server-mods/playervaults +# http://dev.bukkit.org/bukkit-plugins/playervaults/ # Made with love :3 # Whether or not you want to check for updates. diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index c829992..ee2dea5 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -9,7 +9,7 @@ open-vault: "&fOpening vault &a%v" open-other-vault: "&fOpening vault &a%v &fof &a%p" delete-vault: "&fDeleted vault &a%v" 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" invalid-args: "&cInvalid args!" delete-vault-error: "&cError deleting vault :("