cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continue adding signs support

Browse Source
This commit is contained in:
gomeow
2013-04-24 18:46:02 -07:00
parent b5fc36645e
commit 256a58fce8
5 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/Listeners.java
+32
View File
@@ -13,6 +13,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -145,6 +146,37 @@ public class Listeners implements Listener {
} else {
player.sendMessage(Lang.TITLE.toString() + Lang.NOT_A_SIGN);
}
return;
}
Block b = event.getClickedBlock();
if(event.getAction() == Action.RIGHT_CLICK_BLOCK) {
if(b.getType() == Material.WALL_SIGN || b.getType() == Material.SIGN_POST) {
Location l = b.getLocation();
String world = l.getWorld().getName();
int x = l.getBlockX();
int y = l.getBlockY();
int z = l.getBlockZ();
if(PlayerVaults.SIGNS.getKeys(false).contains(world + ";;" + x + ";;" + y + ";;" + z)) {
String owner = PlayerVaults.SIGNS.getString(world + ";;" + x + ";;" + y + ";;" + z + ".owner");
int num = PlayerVaults.SIGNS.getInt(world + ";;" + x + ";;" + y + ";;" + z + ".chest");
PlayerVaults.VM.loadVault(player, owner, num);
event.setCancelled(true);
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_WITH_SIGN.toString().replace("%v", String.valueOf(num)).replace("%p", owner));
}
}
}
}
@EventHandler
public void onBlockBreak(BlockBreakEvent event) {
Location l = event.getBlock().getLocation();
String world = l.getWorld().getName();
int x = l.getBlockX();
int y = l.getBlockY();
int z = l.getBlockZ();
if(PlayerVaults.SIGNS.getKeys(false).contains(world + ";;" + x + ";;" + y + ";;" + z)) {
PlayerVaults.SIGNS.set(world + ";;" + x + ";;" + y + ";;" + z, null);
plugin.saveSigns();
}
}
src/main/java/com/drtshock/playervaults/PlayerVaults.java
+3 -1
View File
@@ -16,6 +16,7 @@ import com.drtshock.playervaults.commands.Commands;
import com.drtshock.playervaults.util.Lang;
import com.drtshock.playervaults.util.Metrics;
import com.drtshock.playervaults.util.Updater;
import com.drtshock.playervaults.util.VaultManager;
public class PlayerVaults extends JavaPlugin {
@@ -33,6 +34,7 @@ public class PlayerVaults extends JavaPlugin {
public static YamlConfiguration SIGNS;
public static File SIGNS_FILE;
public static String DIRECTORY = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults";
public static VaultManager VM;
@Override
public void onEnable() {
@@ -69,7 +71,7 @@ public class PlayerVaults extends JavaPlugin {
}
new File(DIRECTORY + File.separator + "backups").mkdirs();
VM = new VaultManager(this);
}
public void startMetrics() {
src/main/java/com/drtshock/playervaults/commands/Commands.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class Commands implements CommandExecutor {
sender.sendMessage(Lang.TITLE.toString() + "Usage: /" + label + " <owner> <#>");
return true;
}
SET_SIGN.put(sender.getName(), new SignSetInfo(args[0], i));
SET_SIGN.put(sender.getName(), new SignSetInfo(args[0].toLowerCase(), i));
sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN);
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.INVALID_ARGS);
src/main/java/com/drtshock/playervaults/commands/VaultOperations.java
+4 -8
View File
@@ -9,13 +9,9 @@ import org.bukkit.entity.Player;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.util.EconomyOperations;
import com.drtshock.playervaults.util.Lang;
import com.drtshock.playervaults.util.VaultManager;
public class VaultOperations {
private static PlayerVaults PLUGIN;
private static VaultManager VAULT_MANAGER = new VaultManager(PLUGIN);
public static boolean checkPerms(CommandSender cs, int number) {
if(cs.hasPermission("playervaults.amount." + String.valueOf(number))) return true;
for(int x = number; x <= 99; x++) {
@@ -44,7 +40,7 @@ public class VaultOperations {
}
if(checkPerms(sender, number)) {
if(EconomyOperations.payToOpen(sender)) {
VAULT_MANAGER.loadVault(sender, sender.getName(), number);
PlayerVaults.VM.loadVault(sender, sender.getName(), number);
sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
return true;
} else {
@@ -79,7 +75,7 @@ public class VaultOperations {
} catch(NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
VAULT_MANAGER.loadVault(sender, user, number);
PlayerVaults.VM.loadVault(sender, user, number);
sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", user));
return true;
} else {
@@ -111,7 +107,7 @@ public class VaultOperations {
}
try {
if(EconomyOperations.refundOnDelete(sender, number)) {
VAULT_MANAGER.deleteVault(sender, sender.getName(), number);
PlayerVaults.VM.deleteVault(sender, sender.getName(), number);
return;
}
} catch(IOException e) {
@@ -143,7 +139,7 @@ public class VaultOperations {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
try {
VAULT_MANAGER.deleteVault(sender, user, number);
PlayerVaults.VM.deleteVault(sender, user, number);
} catch(IOException e) {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
}
src/main/java/com/drtshock/playervaults/util/Lang.java
+2 -1
View File
@@ -22,7 +22,8 @@ public enum Lang {
VAULT_DOES_NOT_EXIST("vault-does-not-exist", "&cThat vault does not exist!"),
CLICK_A_SIGN("click-a-sign", "&fNow click a sign!"),
NOT_A_SIGN("not-a-sign","&cYou must click a sign!"),
SET_SIGN("set-sign-success", "&fYou have successfully set a PlayerVault access sign!");
SET_SIGN("set-sign-success", "&fYou have successfully set a PlayerVault access sign!"),
OPEN_WITH_SIGN("open-with-sign", "&fOpening vault &a%v &fof &a%p");
private String path;
private String def; // Default string