Add configurable vault sizes. Recoded PR 17 to optimize permission checks and put things in correct classes. Updated to version 3.4.0-SNAPSHOT
This commit is contained in:
drtshock
@@ -1,5 +1,7 @@
|
||||
package com.drtshock.playervaults.commands;
|
||||
|
||||
import com.drtshock.playervaults.vaultmanagement.VaultOperations;
|
||||
import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
|
||||
import com.drtshock.playervaults.PlayerVaults;
|
||||
import com.drtshock.playervaults.util.Lang;
|
||||
|
||||
@@ -18,18 +20,22 @@ public class Commands implements CommandExecutor {
|
||||
Player p = (Player) sender;
|
||||
switch (args.length) {
|
||||
case 1:
|
||||
if (VaultOperations.openOwnVault(p, args[0]))
|
||||
if (VaultOperations.openOwnVault(p, args[0])) {
|
||||
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(sender.getName(), Integer.parseInt(args[0])));
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (VaultOperations.openOtherVault(p, args[0], args[1]))
|
||||
if (VaultOperations.openOtherVault(p, args[0], args[1])) {
|
||||
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(args[0], Integer.parseInt(args[1])));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
sender.sendMessage(Lang.TITLE + "/pv <number>");
|
||||
sender.sendMessage(Lang.TITLE + "/pv <player> <number>");
|
||||
}
|
||||
} else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
|
||||
} else {
|
||||
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
|
||||
}
|
||||
} else if (cmd.getName().equalsIgnoreCase("pvdel")) {
|
||||
switch (args.length) {
|
||||
case 1:
|
||||
|
||||
@@ -12,6 +12,7 @@ public class SignSetInfo {
|
||||
|
||||
/**
|
||||
* Construct a SignSetInfo object for another person.
|
||||
*
|
||||
* @param s The vault owner.
|
||||
* @param i The vault number.
|
||||
*/
|
||||
@@ -22,6 +23,7 @@ public class SignSetInfo {
|
||||
|
||||
/**
|
||||
* Construct a SignSetInfo object for opening to self.
|
||||
*
|
||||
* @param i The vault number.
|
||||
*/
|
||||
public SignSetInfo(int i) {
|
||||
@@ -30,7 +32,9 @@ public class SignSetInfo {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get whether or not the sign will open their own vault or another person's.
|
||||
* Get whether or not the sign will open their own vault or another
|
||||
* person's.
|
||||
*
|
||||
* @return Whether or not it is a 'self' sign.
|
||||
*/
|
||||
public boolean isSelf() {
|
||||
@@ -39,6 +43,7 @@ public class SignSetInfo {
|
||||
|
||||
/**
|
||||
* Get the owner of the vault.
|
||||
*
|
||||
* @return The owner of the vault.
|
||||
*/
|
||||
public String getOwner() {
|
||||
@@ -47,10 +52,10 @@ public class SignSetInfo {
|
||||
|
||||
/**
|
||||
* Get the vault number.
|
||||
*
|
||||
* @return The vault number.
|
||||
*/
|
||||
public int getChest() {
|
||||
return this.number;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
package com.drtshock.playervaults.commands;
|
||||
|
||||
import com.drtshock.playervaults.PlayerVaults;
|
||||
import static com.drtshock.playervaults.PlayerVaults.LOG;
|
||||
import com.drtshock.playervaults.util.EconomyOperations;
|
||||
import com.drtshock.playervaults.util.Lang;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
|
||||
public class VaultOperations {
|
||||
|
||||
/**
|
||||
* Check whether or not the player has permission to open the requested vault.
|
||||
* @param sender The person to check.
|
||||
* @param number The vault number.
|
||||
* @return Whether or not they have permission.
|
||||
*/
|
||||
public static boolean checkPerms(CommandSender sender, int number) {
|
||||
if (sender.hasPermission("playervaults.amount." + String.valueOf(number))) return true;
|
||||
for (int x = number; x <= 99; x++) {
|
||||
if (sender.hasPermission("playervaults.amount." + String.valueOf(x))) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Open a player's own vault.
|
||||
* @param player The player to open to.
|
||||
* @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) {
|
||||
if (arg.matches("^[0-9]{1,2}$")) {
|
||||
int number;
|
||||
try {
|
||||
number = Integer.parseInt(arg);
|
||||
if (number == 0)
|
||||
return false;
|
||||
} catch (NumberFormatException nfe) {
|
||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
||||
return false;
|
||||
}
|
||||
if (checkPerms(player, number)) {
|
||||
if (EconomyOperations.payToOpen(player, number)) {
|
||||
PlayerVaults.LOG.info(String.valueOf(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;
|
||||
} else {
|
||||
player.sendMessage(Lang.TITLE.toString() + Lang.INSUFFICIENT_FUNDS);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
|
||||
}
|
||||
} else {
|
||||
player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Open another player's vault.
|
||||
* @param player The player to open to.
|
||||
* @param holder The user to whom the requested vault belongs.
|
||||
* @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 holder, String arg) {
|
||||
if (player.hasPermission("playervaults.admin")) {
|
||||
if (arg.matches("^[0-9]{1,2}$")) {
|
||||
int number = 0;
|
||||
try {
|
||||
number = Integer.parseInt(arg);
|
||||
if (number == 0)
|
||||
return false;
|
||||
} catch (NumberFormatException nfe) {
|
||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
||||
}
|
||||
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;
|
||||
} else {
|
||||
player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
|
||||
}
|
||||
} else {
|
||||
player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete a player's own vault.
|
||||
* @param player The player to delete.
|
||||
* @param arg The vault number to delete.
|
||||
*/
|
||||
public static void deleteOwnVault(Player player, String arg) {
|
||||
if (arg.matches("^[0-9]{1,2}$")) {
|
||||
int number = 0;
|
||||
try {
|
||||
number = Integer.parseInt(arg);
|
||||
if (number == 0)
|
||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
||||
return;
|
||||
} catch (NumberFormatException nfe) {
|
||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
||||
}
|
||||
try {
|
||||
if (EconomyOperations.refundOnDelete(player, number)) {
|
||||
PlayerVaults.VM.deleteVault(player, player.getName(), number);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
|
||||
}
|
||||
} else {
|
||||
player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete a player's vault.
|
||||
* @param sender The sender executing the deletion.
|
||||
* @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")) {
|
||||
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);
|
||||
return;
|
||||
}
|
||||
} catch (NumberFormatException nfe) {
|
||||
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
|
||||
}
|
||||
try {
|
||||
PlayerVaults.VM.deleteVault(sender, holder, number);
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
package com.drtshock.playervaults.commands;
|
||||
|
||||
/**
|
||||
* A class that stores information about a vault viewing including the holder of the vault,
|
||||
* and the vault number.
|
||||
*/
|
||||
public class VaultViewInfo {
|
||||
|
||||
String holder;
|
||||
int number;
|
||||
|
||||
/**
|
||||
* Make a VaultViewObject
|
||||
* @param s The holder of the vault.
|
||||
* @param i The vault number.
|
||||
*/
|
||||
public VaultViewInfo(String s, int i) {
|
||||
this.holder = s;
|
||||
this.number = i;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the holder of the vault.
|
||||
* @return The holder of the vault.
|
||||
*/
|
||||
public String getHolder() {
|
||||
return this.holder;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the vault number.
|
||||
* @return The vault number.
|
||||
*/
|
||||
public int getNumber() {
|
||||
return this.number;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.holder + " " + this.number;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user