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

Update to 1.5

Browse Source 
* Fix some formatting
 * Fix lang.yml file not being used for all messages
 * Rename doSaveStuff to saveVault
This commit is contained in:
gomeow
2013-03-15 23:17:03 -07:00
parent 14aae62af8
commit 6ef89277cd
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/drtshock/playervaults/Listeners.java
+7 -9
View File
@@ -2,7 +2,6 @@ package com.drtshock.playervaults;
import java.io.IOException;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
@@ -31,9 +30,10 @@ public class Listeners implements Listener {
public Listeners(Main instance) {
this.plugin = instance;
}
VaultManager vm = new VaultManager(plugin);
public void doSaveStuff(Player p) {
public void saveVault(Player p) {
if(Commands.inVault.containsKey(p.getName())) {
Inventory inv = p.getOpenInventory().getTopInventory();
VaultViewInfo info = Commands.inVault.get(p.getName());
@@ -49,22 +49,21 @@ public class Listeners implements Listener {
@EventHandler
public void onQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
doSaveStuff(player);
saveVault(player);
}
@EventHandler
public void onJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
vm.playerVaultFile(player.getName());
if(player.isOp() && Main.update)
{
if(player.isOp() && Main.update) {
player.sendMessage(ChatColor.GREEN + "Version " + Main.name + " of PlayerVaults is up for download!");
player.sendMessage(ChatColor.GREEN + "http://dev.bukkit.org/server-mods/playervaults to view the changelog and download!");
player.sendMessage(ChatColor.GREEN + "http://dev.bukkit.org/server-mods/playervaults/ to view the changelog and download!");
}
}
@EventHandler
public void onDeath(PlayerDeathEvent event) {
Player player = event.getEntity();
doSaveStuff(player);
saveVault(player);
}
@EventHandler
@@ -72,7 +71,7 @@ public class Listeners implements Listener {
HumanEntity he = event.getPlayer();
if(he instanceof Player) {
Player player = (Player) he;
doSaveStuff(player);
saveVault(player);
}
}
@@ -106,7 +105,6 @@ public class Listeners implements Listener {
/**
* Don't let a player open a trading inventory OR a minecart
* while he has his vault open.
* @param event
*/
@EventHandler
public void onInteractEntity(PlayerInteractEntityEvent event) {
src/com/drtshock/playervaults/commands/VaultOperations.java
+4 -4
View File
@@ -44,7 +44,7 @@ public class VaultOperations {
Feedback.noPerms(sender);
}
} else {
sender.sendMessage(Lang.TITLE + "" + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
}
return false;
}
@@ -64,7 +64,7 @@ public class VaultOperations {
sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", user));
return true;
} else {
sender.sendMessage(Lang.TITLE + "" + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
}
}
else {
@@ -87,7 +87,7 @@ public class VaultOperations {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
}
} else {
sender.sendMessage(Lang.TITLE + "" + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString()+ Lang.MUST_BE_NUMBER);
}
}
public static void deleteOtherVault(CommandSender sender, String user, String arg) {
@@ -106,7 +106,7 @@ public class VaultOperations {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
}
} else {
sender.sendMessage(Lang.TITLE + "" + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
}
}
else Feedback.noPerms(sender);
src/com/drtshock/playervaults/util/Serialization.java
+6 -6
View File
@@ -5,13 +5,13 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import net.minecraft.server.v1_4_R1.NBTBase;
import net.minecraft.server.v1_4_R1.NBTTagCompound;
import net.minecraft.server.v1_4_R1.NBTTagList;
import net.minecraft.server.v1_5_R1.NBTBase;
import net.minecraft.server.v1_5_R1.NBTTagCompound;
import net.minecraft.server.v1_5_R1.NBTTagList;
import org.bukkit.ChatColor;
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom;
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_5_R1.inventory.CraftInventoryCustom;
import org.bukkit.craftbukkit.v1_5_R1.inventory.CraftItemStack;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
@@ -50,7 +50,7 @@ public class Serialization {
NBTTagCompound inputObject = (NBTTagCompound) itemList.get(i);
if (!inputObject.isEmpty()) {
inventory.setItem(i, CraftItemStack.asCraftMirror(net.minecraft.server.v1_4_R1.ItemStack.createStack(inputObject)));
inventory.setItem(i, CraftItemStack.asCraftMirror(net.minecraft.server.v1_5_R1.ItemStack.createStack(inputObject)));
}
}
src/com/drtshock/playervaults/util/VaultManager.java
+6 -3
View File
@@ -61,10 +61,13 @@ public class VaultManager {
FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
if(file.exists()) {
playerFile.set("vault" + number, null);
sender.sendMessage(Lang.TITLE.toString() + "Deleting " + ChatColor.GREEN + " " + number);
playerFile.save(file);
} else {
sender.sendMessage(Lang.TITLE.toString() + " That doesn't exist!");
}
if(sender.getName().equalsIgnoreCase(target)) {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT.toString().replace("%v", String.valueOf(number)));
}
else {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT.toString().replace("%v", String.valueOf(number)).replace("%p", target));
}
}