From 6f73e4549606e0de58241c5f39d3fd1c5d3c5543 Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Thu, 7 Mar 2013 13:29:10 -0600 Subject: [PATCH] Update commands Add delete other command. Allow console to delete vaults. Fix spacing :) --- .../playervaults/commands/Commands.class | Bin 3146 -> 3273 bytes .../playervaults/commands/Feedback$Type.class | Bin 1329 -> 1329 bytes .../playervaults/commands/Feedback.class | Bin 2091 -> 1857 bytes .../commands/VaultOperations.class | Bin 4485 -> 4048 bytes .../playervaults/util/VaultManager.class | Bin 4442 -> 4576 bytes .../playervaults/commands/Commands.java | 20 +++--- .../playervaults/commands/Feedback.java | 10 +-- .../commands/VaultOperations.java | 68 ++++++++---------- .../playervaults/util/VaultManager.java | 17 ++--- 9 files changed, 51 insertions(+), 64 deletions(-) diff --git a/bin/com/drtshock/playervaults/commands/Commands.class b/bin/com/drtshock/playervaults/commands/Commands.class index 3a62515675cbaf59c254dc4926b772e05e78b567..cb7627080345c56f575bd637f63b0473130a46aa 100644 GIT binary patch delta 486 zcmZ{gO-NKx7>1v7=FXj&+w`MW&QTXd655?i?u=j==teLGbSJn-2)a;%P{i+jndYI$+5NlH@HS>E7am|&V2qLPs~ raI=sV)rP delta 369 zcmXYrO-lj+5Qd*!*VSArj3AfFj36_uNIhj>hl0R+KS1bEm-+`G1%24}_9guQA&S00 zmLREPcIy;*>fSYokZLp!GxN?c^Stw9mi^7;pSuze=fs6-UF!YU@piX$<<_({FYC9q z`%P)maiN0}v`#%K<=v`y`h54M)6^U>Q`2HLvw1G8R-@O*MQ)h0StyXTl15-M6D^Wz z%NCi+GZT3vohKf7AU!6>r8DvEmQWhu`$yU=7YGYzwGQeLP*;m~E=vwNBxmqj6(hM6 z;+X+n2=mGyA4K_Nh%ZL?WmHj#DFG7r$waFH0U2WqPhuUn1 zT{KKq*kd23@Iwt{0RdX7BwR7lQFU1TMprx4Dp40{quvPaK-N?aIg;uTqj?rNo-qFa Dq`pd+ diff --git a/bin/com/drtshock/playervaults/commands/Feedback$Type.class b/bin/com/drtshock/playervaults/commands/Feedback$Type.class index 265ee14e5e874dba4a8c79dc4385b66df33bc2c8..d03af5fa5a7cc308bbf5d5e3cf332b63321e6e03 100644 GIT binary patch delta 35 qcmdnUwUKLsHH#o811|#?gA@ZdgE|8bg9!u2WFHn2MvlpiEE@o8NCp!C delta 35 pcmdnUwUKLsHH#n@11|$NgA@Y~gF299!oWG%hsA`Eb8;ig1^{cU1{nYV diff --git a/bin/com/drtshock/playervaults/commands/Feedback.class b/bin/com/drtshock/playervaults/commands/Feedback.class index 43988c65befc9b2637222875be4593e94808a4c4..2fcf9b5c8b3c6507d5145290ca06eba2e4ce0fbd 100644 GIT binary patch delta 123 zcmZ22aFCDd)W2Q(7#J9g8R9o`J!hHR%<96(GWi5+JTD)EECWAKoR7hhfq$|In-L@X zlz&o9bJVPufi@X0Sq*H0?V&dw~+Pt7aI zEUDBF$VseBEwa`O<6wwmWKfLEFI7lR%u_E>C@oG^D9OkyR>;f)(upMs85tyS8OF#U1-D2L!=}maS=<;|C!4Xx^YSyuG6(=&%FkfQATW6ms}Uo|~L3$g5`c8&;CWei`5MW}^1(IAqnt?$DXo4z(9+1Vuzz8H|7+ip+fYc;|$rOfE OAk77o^915F2T1_?y-pwi diff --git a/bin/com/drtshock/playervaults/commands/VaultOperations.class b/bin/com/drtshock/playervaults/commands/VaultOperations.class index a72b4c2772cd6383b6345f31694445a79b2b8a4a..bf9f4506756c982cdd8283a3ea25f564bc773446 100644 GIT binary patch delta 1639 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 S3gJ(bi1?Q8-}BvoAN~eYKDu@Q diff --git a/bin/com/drtshock/playervaults/util/VaultManager.class b/bin/com/drtshock/playervaults/util/VaultManager.class index a63238906249df92a3f83bb50b4d7c587991ccea..418f87296c8f7fa5191f17c2ec126ee154dbe3f1 100644 GIT binary patch delta 1072 zcmaiy+jCP@6oNtZk45(mHH>j-$qGACNX~DFmiuW7(=9^FcC5-E&J~%q+%U*ld+UxTB*8XkP?+wLLPYn%aONqXGE|(eUPjoEUv@_DLdyQqWL0+_Zi8YE~ zDZe8>>J&OMMaN>0BQ`mX>byT59#i<%Ka(4_h_J+B3$NL{j@DEDCt@dT-r!9|mGgAA zSSl*KO>6gBjPth1gd(9YSqa1DB=6`$OY#e#gq$0ipQvHw=+6l^ZBRJ0XE?@p&!%nXRO zaW30TF)gZ!8Qo+w9RrjZ|?PA=a>(CgQBs^Y*We zw+oLpZj}P{+$r(9*v{QN%0?dJ9^sNC%f0$a=s9&rw^pxcJDl{*6X}_!wrAZ{nr3-< zhQ(1|ndNn_$WdnX49Aj2)R^VfWL4BCb6h`P9p3*|(u|r)&2h?0{Lkz&3)yw=OX4(V z%kO8EOe{9nv(zMrCHAP1m(P6q&^_xA7lfYL`DbU z-E5|ZP7cbaI>J`Qc$f=p*DW>C^r!MMkX4uQ`aL;Ikay zn#6X~&ODz9zk`xfgXbn=CW9sslW{#>Q=dMzvsvU%;1~0G_dl^s6BZHiGKaX5dgqQ(Yl@dn0-7f#G5_~6ibi3!>m zTdPIe?G^7ir&OxE$E#ZP*_krVmZqLn?05}h3?9#v)Viy|;#OKXcs9=RrS*l+PGzv)-T z@`3{v2RWn&Ih#}IwzR@u`sp&0BXov2s;JaYBep*659(c!;r?SB*T*BPBPW>`=9D5X z(fFbWiZd2r41?blk=ag*)0Wz>wje?i=PfRIh^Czl z&9zQCy=txF-h0{N3Rm?NbByZNPfS~z(awoCEC$>zgRSeEQyX0$H!W_tCs}JYI;+~8 zI%m_IREr2q;f}>!{XF`Gx~yYXXI2gYY|6-`k`cP!+BB?)5XEFsLJ^-(PN}ZWdRCke z1CtmlNDD=zgwObz&soe=8ki>vG34Y@MTT9;zyNuT z17tUrU8l5<-M!@4fefQ#du7N_)JsP)Xb1b)mkim#4EiVycE~M=&5+zN8D>gWhQrCQ z9agHJ6Mo7E^-lNE?h3}vidGNjGBn4!WI0&W&!0YQPxY@Z^53iSimttFz{~2Ee*IL) zIDx2)Uka74gwqTXREyi0EMOLm%w{Jw?2%v7!8|T9zlFG@*S|F^#g(!X>$J07fVit3 ziTS)$JqzWM5a;<@&H^I8gX{bwxDssT2Qm^{Ko!083I3f@GZf!zI>M|AlNaWQ&d)Av z@2C~7x)VdD{-qz%?O~)CD;M@My+^q&?v=%4`gds;W-{Qu!|k|BUY6IS-T8bYR;CP+ zD8rN%YUNGq7%q`Kz7+kk8n}L{@r)%Y+xg=^f#O$IvC5kWQ9JWx3FEY5K*; I15fMW8)%Q>_y7O^ diff --git a/src/com/drtshock/playervaults/commands/Commands.java b/src/com/drtshock/playervaults/commands/Commands.java index 437b047..e65eb19 100644 --- a/src/com/drtshock/playervaults/commands/Commands.java +++ b/src/com/drtshock/playervaults/commands/Commands.java @@ -36,18 +36,22 @@ public class Commands implements CommandExecutor { } else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); } + else if(cmd.getName().equalsIgnoreCase("pvdel")) { - if(sender instanceof Player) { - Player p = (Player) sender; - switch(args.length) { - case 1: + switch(args.length) { + case 1: + if(sender instanceof Player) { + Player p = (Player) sender; VaultOperations.deleteOwnVault(p, args[0]); - break; - default: - Feedback.showHelp(sender, Feedback.Type.DELETE); } + else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); + break; + case 2: + VaultOperations.deleteOtherVault(sender, args[0], args[1]); + break; + default: + Feedback.showHelp(sender, Feedback.Type.DELETE); } - else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); } return true; } diff --git a/src/com/drtshock/playervaults/commands/Feedback.java b/src/com/drtshock/playervaults/commands/Feedback.java index 7bbe0fa..2f33a0e 100644 --- a/src/com/drtshock/playervaults/commands/Feedback.java +++ b/src/com/drtshock/playervaults/commands/Feedback.java @@ -2,7 +2,6 @@ package com.drtshock.playervaults.commands; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; public class Feedback { @@ -14,12 +13,12 @@ public class Feedback { } static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; - + public static void noPerms(CommandSender sender) { sender.sendMessage(pv + "You don't have permission for that!"); return; } - + public static void showHelp(CommandSender sender, Type t) { if(t == Type.OPEN) { @@ -31,9 +30,4 @@ public class Feedback { sender.sendMessage(pv + "/pvdel "); } } - - public static void badWorld(Player sender) { - sender.sendMessage(pv + "You can't use this in that world!"); - return; - } } diff --git a/src/com/drtshock/playervaults/commands/VaultOperations.java b/src/com/drtshock/playervaults/commands/VaultOperations.java index 0e1f2bb..9e7bae7 100644 --- a/src/com/drtshock/playervaults/commands/VaultOperations.java +++ b/src/com/drtshock/playervaults/commands/VaultOperations.java @@ -4,7 +4,6 @@ import java.io.IOException; import org.bukkit.ChatColor; -import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -19,44 +18,39 @@ public class VaultOperations { static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; - + public static boolean checkPerms(CommandSender cs, int number) { - if(cs.hasPermission("playervaults.amount."+String.valueOf(number))) return true; + if(cs.hasPermission("playervaults.amount." + String.valueOf(number))) return true; for(int x = number; x <= 99;x++) { - if(cs.hasPermission("playervaults.amount."+String.valueOf(x))) return true; + if(cs.hasPermission("playervaults.amount." + String.valueOf(x))) return true; } return false; } /* - * TODO: Chenge how permissions are checked here. + * TODO: Change how permissions are checked here. */ public static boolean openOwnVault(Player sender, String arg) { - if(allowedWorld(sender)) { - if(arg.matches("^[0-9]{1,2}$")) { - int number = 0; - try { - number = Integer.parseInt(arg); - } - catch(NumberFormatException nfe) { - sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!"); - return false; - } - if(checkPerms(sender, number)) { - vm.loadVault(sender, sender.getName(), number); - sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); - return true; - } else { - Feedback.noPerms(sender); - } + if(arg.matches("^[0-9]{1,2}$")) { + int number = 0; + try { + number = Integer.parseInt(arg); + } + catch(NumberFormatException nfe) { + sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); + return false; + } + if(checkPerms(sender, number)) { + vm.loadVault(sender, sender.getName(), number); + sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); + return true; + } else { + Feedback.noPerms(sender); } - } - else { - Feedback.badWorld(sender); } return false; } - - + + public static boolean openOtherVault(Player sender, String user, String arg) { if(sender.hasPermission("playervaults.admin")) { if(arg.matches("^[0-9]{1,2}$")) { @@ -65,7 +59,7 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!"); + sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); } vm.loadVault(sender, user, number); sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); @@ -74,7 +68,7 @@ public class VaultOperations { else { Feedback.noPerms(sender); } - } + } return false; } public static void deleteOwnVault(Player sender, String arg) { @@ -84,16 +78,16 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!"); + sender.sendMessage(pv+ChatColor.RED + "You need to specify a number!"); } try { vm.deleteVault(sender, sender.getName(), number); } catch (IOException e) { - sender.sendMessage(pv+"There was an error deleting that vault!"); + sender.sendMessage(pv + "There was an error deleting that vault!"); } } } - public static void deleteOtherVault(Player sender, String user, String arg) { + public static void deleteOtherVault(CommandSender sender, String user, String arg) { if(sender.hasPermission("playervaults.delete")) { if(arg.matches("^[0-9]{1,2}$")) { int number = 0; @@ -101,22 +95,16 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!"); + sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); } try { vm.deleteVault(sender, user, number); } catch (IOException e) { - sender.sendMessage(pv+"There was an error deleting that vault!"); + sender.sendMessage(pv + "There was an error deleting that vault!"); } } } else Feedback.noPerms(sender); } - private static boolean allowedWorld(Player player) { - World world = player.getWorld(); - if(plugin.disabledWorlds().contains(world)) - return false; - return true; - } } diff --git a/src/com/drtshock/playervaults/util/VaultManager.java b/src/com/drtshock/playervaults/util/VaultManager.java index b2731b5..1120c8e 100644 --- a/src/com/drtshock/playervaults/util/VaultManager.java +++ b/src/com/drtshock/playervaults/util/VaultManager.java @@ -6,6 +6,7 @@ import java.io.IOException; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; @@ -20,7 +21,7 @@ public class VaultManager { public VaultManager(Main instance) { this.plugin = instance; } - + String title; private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults"; @@ -32,11 +33,11 @@ public class VaultManager { * @throws IOException */ public void saveVault(Inventory inv, String player, int number) throws IOException { - // Get the player's file and serialize the inventory. - String ser = Serialization.toBase64(inv); - YamlConfiguration yaml = playerVaultFile(player); - yaml.set("vault" + number + "", ser); - saveFile(player, yaml); + // Get the player's file and serialize the inventory. + String ser = Serialization.toBase64(inv); + YamlConfiguration yaml = playerVaultFile(player); + yaml.set("vault" + number + "", ser); + saveFile(player, yaml); } /** @@ -58,7 +59,7 @@ public class VaultManager { } } - public void deleteVault(Player sender, String target, int number) throws IOException { + public void deleteVault(CommandSender sender, String target, int number) throws IOException { String name = target.toLowerCase(); File file = new File(directory + name + ".yml"); FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file); @@ -89,7 +90,7 @@ public class VaultManager { YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file); return playerFile; } - + public void saveFile(String name, YamlConfiguration yaml) throws IOException { File file = new File(directory + File.separator + name.toLowerCase() + ".yml"); yaml.save(file);