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

Start working on the lang.yml feature

Browse Source
This commit is contained in:
gomeow
2013-03-08 12:05:43 -08:00
parent 93999a4517
commit 2f7c699b22
6 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang.yml
+3 -3
View File
@@ -2,12 +2,12 @@
# %p is where the player name will get inserted. # %p is where the player name will get inserted.
# %v is where the vault number will get inserted. # %v is where the vault number will get inserted.
# Made with love :) # Made with love :)
title-name: "&4[&fPlayerVaults&4]" title-name: "&4[&fPlayerVaults&4]: "
open-vault: "&fOpening vault &a%v" open-vault: "&fOpening vault &a%v"
open-other-vault: "&fOpening vault &a%v &fof &a%p" open-other-vault: "&fOpening vault &a%v &fof &a%p"
delete-vault: "&fDeleted vault &a%v" delete-vault: "&fDeleted vault &a%v"
delete-other-vault: "&fDeleted vault &a%v &fof &a%p" delete-other-vault: "&fDeleted vault &a%v &fof &a%p"
player-only: player-only: "Sorry but that can only be run by a player!"
must-be-number: must-be-number: "You need to specify a number"
invalid-args: "&fInvalid args!" invalid-args: "&fInvalid args!"
delete-vault-error: delete-vault-error:
src/com/drtshock/playervaults/Main.java
+5 -5
View File
@@ -21,16 +21,14 @@ public class Main extends JavaPlugin {
public Logger log; public Logger log;
public static boolean update = false; public static boolean update = false;
public static String name = ""; public static String name = "";
Commands commands = new Commands(); Commands commands;
@Override @Override
public void onEnable() { public void onEnable() {
loadLang();
log = getServer().getLogger(); log = getServer().getLogger();
getServer().getPluginManager().registerEvents(new Listeners(this), this); getServer().getPluginManager().registerEvents(new Listeners(this), this);
getCommand("pv").setExecutor(commands);
getCommand("pvdel").setExecutor(commands);
loadConfig(); loadConfig();
loadLang();
startMetrics(); startMetrics();
Updater u = new Updater(); Updater u = new Updater();
@@ -40,7 +38,9 @@ public class Main extends JavaPlugin {
name = u.getNewVersion(); name = u.getNewVersion();
} }
} catch (Exception e) {} } catch (Exception e) {}
commands = new Commands();
getCommand("pv").setExecutor(commands);
getCommand("pvdel").setExecutor(commands);
} }
public void startMetrics() { public void startMetrics() {
src/com/drtshock/playervaults/commands/Commands.java
+4 -4
View File
@@ -8,12 +8,12 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.drtshock.playervaults.util.Lang;
public class Commands implements CommandExecutor { public class Commands implements CommandExecutor {
public static HashMap<String, VaultViewInfo> inVault = new HashMap<String, VaultViewInfo>(); public static HashMap<String, VaultViewInfo> inVault = new HashMap<String, VaultViewInfo>();
private final String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" +
ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
@@ -34,7 +34,7 @@ public class Commands implements CommandExecutor {
Feedback.showHelp(sender, Feedback.Type.OPEN); Feedback.showHelp(sender, Feedback.Type.OPEN);
} }
} }
else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
} }
else if(cmd.getName().equalsIgnoreCase("pvdel")) { else if(cmd.getName().equalsIgnoreCase("pvdel")) {
@@ -44,7 +44,7 @@ public class Commands implements CommandExecutor {
Player p = (Player) sender; Player p = (Player) sender;
VaultOperations.deleteOwnVault(p, args[0]); VaultOperations.deleteOwnVault(p, args[0]);
} }
else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
break; break;
case 2: case 2:
VaultOperations.deleteOtherVault(sender, args[0], args[1]); VaultOperations.deleteOtherVault(sender, args[0], args[1]);
src/com/drtshock/playervaults/commands/VaultOperations.java
+9 -10
View File
@@ -15,8 +15,6 @@ public class VaultOperations {
private static Main plugin; private static Main plugin;
private static VaultManager vm = new VaultManager(plugin); private static VaultManager vm = new VaultManager(plugin);
static String pv = Lang.TITLE.toString();
public static boolean checkPerms(CommandSender cs, int number) { 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;
@@ -35,12 +33,13 @@ public class VaultOperations {
number = Integer.parseInt(arg); number = Integer.parseInt(arg);
} }
catch(NumberFormatException nfe) { catch(NumberFormatException nfe) {
sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
return false; return false;
} }
if(checkPerms(sender, number)) { if(checkPerms(sender, number)) {
vm.loadVault(sender, sender.getName(), number); vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
sender.sendMessage(Lang.TITLE.toString() + "Opening vault " + ChatColor.GREEN + number);
return true; return true;
} else { } else {
Feedback.noPerms(sender); Feedback.noPerms(sender);
@@ -58,10 +57,10 @@ public class VaultOperations {
number = Integer.parseInt(arg); number = Integer.parseInt(arg);
} }
catch(NumberFormatException nfe) { catch(NumberFormatException nfe) {
sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
} }
vm.loadVault(sender, user, number); vm.loadVault(sender, user, number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", user));
return true; return true;
} }
} }
@@ -77,12 +76,12 @@ public class VaultOperations {
number = Integer.parseInt(arg); number = Integer.parseInt(arg);
} }
catch(NumberFormatException nfe) { catch(NumberFormatException nfe) {
sender.sendMessage(pv+ChatColor.RED + "You need to specify a number!"); sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + "You need to specify a number!");
} }
try { try {
vm.deleteVault(sender, sender.getName(), number); vm.deleteVault(sender, sender.getName(), number);
} catch (IOException e) { } catch (IOException e) {
sender.sendMessage(pv + "There was an error deleting that vault!"); sender.sendMessage(Lang.TITLE.toString() + "There was an error deleting that vault!");
} }
} }
} }
@@ -94,12 +93,12 @@ public class VaultOperations {
number = Integer.parseInt(arg); number = Integer.parseInt(arg);
} }
catch(NumberFormatException nfe) { catch(NumberFormatException nfe) {
sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + "You need to specify a number!");
} }
try { try {
vm.deleteVault(sender, user, number); vm.deleteVault(sender, user, number);
} catch (IOException e) { } catch (IOException e) {
sender.sendMessage(pv + "There was an error deleting that vault!"); sender.sendMessage(Lang.TITLE.toString() + "There was an error deleting that vault!");
} }
} }
} }
src/com/drtshock/playervaults/util/Lang.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.drtshock.playervaults.util; package com.drtshock.playervaults.util;
import org.bukkit.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
public enum Lang { public enum Lang {
@@ -26,6 +27,6 @@ public enum Lang {
@Override @Override
public String toString() { public String toString() {
return lang.getString(this.path); return ChatColor.translateAlternateColorCodes('&', lang.getString(this.path));
} }
} }
src/com/drtshock/playervaults/util/VaultManager.java
+2 -6
View File
@@ -3,7 +3,6 @@ package com.drtshock.playervaults.util;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -20,9 +19,6 @@ public class VaultManager {
public VaultManager(Main instance) { public VaultManager(Main instance) {
this.plugin = instance; this.plugin = instance;
} }
String title = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" +
ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults"; private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults";
@@ -65,10 +61,10 @@ public class VaultManager {
FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file); FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
if(file.exists()) { if(file.exists()) {
playerFile.set("vault" + number, null); playerFile.set("vault" + number, null);
sender.sendMessage(title + "Deleting " + ChatColor.GREEN + " " + number); sender.sendMessage(Lang.TITLE.toString() + "Deleting " + ChatColor.GREEN + " " + number);
playerFile.save(file); playerFile.save(file);
} else { } else {
sender.sendMessage(title + " That doesn't exist!"); sender.sendMessage(Lang.TITLE.toString() + " That doesn't exist!");
} }
} }