From 2ba9656f48565ee31f89ce655a45e3c5bfe6beb4 Mon Sep 17 00:00:00 2001 From: gomeow Date: Tue, 27 Aug 2013 11:21:42 -0700 Subject: [PATCH] Fix a few things, remove bad code --- .../com/drtshock/playervaults/Listeners.java | 2 +- .../playervaults/commands/Commands.java | 4 +-- .../commands/VaultOperations.java | 26 +++++++++---------- .../playervaults/util/EconomyOperations.java | 26 +++++++++---------- .../playervaults/util/Serialization.java | 4 +-- .../drtshock/playervaults/util/Updater.java | 3 +-- .../playervaults/util/VaultManager.java | 13 +++++++--- 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/Listeners.java b/src/main/java/com/drtshock/playervaults/Listeners.java index c47c40f..11328ac 100644 --- a/src/main/java/com/drtshock/playervaults/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/Listeners.java @@ -169,7 +169,7 @@ public class Listeners implements Listener { if (!self) { owner = PlayerVaults.SIGNS.getString(world + ";;" + x + ";;" + y + ";;" + z + ".owner"); } - Inventory inv = PlayerVaults.VM.loadVault((self) ? player.getName() : owner, num, !player.hasPermission("playervaults.small")); + Inventory inv = PlayerVaults.VM.loadVault((self) ? player.getName() : owner, num); player.openInventory(inv); PlayerVaults.IN_VAULT.put(player.getName(), new VaultViewInfo((self) ? player.getName() : owner, num)); event.setCancelled(true); diff --git a/src/main/java/com/drtshock/playervaults/commands/Commands.java b/src/main/java/com/drtshock/playervaults/commands/Commands.java index e354bcf..eb66ed4 100644 --- a/src/main/java/com/drtshock/playervaults/commands/Commands.java +++ b/src/main/java/com/drtshock/playervaults/commands/Commands.java @@ -63,7 +63,7 @@ public class Commands implements CommandExecutor { if (sender.hasPermission("playervaults.signs.set")) { if (sender instanceof Player) { if (args.length == 1) { - int i = 0; + int i; try { i = Integer.parseInt(args[0]); } catch (NumberFormatException nfe) { @@ -74,7 +74,7 @@ public class Commands implements CommandExecutor { PlayerVaults.SET_SIGN.put(sender.getName(), new SignSetInfo(i)); sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN); } else if (args.length >= 2) { - int i = 0; + int i; try { i = Integer.parseInt(args[1]); } catch (NumberFormatException nfe) { diff --git a/src/main/java/com/drtshock/playervaults/commands/VaultOperations.java b/src/main/java/com/drtshock/playervaults/commands/VaultOperations.java index bd995d2..3490f1e 100644 --- a/src/main/java/com/drtshock/playervaults/commands/VaultOperations.java +++ b/src/main/java/com/drtshock/playervaults/commands/VaultOperations.java @@ -35,7 +35,7 @@ public class VaultOperations { */ public static boolean openOwnVault(Player player, String arg) { if (arg.matches("^[0-9]{1,2}$")) { - int number = 0; + int number; try { number = Integer.parseInt(arg); if (number == 0) @@ -45,9 +45,9 @@ public class VaultOperations { return false; } if (checkPerms(player, number)) { - if (EconomyOperations.payToOpen(player)) { + if (EconomyOperations.payToOpen(player, number)) { PlayerVaults.log.info(String.valueOf(player.hasPermission("playervaults.small"))); - Inventory inv = PlayerVaults.VM.loadVault(player.getName(), number, !player.hasPermission("playervaults.small")); + Inventory inv = PlayerVaults.VM.loadVault(player.getName(), number); player.openInventory(inv); player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg)); return true; @@ -82,7 +82,7 @@ public class VaultOperations { } catch (NumberFormatException nfe) { player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); } - Inventory inv = PlayerVaults.VM.loadVault(holder, number, true); + Inventory inv = PlayerVaults.VM.loadVault(holder, number); player.openInventory(inv); player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", holder)); return true; @@ -98,7 +98,6 @@ public class VaultOperations { /** * Delete a player's own vault. * @param player The player to delete. - * @param user The user to whom the deleted vault belongs. * @param arg The vault number to delete. */ public static void deleteOwnVault(Player player, String arg) { @@ -115,7 +114,6 @@ public class VaultOperations { try { if (EconomyOperations.refundOnDelete(player, number)) { PlayerVaults.VM.deleteVault(player, player.getName(), number); - return; } } catch (IOException e) { player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR); @@ -131,29 +129,29 @@ public class VaultOperations { * @param holder The user to whom the deleted vault belongs. * @param arg The vault number to delete. */ - public static void deleteOtherVault(CommandSender sender, String holder, String arg) { - if (sender.hasPermission("playervaults.delete")) { + public static void deleteOtherVault(CommandSender player, String holder, String arg) { + if (player.hasPermission("playervaults.delete")) { if (arg.matches("^[0-9]{1,2}$")) { int number = 0; try { number = Integer.parseInt(arg); if (number == 0) { - sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); + player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); return; } } catch (NumberFormatException nfe) { - sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); + player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); } try { - PlayerVaults.VM.deleteVault(sender, holder, number); + PlayerVaults.VM.deleteVault(player, holder, number); } catch (IOException e) { - sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR); + player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR); } } else { - sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER); + player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER); } } else { - sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS); + player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS); } } diff --git a/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java b/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java index b200c0c..2f42718 100644 --- a/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java +++ b/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java @@ -3,7 +3,6 @@ package com.drtshock.playervaults.util; import com.drtshock.playervaults.PlayerVaults; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import net.milkbowl.vault.economy.EconomyResponse; @@ -18,15 +17,14 @@ import org.bukkit.entity.Player; */ public class EconomyOperations { - private static File CONFIG_FILE; private static YamlConfiguration BUKKIT_CONFIG = new YamlConfiguration(); public static PlayerVaults PLUGIN; - public EconomyOperations(PlayerVaults instance) throws FileNotFoundException, IOException, InvalidConfigurationException { + public EconomyOperations(PlayerVaults instance) throws IOException, InvalidConfigurationException { PLUGIN = instance; - CONFIG_FILE = new File(PLUGIN.getDataFolder(), "config.yml"); - BUKKIT_CONFIG.load(CONFIG_FILE); + File config = new File(PLUGIN.getDataFolder(), "config.yml"); + BUKKIT_CONFIG.load(config); } /** @@ -34,17 +32,19 @@ public class EconomyOperations { * @param player The player to pay. * @return The transaction success. */ - public static boolean payToOpen(Player player) { + public static boolean payToOpen(Player player, int number) { if (!BUKKIT_CONFIG.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !PlayerVaults.USE_VAULT) return true; - - double cost = BUKKIT_CONFIG.getDouble("economy.cost-to-open", 10); - EconomyResponse resp = PlayerVaults.ECON.withdrawPlayer(player.getName(), cost); - if (resp.transactionSuccess()) { - player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_OPEN.toString().replaceAll("%price", "" + cost)); - return true; + if (PlayerVaults.VM.vaultExists(player.getName(), number)) { + return payToCreate(player); + } else { + double cost = BUKKIT_CONFIG.getDouble("economy.cost-to-create", 100); + EconomyResponse resp = PlayerVaults.ECON.withdrawPlayer(player.getName(), cost); + if (resp.transactionSuccess()) { + player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_OPEN.toString().replaceAll("%price", "" + cost)); + return true; + } } - return false; } diff --git a/src/main/java/com/drtshock/playervaults/util/Serialization.java b/src/main/java/com/drtshock/playervaults/util/Serialization.java index 6ee258e..ba69336 100644 --- a/src/main/java/com/drtshock/playervaults/util/Serialization.java +++ b/src/main/java/com/drtshock/playervaults/util/Serialization.java @@ -71,9 +71,9 @@ public class Serialization { return result; } - public static Inventory toInventory(List stringItems, int number, boolean large) { + public static Inventory toInventory(List stringItems, int number) { VaultHolder holder = new VaultHolder(number); - Inventory inv = Bukkit.createInventory(holder, (large) ? 54 : 27, ChatColor.RED + "Vault #" + number); + Inventory inv = Bukkit.createInventory(holder, 54, ChatColor.RED + "Vault #" + number); holder.setInventory(inv); List contents = new ArrayList(); for (String piece : stringItems) { diff --git a/src/main/java/com/drtshock/playervaults/util/Updater.java b/src/main/java/com/drtshock/playervaults/util/Updater.java index 02a6680..47c97d8 100644 --- a/src/main/java/com/drtshock/playervaults/util/Updater.java +++ b/src/main/java/com/drtshock/playervaults/util/Updater.java @@ -15,7 +15,7 @@ import org.xml.sax.SAXException; public class Updater { public Updater(String v) throws SAXException, IOException, ParserConfigurationException { - oldVersion = v.substring(0, 5); + String oldVersion = v.substring(0, 5); HttpURLConnection connection = (HttpURLConnection) new URL("http://dev.bukkit.org/projects/playervaults/files.rss").openConnection(); connection.setConnectTimeout(10000); connection.setReadTimeout(10000); @@ -31,7 +31,6 @@ public class Updater { update = !newVersion.equals(oldVersion); } - private String oldVersion; private String newVersion; private String link; private boolean update; diff --git a/src/main/java/com/drtshock/playervaults/util/VaultManager.java b/src/main/java/com/drtshock/playervaults/util/VaultManager.java index ef81b4a..b5c7c48 100644 --- a/src/main/java/com/drtshock/playervaults/util/VaultManager.java +++ b/src/main/java/com/drtshock/playervaults/util/VaultManager.java @@ -60,7 +60,7 @@ public class VaultManager { * @param holder The holder of the vault. * @param number The vault number. */ - public Inventory loadVault(String holder, int number, boolean large) { + public Inventory loadVault(String holder, int number) { VaultViewInfo info = new VaultViewInfo(holder, number); Inventory inv = null; if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) { @@ -73,7 +73,7 @@ public class VaultManager { vaultHolder.setInventory(inv); } else { List data = new ArrayList(); - for (int x = 0; x < ((large) ? 54 : 27); x++) { + for (int x = 0; x < 54; x++) { String line = playerFile.getString("vault" + number + "." + x); if (line != null) { data.add(line); @@ -81,7 +81,7 @@ public class VaultManager { data.add("null"); } } - inv = Serialization.toInventory(data, number, large); + inv = Serialization.toInventory(data, number); } PlayerVaults.OPENINVENTORIES.put(info.toString(), inv); } @@ -103,11 +103,16 @@ public class VaultManager { vaultHolder.setInventory(inv); return inv; } else { - Inventory inv = Serialization.toInventory(data, number, true); + Inventory inv = Serialization.toInventory(data, number); return inv; } } + public boolean vaultExists(String holder, int number) { + YamlConfiguration playerFile = getPlayerVaultFile(holder); + return playerFile.contains("vault" + number); + } + /** * Deletes a players vault. * @param sender The sender of whom to send messages to.