mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-05-23 10:39:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Readded Mail command and fixed GUI serialization.

Browse Source
This commit is contained in:
Aust1n46 2016-09-19 16:07:39 -04:00
parent f64b867d82
commit e45e17497d
3 changed files with 32 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MineverseChat/config.yml
View File

@ -245,11 +245,6 @@ alias:
permissions: None permissions: None
components: components:
- 'Message: &aThis is our website: www.site.net' - 'Message: &aThis is our website: www.site.net'
mail:
arguments: 0
permissions: None
components:
- 'Command: /email$'
tell: tell:
arguments: 0 arguments: 0
permissions: None permissions: None

98
MineverseChat/mineverse/Aust1n46/chat/command/chat/Mail.java
View File

@ -14,6 +14,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.utilities.Format;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class Mail extends MineverseCommand { public class Mail extends MineverseCommand {
@ -25,105 +26,64 @@ public class Mail extends MineverseCommand {
this.plugin = MineverseChat.getInstance(); this.plugin = MineverseChat.getInstance();
} }
//@SuppressWarnings("deprecation")
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
/*if(!(sender instanceof Player)) { if (!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
return; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.mail")) { if (mcp.getPlayer().hasPermission("venturechat.mail")) {
try { try {
switch(args[0]) { switch (args[0]) {
case "send": { case "send": {
try { try {
Player p = Bukkit.getPlayer(args[1]); MineverseChatPlayer tp = MineverseChatAPI.getMineverseChatPlayer(args[1]);
if(p == null) { if (tp == null) {
OfflinePlayer op = Bukkit.getOfflinePlayer(args[1]); mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + args[1] + " has never played before.");
if(op.hasPlayedBefore()) {
if(plugin.mail.containsKey(op.getUniqueId().toString())) {
try {
String msg = args[2];
for(int x = 3; x < args.length; x++) {
if(args[x].length() > 0) msg += " " + args[x];
}
plugin.mail.get(op.getUniqueId().toString()).add(player.getName() + ": " + msg);
player.sendMessage(ChatColor.GOLD + "Sent mail: " + ChatColor.RED + cc.FormatStringAll(msg) + ChatColor.GOLD + " to: " + ChatColor.RED + op.getName());
return;
}
catch(Exception e) {
player.sendMessage(ChatColor.RED + "Invalid arguments, /mail send [player] [message]");
return;
}
}
try {
String msg = args[2];
for(int x = 3; x < args.length; x++) {
if(args[x].length() > 0) msg += " " + args[x];
}
ArrayList<String> newlist = new ArrayList<String>();
newlist.add(player.getName() + ": " + msg);
player.sendMessage(ChatColor.GOLD + "Sent mail: " + ChatColor.RED + cc.FormatStringAll(msg) + ChatColor.GOLD + " to: " + ChatColor.RED + op.getName());
plugin.mail.put(op.getUniqueId().toString(), newlist);
return;
}
catch(Exception e) {
player.sendMessage(ChatColor.RED + "Invalid arguments, /mail send [player] [message]");
return;
}
}
if(args.length < 3) {
player.sendMessage(ChatColor.RED + "Invalid arguments, /mail send [player] [message]");
return;
}
player.sendMessage(ChatColor.RED + "Player: " + op.getName() + " has never played before.");
return; return;
} }
try { String msg = args[2];
String msg = args[2]; for (int x = 3; x < args.length; x++) {
for(int x = 3; x < args.length; x++) { if (args[x].length() > 0)
if(args[x].length() > 0) msg += " " + args[x]; msg += " " + args[x];
}
p.setMetadata("MineverseChat.mail", new FixedMetadataValue(plugin, plugin.getMetadataString(p, "MineverseChat.mail", plugin) + player.getName() + ": " + msg + "\n"));
player.sendMessage(ChatColor.GOLD + "Sent mail: " + ChatColor.RED + cc.FormatStringAll(msg) + ChatColor.GOLD + " to: " + ChatColor.RED + p.getName());
p.sendMessage(ChatColor.RED + player.getName() + ChatColor.GOLD + " just sent you mail. /mail read");
return;
} }
catch(Exception e) { mcp.getPlayer().sendMessage(ChatColor.GOLD + "Sent mail: " + ChatColor.RED + Format.FormatStringAll(msg) + ChatColor.GOLD + " to: " + ChatColor.RED + tp.getName());
player.sendMessage(ChatColor.RED + "Invalid arguments: /mail send [player] [message]"); tp.addMail(msg);
return; if(tp.isOnline()) {
tp.getPlayer().sendMessage(ChatColor.RED + mcp.getName() + ChatColor.GOLD + " has sent you mail. /mail read");
} }
return;
} }
catch(Exception e) { catch (Exception e) {
player.sendMessage(ChatColor.RED + "Invalid arguments: /mail send [player] [message]"); mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments, /mail send [player] [message]");
return;
} }
return;
} }
case "read": { case "read": {
for(String s : plugin.getMetadataString(player, "MineverseChat.mail", plugin).split("\n")) { for (String s : mcp.getMail()) {
if(s.length() > 0) { if (s.length() > 0) {
player.sendMessage(ChatColor.GOLD + cc.FormatStringAll(s)); mcp.getPlayer().sendMessage(ChatColor.GOLD + Format.FormatStringAll(s));
} }
} }
player.sendMessage(ChatColor.GOLD + "To clear mail, type /mail clear"); mcp.getPlayer().sendMessage(ChatColor.GOLD + "To clear mail, type /mail clear");
return; return;
} }
case "clear": { case "clear": {
player.removeMetadata("MineverseChat.mail", plugin); mcp.clearMail();
player.sendMessage(ChatColor.GOLD + "Cleared your mail."); mcp.getPlayer().sendMessage(ChatColor.GOLD + "Cleared your mail.");
return; return;
} }
default: { default: {
player.sendMessage(ChatColor.RED + "Invalid arguments, /mail [send, read, sendall, clear]"); mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments, /mail [send, read, sendall, clear]");
return; return;
} }
} }
} }
catch(Exception e) { catch (Exception e) {
player.sendMessage(ChatColor.RED + "Invalid arguments, /mail [send, read, sendall, clear]"); mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments, /mail [send, read, sendall, clear]");
} }
return; return;
}*/ }
} }
} }

2
MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java
View File

@ -263,7 +263,7 @@ public class CommandListener implements CommandExecutor, Listener {
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void InventoryClick(InventoryClickEvent e) { public void InventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem(); ItemStack item = e.getCurrentItem();
if(item == null || !e.getInventory().getTitle().contains("VentureChat") && !e.getInventory().getTitle().contains("GUI")) { if(item == null || !e.getInventory().getTitle().contains("VentureChat")) {
return; return;
} }
e.setCancelled(true); e.setCancelled(true);