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

Plugin loads fine :)

Browse Source
This commit is contained in:
Trent Hensler
2013-02-07 00:30:45 -06:00
parent 9a79df540e
commit f0a25d3e88
5 changed files with 385 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/me/shock/playervaults/Commands.java
+164 -167
View File
@@ -3,7 +3,6 @@ package me.shock.playervaults;
import java.io.IOException;
import java.util.HashMap;
import me.shock.playervaults.util.Config;
import me.shock.playervaults.util.VaultManager;
import org.bukkit.ChatColor;
@@ -15,183 +14,181 @@ import org.bukkit.entity.Player;
public class Commands implements CommandExecutor
{
Main plugin;
Config config = new Config();
private VaultManager vm = new VaultManager();
String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" +
ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
VaultManager vm = new VaultManager();
String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" +
ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
public HashMap<String, String> inVault = new HashMap<String, String>();
public HashMap<String, String> inVault = new HashMap<String, String>();
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args)
{
if (cmd.getName().equalsIgnoreCase("vault"))
{
if (!(sender instanceof Player))
{
sender.sendMessage("[PlayerVaults] Sorry but the console can't have a vault :(");
return true;
}
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args)
{
if (cmd.getName().equalsIgnoreCase("vault"))
{
if (!(sender instanceof Player))
{
sender.sendMessage("[PlayerVaults] Sorry but the console can't have a vault :(");
return true;
}
if (args.length == 1)
{
if (args[0].matches("[1-9]"))
{
int number = Integer.parseInt(args[0]);
if ((number <= 9) && (sender.hasPermission("playervaults.amount.9")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 8) && (sender.hasPermission("playervaults.amount.8")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 7) && (sender.hasPermission("playervaults.amount.7")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 6) && (sender.hasPermission("playervaults.amount.6")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 5) && (sender.hasPermission("playervaults.amount.5")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 4) && (sender.hasPermission("playervaults.amount.4")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 3) && (sender.hasPermission("playervaults.amount.3")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 2) && (sender.hasPermission("playervaults.amount.2")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number == 1) && (sender.hasPermission("playervaults.amount.1")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if (args.length == 1)
{
if (args[0].matches("[1-9]"))
{
int number = Integer.parseInt(args[0]);
if ((number <= 9) && (sender.hasPermission("playervaults.amount.9")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 8) && (sender.hasPermission("playervaults.amount.8")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 7) && (sender.hasPermission("playervaults.amount.7")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 6) && (sender.hasPermission("playervaults.amount.6")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 5) && (sender.hasPermission("playervaults.amount.5")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 4) && (sender.hasPermission("playervaults.amount.4")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 3) && (sender.hasPermission("playervaults.amount.3")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number <= 2) && (sender.hasPermission("playervaults.amount.2")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
if ((number == 1) && (sender.hasPermission("playervaults.amount.1")))
{
vm.loadVault(sender, sender.getName(), number);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + args[0]);
return true;
}
sender.sendMessage(pv + "You don't have permission for that many vaults!");
return true;
}
showHelp(sender);
return true;
}
if (args.length == 2)
{
if (args[0].equals("delete"))
{
if (sender.hasPermission("playervaults.delete"))
{
if (args[1].matches("[1-9]"))
{
int number = Integer.parseInt(args[1]);
try {
vm.deleteVault(sender, sender.getName(), number);
} catch (IOException e) {
e.printStackTrace();
sender.sendMessage(pv + "You don't have permission for that many vaults!");
return true;
}
sender.sendMessage(pv + "Deleted vault " + ChatColor.GREEN + args[1]);
return true;
}
}
else
{
sender.sendMessage(pv + "You don't have permission for ");
return true;
}
}
showHelp(sender);
return true;
}
else
{
if (!sender.hasPermission("playervaults.admin"))
{
sender.sendMessage(pv + "You don't have permission for ");
return true;
}
if (args[1].matches("[1-9]"))
{
int number = Integer.parseInt(args[2]);
vm.loadVault(sender, args[1].toLowerCase(), number);
sender.sendMessage(pv + "Opened vault " + ChatColor.GREEN + args[1] + ChatColor.WHITE + " for " +
ChatColor.GREEN + args[0]);
return true;
}
if (args.length == 2)
{
if (args[0].equals("delete"))
{
if (sender.hasPermission("playervaults.delete"))
{
if (args[1].matches("[1-9]"))
{
int number = Integer.parseInt(args[1]);
try {
vm.deleteVault(sender, sender.getName(), number);
} catch (IOException e) {
e.printStackTrace();
}
sender.sendMessage(pv + "Deleted vault " + ChatColor.GREEN + args[1]);
return true;
}
}
else
{
sender.sendMessage(pv + "You don't have permission for ");
return true;
}
sender.sendMessage(pv + "Chest number must be 1-9.");
return true;
}
sender.sendMessage(pv + "We have no record of that vault.");
return true;
}
if (args.length > 1)
{
if (args[0].equalsIgnoreCase("delete"))
{
if (sender.hasPermission("playervaults.admin"))
{
if (args[2].matches("[1-9]"))
{
Integer number = Integer.parseInt(args[2]);
try {
vm.deleteVault(sender, sender.getName(), number);
} catch (IOException e) {
e.printStackTrace();
}
sender.sendMessage(pv + "Deleted vault " + ChatColor.RED + args[2] + ChatColor.WHITE +
" for " + ChatColor.RED + args[1]);
return true;
}
}
else
{
sender.sendMessage(pv + "You don't have permission for ");
return true;
}
}
}
else
{
showHelp(sender);
return true;
}
}
else
{
if (!sender.hasPermission("playervaults.admin"))
{
sender.sendMessage(pv + "You don't have permission for ");
return true;
}
if (args[1].matches("[1-9]"))
{
int number = Integer.parseInt(args[2]);
vm.loadVault(sender, args[1].toLowerCase(), number);
sender.sendMessage(pv + "Opened vault " + ChatColor.GREEN + args[1] + ChatColor.WHITE + " for " +
ChatColor.GREEN + args[0]);
return true;
}
return true;
}
sender.sendMessage(pv + "Chest number must be 1-9.");
return true;
}
public void showHelp(CommandSender sender)
{
sender.sendMessage(pv + "/vault <number>");
sender.sendMessage(pv + "/vault delete <number>");
}
sender.sendMessage(pv + "We have no record of that vault.");
return true;
}
if (args.length > 1)
{
if (args[0].equalsIgnoreCase("delete"))
{
if (sender.hasPermission("playervaults.admin"))
{
if (args[2].matches("[1-9]"))
{
Integer number = Integer.parseInt(args[2]);
try {
vm.deleteVault(sender, sender.getName(), number);
} catch (IOException e) {
e.printStackTrace();
}
sender.sendMessage(pv + "Deleted vault " + ChatColor.RED + args[2] + ChatColor.WHITE +
" for " + ChatColor.RED + args[1]);
return true;
}
}
else
{
sender.sendMessage(pv + "You don't have permission for ");
return true;
}
}
}
else
{
showHelp(sender);
return true;
}
}
return true;
}
public void showHelp(CommandSender sender)
{
sender.sendMessage(pv + "/vault <number>");
sender.sendMessage(pv + "/vault delete <number>");
}
}
src/me/shock/playervaults/Listeners.java
+12 -17
View File
@@ -2,7 +2,6 @@ package me.shock.playervaults;
import java.io.IOException;
import me.shock.playervaults.util.Config;
import me.shock.playervaults.util.VaultManager;
import org.bukkit.ChatColor;
@@ -33,7 +32,6 @@ public class Listeners implements Listener
this.plugin = instance;
}
VaultManager vm = new VaultManager();
Config config = new Config();
Commands commands = new Commands();
@@ -42,14 +40,14 @@ public class Listeners implements Listener
public void onQuit(PlayerQuitEvent event)
{
if(commands.inVault.containsKey(event.getPlayer().getName())) {
Player player = event.getPlayer();
Inventory inv = player.getOpenInventory().getTopInventory();
int number = Integer.parseInt(commands.inVault.get(player.getName()));
try {
vm.saveVault(inv, player, number);
} catch (IOException e) {
e.printStackTrace();
}
Player player = event.getPlayer();
Inventory inv = player.getOpenInventory().getTopInventory();
int number = Integer.parseInt(commands.inVault.get(player.getName()));
try {
vm.saveVault(inv, player, number);
} catch (IOException e) {
e.printStackTrace();
}
}
}
@EventHandler
@@ -74,8 +72,8 @@ public class Listeners implements Listener
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
@EventHandler
public void onTP(PlayerTeleportEvent event) {
@@ -88,8 +86,8 @@ public class Listeners implements Listener
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
@EventHandler
public void onWorldChange(PlayerChangedWorldEvent event) {
@@ -102,8 +100,8 @@ public class Listeners implements Listener
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
@EventHandler
public void onClose(InventoryCloseEvent event) {
@@ -120,8 +118,8 @@ public class Listeners implements Listener
e.printStackTrace();
}
}
}
}
}
/**
* Check if a player is trying to do something while
@@ -148,9 +146,6 @@ public class Listeners implements Listener
* Storage_minecart and Powered minecart aren't blocks ;)- added to EntityInteractEvent
*/
|| block.getType() == Material.BURNING_FURNACE
//|| block.getType() == Material.STORAGE_MINECART
//|| block.getType() == Material.MINECART
//|| block.getType() == Material.POWERED_MINECART
|| block.getType() == Material.BREWING_STAND
|| block.getType() == Material.BEACON)
{
src/me/shock/playervaults/Main.java
+183 -15
View File
@@ -1,14 +1,20 @@
package me.shock.playervaults;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.logging.Logger;
import me.shock.playervaults.Listeners;
import me.shock.playervaults.util.Config;
import me.shock.playervaults.util.Metrics;
import me.shock.playervaults.util.Updater;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.libs.jline.internal.Log;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
@@ -17,9 +23,9 @@ public class Main extends JavaPlugin {
public Main plugin;
public Logger log;
Config config = new Config();
public static boolean update = false;
public static String name = "";
Commands commands = new Commands();
public void onEnable()
{
@@ -27,11 +33,11 @@ public class Main extends JavaPlugin {
PluginManager pm = getServer().getPluginManager();
pm.registerEvents(new Listeners(this), this);
getCommand("pv").setExecutor(new Commands());
config.loadConfig();
config.loadLang();
loadConfig();
loadLang();
startMetrics();
if(config.updateCheck())
if(updateCheck())
{
Updater updater = new Updater(this, "playervaults", this.getFile(), Updater.UpdateType.NO_DOWNLOAD, false);
update = updater.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE;
@@ -47,15 +53,177 @@ public class Main extends JavaPlugin {
public void startMetrics()
{
try
{
Metrics metrics = new Metrics(this);
metrics.start();
}
catch (IOException localIOException)
{
localIOException.printStackTrace();
}
}
try
{
Metrics metrics = new Metrics(this);
metrics.start();
}
catch (IOException localIOException)
{
localIOException.printStackTrace();
}
}
public void loadConfig()
{
/**
* Check to see if there's a config.
* If not then create a new one.
*/
File config = new File(getDataFolder() + File.separator + "config.yml");
if(!config.exists())
{
try{
getDataFolder().mkdir();
config.createNewFile();
} catch (IOException e) {
Log.error("[PlayerVaults] Couldn't create config");
}
/**
* Write the config file here.
* New, genius way to write it :)
*/
try {
FileOutputStream fos = new FileOutputStream(new File(getDataFolder() + File.separator + "config.yml"));
InputStream is = getResource("config.yml");
byte[] linebuffer = new byte[4096];
int lineLength = 0;
while((lineLength = is.read(linebuffer)) > 0)
{
fos.write(linebuffer, 0, lineLength);
}
fos.close();
} catch (IOException e) {
Log.error("[PlayerVaults] Couldn't write config: " + e);
}
}
}
public void loadLang()
{
/**
* Check to see if there's a config.
* If not then create a new one.
*/
File lang = new File(getDataFolder() + File.separator + "lang.yml");
if(!lang.exists())
{
try{
getDataFolder().mkdir();
lang.createNewFile();
} catch (IOException e) {
Log.error("[PlayerVaults] Couldn't create language file.");
}
/**
* Write the config file here.
* New, genius way to write it :)
*/
try {
FileOutputStream fos = new FileOutputStream(new File(getDataFolder() + File.separator + "lang.yml"));
InputStream is = getResource("lang.yml");
byte[] linebuffer = new byte[4096];
int lineLength = 0;
while((lineLength = is.read(linebuffer)) > 0)
{
fos.write(linebuffer, 0, lineLength);
}
fos.close();
} catch (IOException e) {
Log.error("[PlayerVaults] Couldn't write Language file: " + e);
}
}
}
private YamlConfiguration lang() {
File file = new File(getDataFolder() + "/lang.yml");
YamlConfiguration lang = YamlConfiguration.loadConfiguration(file);
return lang;
}
/**
* Methods to get values from the config.
* public so any class / plugin can get them.
*/
/**
*
* @return updateCheck
*/
public boolean updateCheck() {
return getConfig().getBoolean("check-update");
}
public boolean debugMode() {
return getConfig().getBoolean("debug-mode");
}
/**
*
* @return disabled worlds.
*/
public List<?> disabledWorlds() {
return getConfig().getList("disabled-worlds");
}
/**
* Values for the lang.yml
*/
/**
*
* @return title used in all messages.
*/
public String title() {
return lang().getString("title-name");
}
/**
*
* @return string for opening vault.
*/
public String openVault() {
return lang().getString("open-vault");
}
/**
*
* @return string for opening someone else's vault.
*/
public String openOtherVault() {
return lang().getString("open-other-vault");
}
/**
*
* @return string for invalid args.
*/
public String invalidArgs() {
return lang().getString("invalid-args");
}
/**
*
* @return string for deleting a vault.
*/
public String deleteVault() {
return lang().getString("delete-vault");
}
/**
*
* @return string for deleting someone else's vault.
*/
public String deleteOtherVault() {
return lang().getString("delete-other-vault");
}
public HashMap<?, ?> inVault() {
return commands.inVault;
}
public Logger getLog() {
return getServer().getLogger();
}
}
src/me/shock/playervaults/util/Config.java
-191
View File
@@ -1,191 +0,0 @@
package me.shock.playervaults.util;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.configuration.file.YamlConfiguration;
import me.shock.playervaults.Main;
public class Config
{
private Main plugin;
public void loadConfig()
{
Logger log = plugin.getServer().getLogger();
/**
* Check to see if there's a config.
* If not then create a new one.
*/
File config = new File(plugin.getDataFolder() + "/config.yml");
if(!config.exists())
{
try{
plugin.getDataFolder().mkdir();
config.createNewFile();
} catch (IOException e) {
log.log(Level.SEVERE, "[PlayerVaults] Couldn't create config");
}
/**
* Write the config file here.
* New, genius way to write it :)
*/
try {
FileOutputStream fos = new FileOutputStream(new File(plugin.getDataFolder() + File.separator + "config.yml"));
InputStream is = plugin.getResource("config.yml");
byte[] linebuffer = new byte[4096];
int lineLength = 0;
while((lineLength = is.read(linebuffer)) > 0)
{
fos.write(linebuffer, 0, lineLength);
}
fos.close();
log.log(Level.INFO, "[PlayerVaults] Wrote new config");
} catch (IOException e) {
log.log(Level.SEVERE, "[PlayerVaults] Couldn't write config: " + e);
}
}
else
{
log.log(Level.INFO, "[PlayerVaults] Config found.");
}
}
public void loadLang()
{
Logger log = plugin.getServer().getLogger();
/**
* Check to see if there's a config.
* If not then create a new one.
*/
File config = new File(plugin.getDataFolder() + "/lang.yml");
if(!config.exists())
{
try{
plugin.getDataFolder().mkdir();
config.createNewFile();
} catch (IOException e) {
log.log(Level.SEVERE, "[PlayerVaults] Couldn't create language file.");
}
/**
* Write the config file here.
* New, genius way to write it :)
*/
try {
FileOutputStream fos = new FileOutputStream(new File(plugin.getDataFolder() + File.separator + "config.yml"));
InputStream is = plugin.getResource("lang.yml");
byte[] linebuffer = new byte[4096];
int lineLength = 0;
while((lineLength = is.read(linebuffer)) > 0)
{
fos.write(linebuffer, 0, lineLength);
}
fos.close();
log.log(Level.INFO, "[PlayerVaults] Wrote new language file");
} catch (IOException e) {
log.log(Level.SEVERE, "[PlayerVaults] Couldn't write Language file: " + e);
}
}
else
{
log.log(Level.INFO, "[PlayerVaults] Language file found.");
}
}
private YamlConfiguration lang() {
File file = new File(plugin.getDataFolder() + "lang.yml");
YamlConfiguration lang = YamlConfiguration.loadConfiguration(file);
return lang;
}
/**
* Methods to get values from the config.
* public so any class / plugin can get them.
*/
/**
*
* @return updateCheck
*/
public boolean updateCheck() {
return plugin.getConfig().getBoolean("check-update");
}
public boolean debugMode() {
return plugin.getConfig().getBoolean("debug-mode");
}
/**
*
* @return disabled worlds.
*/
public List<?> disabledWorlds() {
return plugin.getConfig().getList("disabled-worlds");
}
/**
* Values for the lang.yml
*/
/**
*
* @return title used in all messages.
*/
public String title() {
return lang().getString("title-name");
}
/**
*
* @return string for opening vault.
*/
public String openVault() {
return lang().getString("open-vault");
}
/**
*
* @return string for opening someone else's vault.
*/
public String openOtherVault() {
return lang().getString("open-other-vault");
}
/**
*
* @return string for invalid args.
*/
public String invalidArgs() {
return lang().getString("invalid-args");
}
/**
*
* @return string for deleting a vault.
*/
public String deleteVault() {
return lang().getString("delete-vault");
}
/**
*
* @return string for deleting someone else's vault.
*/
public String deleteOtherVault() {
return lang().getString("delete-other-vault");
}
}
src/me/shock/playervaults/util/VaultManager.java
+2 -5
View File
@@ -4,7 +4,6 @@ import java.io.File;
import java.io.IOException;
import java.util.logging.Level;
import me.shock.playervaults.Commands;
import me.shock.playervaults.Main;
import org.bukkit.ChatColor;
@@ -19,8 +18,6 @@ public class VaultManager
{
private Main plugin;
Config config = new Config();
private Commands commands = new Commands();
String title;
public void checkFile(Player player)
@@ -44,7 +41,7 @@ public class VaultManager
*/
public void saveVault(Inventory inv, Player player, int number) throws IOException
{
if(commands.inVault.containsKey(player.getName()))
if(plugin.inVault().containsKey(player.getName()))
{
// Get the player's file and serialize the inventory.
String name = player.getName().toLowerCase();
@@ -54,7 +51,7 @@ public class VaultManager
// Prepare to save D:
playerFile.set("vault" + number + "", ser);
if(config.debugMode())
if(plugin.debugMode())
{
plugin.getLogger().log(Level.INFO, "[PlayerVaults] Saved " + " " + number + " for " + player.getName());
}