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

Merge pull request #29 from koalaaaa/master

Browse Source 
General cleanup of everything I can see right now.
This commit is contained in:
drtshock
2014-05-05 15:01:37 -05:00
parent 99d74afa24 e5904cf651
commit 9503b3a7bf
14 changed files with 63 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+19 -44
View File
@@ -1,24 +1,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.drtshock</groupId>
<artifactId>PlayerVaults</artifactId>
<version>3.5.0-SNAPSHOT</version>
<name>PlayerVaults</name>
<url>http://dev.bukkit.org/server-mods/playervaults/</url>
<url>http://dev.bukkit.org/bukkit-plugins/playervaults/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<defaultGoal>clean package install</defaultGoal>
<defaultGoal>clean install</defaultGoal>
<finalName>PlayerVaults</finalName>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory>
<directory>src/main/resources/</directory>
<includes>
<include>*.yml</include>
</includes>
@@ -33,47 +33,9 @@
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>build</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2.32</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.12</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>bukkit-repo</id>
@@ -84,4 +46,17 @@
<url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2.32</version>
</dependency>
</dependencies>
</project>
src/main/assembly/package.xml
-13
View File
@@ -1,13 +0,0 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>${project.build.directory}/${artifactId}.jar</source>
<outputDirectory>/</outputDirectory>
<destName>${project.name}.jar</destName>
</file>
</files>
</assembly>
src/main/java/com/drtshock/playervaults/PlayerVaults.java
+7 -4
View File
@@ -57,7 +57,6 @@ public class PlayerVaults extends JavaPlugin {
private int inventoriesToDrop = 0;
private YamlConfiguration signs;
private File signsFile;
private Listeners listener;
private String name = "";
@Override
@@ -66,7 +65,7 @@ public class PlayerVaults extends JavaPlugin {
getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUID first. Class checks if necessary.
loadLang();
new UUIDVaultManager();
getServer().getPluginManager().registerEvents(listener = new Listeners(this), this);
getServer().getPluginManager().registerEvents(new Listeners(this), this);
loadConfig();
loadSigns();
checkUpdate();
@@ -248,7 +247,7 @@ public class PlayerVaults extends JavaPlugin {
lang.createNewFile();
if (defLangStream != null) {
out = new FileOutputStream(lang);
int read = 0;
int read;
byte[] bytes = new byte[1024];
while ((read = defLangStream.read(bytes)) != -1) {
@@ -322,7 +321,11 @@ public class PlayerVaults extends JavaPlugin {
}
public Economy getEconomy() {
return this.econ;
return econ;
}
public File getVaultData() {
return new File(this.getDataFolder(), "uuidvaults");
}
public static PlayerVaults getInstance() {
src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+8 -10
View File
@@ -43,13 +43,12 @@ import java.io.IOException;
public class Listeners implements Listener {
public PlayerVaults plugin;
UUIDVaultManager vm = UUIDVaultManager.getInstance();
public Listeners(PlayerVaults playerVaults) {
this.plugin = playerVaults;
}
UUIDVaultManager vm = UUIDVaultManager.getInstance();
public void saveVault(Player player) {
if (PlayerVaults.getInstance().getInVault().containsKey(player.getName())) {
Inventory inv = player.getOpenInventory().getTopInventory();
@@ -58,7 +57,9 @@ public class Listeners implements Listener {
try {
vm.saveVault(inv, player.getUniqueId(), info.getNumber());
} catch (IOException e) {
// ignore
}
PlayerVaults.getInstance().getOpenInventories().remove(info.toString());
}
PlayerVaults.getInstance().getInVault().remove(player.getName());
@@ -72,31 +73,28 @@ public class Listeners implements Listener {
@EventHandler
public void onQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
saveVault(player);
saveVault(event.getPlayer());
}
@EventHandler
public void onJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
if (PlayerVaults.getInstance().needsUpdate() && (player.isOp() || player.hasPermission("playervaults.notify"))) {
player.sendMessage(ChatColor.GREEN + "Version " + PlayerVaults.getInstance().getNewVersion() + " of PlayerVaults is up for download!");
player.sendMessage(ChatColor.GREEN + "Version " + PlayerVaults.getInstance().getNewVersion() + " of PlayerVaults is available for download!");
player.sendMessage(ChatColor.GREEN + PlayerVaults.getInstance().getLink() + " to view the changelog and download!");
}
}
@EventHandler
public void onDeath(PlayerDeathEvent event) {
Player player = event.getEntity();
saveVault(player);
saveVault(event.getEntity());
}
@EventHandler
public void onClose(InventoryCloseEvent event) {
HumanEntity he = event.getPlayer();
if (he instanceof Player) {
Player player = (Player) he;
saveVault(player);
saveVault((Player) he);
}
}
@@ -137,7 +135,7 @@ public class Listeners implements Listener {
int y = l.getBlockY();
int z = l.getBlockZ();
if (self) {
plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".self", self);
plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".self", true);
} else {
plugin.getSigns().set(world + ";;" + x + ";;" + y + ";;" + z + ".owner", owner);
}
src/main/java/com/drtshock/playervaults/tasks/Cleanup.java
+1 -2
View File
@@ -13,10 +13,9 @@ public class Cleanup extends BukkitRunnable {
this.diff = diff * 86400;
}
@Override
public void run() {
File file = new File(PlayerVaults.getInstance().getDataFolder(), "vaults");
File file = PlayerVaults.getInstance().getVaultData();
if (!file.exists()) return;
long time = System.currentTimeMillis();
src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java
+2 -2
View File
@@ -18,7 +18,7 @@ public final class UUIDConversion extends BukkitRunnable {
@Override
public void run() {
File newDir = new File(PlayerVaults.getInstance().getDataFolder(), "uuidvaults");
File newDir = PlayerVaults.getInstance().getVaultData();
if (newDir.exists()) {
PlayerVaults.getInstance().getLogger().log(Level.INFO, "Files already converted to UUID.");
return;
@@ -38,7 +38,7 @@ public final class UUIDConversion extends BukkitRunnable {
}
UUID uuid = player.getUniqueId();
File newFile = new File(PlayerVaults.getInstance().getDataFolder(), "uuidvaults" + File.separator + uuid.toString() + ".yml");
File newFile = new File(PlayerVaults.getInstance().getVaultData(), uuid.toString() + ".yml");
file.mkdirs();
try {
Files.copy(file, newFile);
src/main/java/com/drtshock/playervaults/util/Lang.java
+1 -1
View File
@@ -30,7 +30,7 @@ public enum Lang {
INVALID_ARGS("invalid-args", "&cInvalid args!"),
DELETE_VAULT("delete-vault", "&fDeleted vault &a%v"),
DELETE_OTHER_VAULT("delete-other-vault", "&fDeleted vault &a%v &fof &a%p"),
PLAYER_ONLY("player-only", "Sorry but that can only be run by a player!"),
PLAYER_ONLY("player-only", "&cSorry but that can only be run by a player!"),
MUST_BE_NUMBER("must-be-number", "&cYou need to specify a number between 1-99"),
DELETE_VAULT_ERROR("delete-vault-error", "&cError deleting vault :("),
NO_PERMS("no-permissions", "&cYou don''t have permission for that!"),
src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
+8 -10
View File
@@ -38,10 +38,10 @@ public class Serialization {
@SuppressWarnings("unchecked")
public static Map<String, Object> toMap(JSONObject object) throws JSONException {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
Iterator<String> keys = object.keys();
while (keys.hasNext()) {
String key = (String) keys.next();
String key = keys.next();
map.put(key, fromJson(object.get(key)));
}
return map;
@@ -60,7 +60,7 @@ public class Serialization {
}
public static List<Object> toList(JSONArray array) throws JSONException {
List<Object> list = new ArrayList<Object>();
List<Object> list = new ArrayList<>();
for (int i = 0; i < array.length(); i++) {
list.add(fromJson(array.get(i)));
}
@@ -68,11 +68,9 @@ public class Serialization {
}
public static List<String> toString(Inventory inv) {
List<String> result = new ArrayList<String>();
List<ConfigurationSerializable> items = new ArrayList<ConfigurationSerializable>();
for (ItemStack is : inv.getContents()) {
items.add(is);
}
List<String> result = new ArrayList<>();
List<ConfigurationSerializable> items = new ArrayList<>();
Collections.addAll(items, inv.getContents());
for (ConfigurationSerializable cs : items) {
if (cs == null) {
result.add("null");
@@ -87,7 +85,7 @@ public class Serialization {
VaultHolder holder = new VaultHolder(number);
Inventory inv = Bukkit.createInventory(holder, size, ChatColor.RED + "Vault #" + number);
holder.setInventory(inv);
List<ItemStack> contents = new ArrayList<ItemStack>();
List<ItemStack> contents = new ArrayList<>();
for (String piece : stringItems) {
if (piece.equalsIgnoreCase("null")) {
contents.add(null);
@@ -137,7 +135,7 @@ public class Serialization {
return serialized;
}
public static Map<String, Object> recreateMap(Map<String, Object> original) {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
map.putAll(original);
return map;
}
src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
+10 -13
View File
@@ -27,7 +27,7 @@ public class UUIDVaultManager {
instance = this;
}
private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "uuidvaults";
private final File directory = PlayerVaults.getInstance().getVaultData();
/**
* Saves the inventory to the specified player and vault number.
@@ -108,7 +108,7 @@ public class UUIDVaultManager {
size = 54;
}
VaultViewInfo info = new VaultViewInfo(holder.toString(), number);
Inventory inv = null;
Inventory inv;
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
@@ -168,8 +168,7 @@ public class UUIDVaultManager {
vaultHolder.setInventory(inv);
return inv;
} else {
Inventory inv = Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(player));
return inv;
return Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(player));
}
}
@@ -188,7 +187,7 @@ public class UUIDVaultManager {
*/
public void deleteVault(CommandSender sender, UUID holder, int number) throws IOException {
String name = holder.toString();
File file = new File(directory + File.separator + name.toLowerCase() + ".yml");
File file = new File(directory, name.toLowerCase() + ".yml");
if (!file.exists()) {
return;
}
@@ -217,11 +216,10 @@ public class UUIDVaultManager {
* @return The holder's vault config file.
*/
public YamlConfiguration getPlayerVaultFile(UUID holder) {
File folder = new File(directory);
if (!folder.exists()) {
folder.mkdir();
if (!directory.exists()) {
directory.mkdir();
}
File file = new File(directory + File.separator + holder.toString() + ".yml");
File file = new File(directory, holder.toString() + ".yml");
if (!file.exists()) {
try {
file.createNewFile();
@@ -229,8 +227,7 @@ public class UUIDVaultManager {
// Who cares?
}
}
YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
return playerFile;
return YamlConfiguration.loadConfiguration(file);
}
/**
@@ -242,9 +239,9 @@ public class UUIDVaultManager {
* @throws IOException Uh oh!
*/
public void saveFile(UUID holder, YamlConfiguration yaml) throws IOException {
File file = new File(directory + File.separator + holder.toString() + ".yml");
File file = new File(directory, holder.toString() + ".yml");
if (file.exists()) {
file.renameTo(new File(directory + File.separator + "backups" + File.separator + holder.toString() + ".yml"));
file.renameTo(new File(directory, "backups" + File.separator + holder.toString() + ".yml"));
}
yaml.save(file);
}
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+5 -7
View File
@@ -85,7 +85,7 @@ public class VaultManager {
size = 54;
}
VaultViewInfo info = new VaultViewInfo(holder, number);
Inventory inv = null;
Inventory inv;
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
@@ -127,7 +127,7 @@ public class VaultManager {
size = 54;
}
VaultViewInfo info = new VaultViewInfo(holder, number);
Inventory inv = null;
Inventory inv;
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
@@ -157,7 +157,7 @@ public class VaultManager {
*/
@Deprecated
private Inventory getInventory(YamlConfiguration playerFile, int size, int number) {
List<String> data = new ArrayList<String>();
List<String> data = new ArrayList<>();
for (int x = 0; x < size; x++) {
String line = playerFile.getString("vault" + number + "." + x);
if (line != null) {
@@ -187,8 +187,7 @@ public class VaultManager {
vaultHolder.setInventory(inv);
return inv;
} else {
Inventory inv = Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(Bukkit.getPlayerExact(holder)));
return inv;
return Serialization.toInventory(data, number, VaultOperations.getMaxVaultSize(Bukkit.getPlayerExact(holder)));
}
}
@@ -247,8 +246,7 @@ public class VaultManager {
// Who cares?
}
}
YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
return playerFile;
return YamlConfiguration.loadConfiguration(file);
}
/**
src/main/resources/config.yml
+1 -1
View File
@@ -1,5 +1,5 @@
# PlayerVaults by drsthock and gomeow!
# http://dev.bukkit.org/server-mods/playervaults
# http://dev.bukkit.org/bukkit-plugins/playervaults/
# Made with love :3
# Whether or not you want to check for updates.
src/main/resources/lang.yml
+1 -1
View File
@@ -9,7 +9,7 @@ open-vault: "&fOpening vault &a%v"
open-other-vault: "&fOpening vault &a%v &fof &a%p"
delete-vault: "&fDeleted vault &a%v"
delete-other-vault: "&fDeleted vault &a%v &fof &a%p"
player-only: "Sorry but that can only be run by a player!"
player-only: "&cSorry but that can only be run by a player!"
must-be-number: "&cYou need to specify a number between 1-99"
invalid-args: "&cInvalid args!"
delete-vault-error: "&cError deleting vault :("