diff --git a/MineverseChat/config.yml b/MineverseChat/config.yml index 8a47041..6465754 100644 --- a/MineverseChat/config.yml +++ b/MineverseChat/config.yml @@ -194,7 +194,7 @@ venturegui: durability: 0 text: '&cRemove Message' permission: 'removemessage' - command: '/removemessage {hash} {channel} true' + command: '/removemessage {hash} {channel}' slot: 7 guiicon: '&c [✓]' diff --git a/MineverseChat/defaultconfig.yml b/MineverseChat/defaultconfig.yml index 3cd559a..82e1e54 100644 --- a/MineverseChat/defaultconfig.yml +++ b/MineverseChat/defaultconfig.yml @@ -194,7 +194,7 @@ venturegui: durability: 0 text: '&cRemove Message' permission: 'removemessage' - command: '/removemessage {hash} {channel} true' + command: '/removemessage {hash} {channel}' slot: 7 guiicon: '&c [✓]' diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index 4045350..230fed7 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -557,7 +557,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { StringBuilder stringbuilder = new StringBuilder(); try { splitComponents(finalList, o, c); - for(Object component : finalList) { if(VersionHandler.is1_7_10()) { stringbuilder.append((String) component.getClass().getMethod("e").invoke(component)); diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMute.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMute.java index 8574ca5..ebba95e 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMute.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMute.java @@ -26,7 +26,7 @@ public class GlobalMute extends Command { if(!(commandSender instanceof ProxiedPlayer)) { return; } - if(commandSender.hasPermission("mineversechat.mute")) { + if(commandSender.hasPermission("venturechat.mute")) { if(args.length < 3) { commandSender.sendMessage(new TextComponent(ChatColor.RED + "Invalid command: /" + alias + " [server] [player] [channel] {time}")); return; @@ -48,7 +48,7 @@ public class GlobalMute extends Command { } out.writeUTF(time); if(plugin.getProxy().getServers().get(args[0]).getPlayers().size() > 0) { - plugin.getProxy().getServers().get(args[0]).sendData("MineverseChat", stream.toByteArray()); + plugin.getProxy().getServers().get(args[0]).sendData("venturechat:", stream.toByteArray()); return; } commandSender.sendMessage(new TextComponent(ChatColor.RED + "Player: " + ChatColor.GOLD + args[1] + ChatColor.RED + " is not connected to server: " + args[0])); diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMuteAll.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMuteAll.java index c596d09..08287a3 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMuteAll.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalMuteAll.java @@ -24,7 +24,7 @@ public class GlobalMuteAll extends Command { if(!(commandSender instanceof ProxiedPlayer)) { return; } - if(commandSender.hasPermission("mineversechat.mute")) { + if(commandSender.hasPermission("venturechat.mute")) { if(args.length < 2) { commandSender.sendMessage(new TextComponent(ChatColor.RED + "Invalid command: /" + alias + " [server] [player]")); return; @@ -40,7 +40,7 @@ public class GlobalMuteAll extends Command { out.writeUTF(args[1]); out.writeUTF(args[0]); if(plugin.getProxy().getServers().get(args[0]).getPlayers().size() > 0) { - plugin.getProxy().getServers().get(args[0]).sendData("MineverseChat", stream.toByteArray()); + plugin.getProxy().getServers().get(args[0]).sendData("venturechat:", stream.toByteArray()); return; } commandSender.sendMessage(new TextComponent(ChatColor.RED + "Player: " + ChatColor.GOLD + args[1] + ChatColor.RED + " is not connected to server: " + args[0])); diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmute.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmute.java index 9a3c8a8..c85b6fd 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmute.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmute.java @@ -25,7 +25,7 @@ public class GlobalUnmute extends Command { if(!(commandSender instanceof ProxiedPlayer)) { return; } - if(commandSender.hasPermission("mineversechat.mute")) { + if(commandSender.hasPermission("venturechat.mute")) { if(args.length < 3) { commandSender.sendMessage(new TextComponent(ChatColor.RED + "Invalid command: /" + alias + " [server] [player] [channel]")); return; @@ -42,7 +42,7 @@ public class GlobalUnmute extends Command { out.writeUTF(args[2]); out.writeUTF(args[0]); if(plugin.getProxy().getServers().get(args[0]).getPlayers().size() > 0) { - plugin.getProxy().getServers().get(args[0]).sendData("MineverseChat", stream.toByteArray()); + plugin.getProxy().getServers().get(args[0]).sendData("venturechat:", stream.toByteArray()); return; } commandSender.sendMessage(new TextComponent(ChatColor.RED + "Player: " + ChatColor.GOLD + args[1] + ChatColor.RED + " is not connected to server: " + args[0])); diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmuteAll.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmuteAll.java index 25f56c0..5b87cf2 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmuteAll.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/command/GlobalUnmuteAll.java @@ -24,7 +24,7 @@ public class GlobalUnmuteAll extends Command { if(!(commandSender instanceof ProxiedPlayer)) { return; } - if(commandSender.hasPermission("mineversechat.mute")) { + if(commandSender.hasPermission("venturechat.mute")) { if(args.length < 2) { commandSender.sendMessage(new TextComponent(ChatColor.RED + "Invalid command: /" + alias + " [server] [player]")); return; @@ -40,7 +40,7 @@ public class GlobalUnmuteAll extends Command { out.writeUTF(args[1]); out.writeUTF(args[0]); if(plugin.getProxy().getServers().get(args[0]).getPlayers().size() > 0) { - plugin.getProxy().getServers().get(args[0]).sendData("MineverseChat", stream.toByteArray()); + plugin.getProxy().getServers().get(args[0]).sendData("venturechat:", stream.toByteArray()); return; } commandSender.sendMessage(new TextComponent(ChatColor.RED + "Player: " + ChatColor.GOLD + args[1] + ChatColor.RED + " is not connected to server: " + args[0])); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java index 74b31ba..f374df8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -50,7 +50,7 @@ public class Removemessage extends MineverseCommand { sender.sendMessage(ChatColor.RED + "Invalid hashcode."); return; } - if(args.length > 1 && MineverseChat.ccInfo.isChannel(args[1]) && MineverseChat.ccInfo.getChannelInfo(args[1]).getBungee() && Boolean.parseBoolean(args[2]) && sender instanceof Player) { + if(args.length > 1 && MineverseChat.ccInfo.isChannel(args[1]) && MineverseChat.ccInfo.getChannelInfo(args[1]).getBungee() && sender instanceof Player) { ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(byteOutStream); try { @@ -64,29 +64,20 @@ public class Removemessage extends MineverseCommand { } return; } - new BukkitRunnable() { - public void run() { - final Map> packets = new HashMap(); - for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { - List messages = p.getMessages(); - List playerPackets = new ArrayList(); - boolean resend = false; - for(int fill = 0; fill < 100 - messages.size(); fill++) { - playerPackets.add(Removemessage.this.emptyLinePacketContainer); - } - for(ChatMessage message : messages) { - //System.out.println(message.getMessage() + " remover test"); - if(message.getHash() == hash) { - WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); - message.setComponent(removedComponent); - message.setHash(-1); - playerPackets.add(Removemessage.this.createPacketPlayOutChat(removedComponent)); - resend = true; - continue; + else { + new BukkitRunnable() { + public void run() { + final Map> packets = new HashMap(); + for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { + List messages = p.getMessages(); + List playerPackets = new ArrayList(); + boolean resend = false; + for(int fill = 0; fill < 100 - messages.size(); fill++) { + playerPackets.add(Removemessage.this.emptyLinePacketContainer); } - if(message.getMessage().contains(ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))))) { - String submessage = message.getMessage().substring(0, message.getMessage().length() - ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))).length()); - if(submessage.hashCode() == hash) { + for(ChatMessage message : messages) { + //System.out.println(message.getMessage() + " remover test"); + if(message.getHash() == hash) { WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); message.setComponent(removedComponent); message.setHash(-1); @@ -94,25 +85,54 @@ public class Removemessage extends MineverseCommand { resend = true; continue; } - } - /*if(message.getMessage().contains(Format.FormatStringAll(plugin.getConfig().getString("messageremovericon")))) { - String submessage = message.getMessage().substring(0, message.getMessage().length() - plugin.getConfig().getString("messageremovericon").length() - 1).replaceAll("(§([a-z0-9]))", ""); - if(submessage.hashCode() == hash) { - WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); - message.setComponent(removedComponent); - message.setHash(-1); - playerPackets.add(Removemessage.this.createPacketPlayOutChat(removedComponent)); - resend = true; - continue; + if(message.getMessage().contains(ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))))) { + String submessage = message.getMessage().substring(0, message.getMessage().length() - ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))).length()); + if(submessage.hashCode() == hash) { + WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); + message.setComponent(removedComponent); + message.setHash(-1); + playerPackets.add(Removemessage.this.createPacketPlayOutChat(removedComponent)); + resend = true; + continue; + } + } + /*if(message.getMessage().contains(Format.FormatStringAll(plugin.getConfig().getString("messageremovericon")))) { + String submessage = message.getMessage().substring(0, message.getMessage().length() - plugin.getConfig().getString("messageremovericon").length() - 1).replaceAll("(§([a-z0-9]))", ""); + if(submessage.hashCode() == hash) { + WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); + message.setComponent(removedComponent); + message.setHash(-1); + playerPackets.add(Removemessage.this.createPacketPlayOutChat(removedComponent)); + resend = true; + continue; + } + int cut = 0; + for(JsonButton b : MineverseChat.jbInfo.getJsonButtons()) { + if(b.hasPermission() && p.getPlayer().hasPermission(b.getPermission())) { + cut += b.getIcon().length() - 1; + } + } + submessage = submessage.substring(0, submessage.length() - cut).replaceAll("(§([a-z0-9]))", ""); + //System.out.println(submessage + " submess"); + if(submessage.hashCode() == hash) { + WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); + message.setComponent(removedComponent); + message.setHash(-1); + playerPackets.add(Removemessage.this.createPacketPlayOutChat(removedComponent)); + resend = true; + continue; + } } int cut = 0; for(JsonButton b : MineverseChat.jbInfo.getJsonButtons()) { - if(b.hasPermission() && p.getPlayer().hasPermission(b.getPermission())) { + if(b.hasPermission() && p.getPlayer().hasPermission(b.getPermission()) && message.getMessage().contains(b.getIcon())) { cut += b.getIcon().length() - 1; } } - submessage = submessage.substring(0, submessage.length() - cut).replaceAll("(§([a-z0-9]))", ""); - //System.out.println(submessage + " submess"); + String submessage = message.getMessage().replaceAll("(§([a-z0-9]))", ""); + //System.out.println(submessage + " " + submessage.length()); + submessage = submessage.substring(0, submessage.length() - cut); + //System.out.println(submessage); if(submessage.hashCode() == hash) { WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); message.setComponent(removedComponent); @@ -120,46 +140,28 @@ public class Removemessage extends MineverseCommand { playerPackets.add(Removemessage.this.createPacketPlayOutChat(removedComponent)); resend = true; continue; + }*/ + //System.out.println(message.getComponent().getJson()); + playerPackets.add(Removemessage.this.createPacketPlayOutChat(message.getComponent())); + + } + if(resend) { + packets.put(p.getPlayer(), playerPackets); + } + } + new BukkitRunnable() { + public void run() { + for(Player p : packets.keySet()) { + List pPackets = packets.get(p); + for(PacketContainer c : pPackets) { + Removemessage.this.sendPacketPlayOutChat(p, c); + } } } - int cut = 0; - for(JsonButton b : MineverseChat.jbInfo.getJsonButtons()) { - if(b.hasPermission() && p.getPlayer().hasPermission(b.getPermission()) && message.getMessage().contains(b.getIcon())) { - cut += b.getIcon().length() - 1; - } - } - String submessage = message.getMessage().replaceAll("(§([a-z0-9]))", ""); - //System.out.println(submessage + " " + submessage.length()); - submessage = submessage.substring(0, submessage.length() - cut); - //System.out.println(submessage); - if(submessage.hashCode() == hash) { - WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer(); - message.setComponent(removedComponent); - message.setHash(-1); - playerPackets.add(Removemessage.this.createPacketPlayOutChat(removedComponent)); - resend = true; - continue; - }*/ - //System.out.println(message.getComponent().getJson()); - playerPackets.add(Removemessage.this.createPacketPlayOutChat(message.getComponent())); - - } - if(resend) { - packets.put(p.getPlayer(), playerPackets); - } + }.runTask(plugin); } - new BukkitRunnable() { - public void run() { - for(Player p : packets.keySet()) { - List pPackets = packets.get(p); - for(PacketContainer c : pPackets) { - Removemessage.this.sendPacketPlayOutChat(p, c); - } - } - } - }.runTask(plugin); - } - }.runTaskAsynchronously(plugin); + }.runTaskAsynchronously(plugin); + } } private PacketContainer createPacketPlayOutChat(WrappedChatComponent component) {