From ad4bf319f7b5cda5bb225febd34b78e7b38e36c9 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sun, 29 Dec 2019 17:59:11 -0500 Subject: [PATCH] Changed plugin message channel from 'venturechat:' to 'venturechat:data' (additional files) --- MineverseChat/bungee.yml | 2 +- .../Aust1n46/chat/MineverseChat.java | 59 ++++++++++--------- .../chat/bungee/MineverseChatBungee.java | 37 ++++++------ .../Aust1n46/chat/command/chat/Chwho.java | 2 +- .../chat/command/chat/Removemessage.java | 2 +- .../chat/command/message/Message.java | 2 +- .../Aust1n46/chat/command/message/Reply.java | 2 +- .../Aust1n46/chat/listeners/ChatListener.java | 2 +- MineverseChat/plugin.yml | 2 +- 9 files changed, 57 insertions(+), 53 deletions(-) diff --git a/MineverseChat/bungee.yml b/MineverseChat/bungee.yml index fa0357a..1323a9b 100644 --- a/MineverseChat/bungee.yml +++ b/MineverseChat/bungee.yml @@ -1,4 +1,4 @@ name: VentureChat main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee -version: 2.17.1 +version: 2.17.2 author: Aust1n46 \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index 92d1c37..63b8be3 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -167,6 +167,9 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { public static ItemStack banner; public static boolean capeToggle = false; private boolean firstRun = true; + + // Plugin Messaging Channel + public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; // Vault -------------------------------- public static Permission permission = null; @@ -440,8 +443,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { */ } Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord")); - Bukkit.getMessenger().registerOutgoingPluginChannel(this, "venturechat:data"); - Bukkit.getMessenger().registerIncomingPluginChannel(this, "venturechat:data", this); + Bukkit.getMessenger().registerOutgoingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL); + Bukkit.getMessenger().registerIncomingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, this); if(pluginManager.isPluginEnabled("Towny")) { Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Towny Formatting")); } @@ -752,7 +755,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeBoolean(mcp.getMessageToggle()); } for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { - p.getPlayer().sendPluginMessage(this, "venturechat:data", outstream.toByteArray()); + p.getPlayer().sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); break; } // System.out.println("Sync start bottom..."); @@ -781,7 +784,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(p + "," + networkPlayers.get(p)); } } - mcp.getPlayer().sendPluginMessage(this, "venturechat:", outstream.toByteArray()); + mcp.getPlayer().sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); // System.out.println("Sync start bottom..."); out.close(); } @@ -792,7 +795,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { @Override public void onPluginMessageReceived(String channel, Player player, byte[] message) { - if(!channel.equals("venturechat:data")) { + if(!channel.equals(MineverseChat.PLUGIN_MESSAGING_CHANNEL)) { return; } try { @@ -867,7 +870,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { for(String s : listening) { out.writeUTF(s); } - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } if(identifier.equals("Receive")) { String sender = msgin.readUTF(); @@ -981,7 +984,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(server); out.writeUTF(receiver); out.writeUTF(sender.toString()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); return; } p.setReplyPlayer(sender); @@ -990,7 +993,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(server); out.writeUTF(p.getUUID().toString()); out.writeUTF(sender.toString()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); return; } if(identifier.equals("Offline")) { @@ -1035,7 +1038,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(server); out.writeUTF(receiver); out.writeUTF(sender.toString()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); return; } if(p.getIgnores().contains(sender)) { @@ -1044,7 +1047,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(server); out.writeUTF(receiver); out.writeUTF(sender.toString()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); return; } if(!p.getMessageToggle()) { @@ -1053,7 +1056,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(server); out.writeUTF(receiver); out.writeUTF(sender.toString()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); return; } if(s != null) { @@ -1091,7 +1094,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(sName); out.writeUTF(echo); out.writeUTF(spy); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); return; } if(identifier.equals("Offline")) { @@ -1162,7 +1165,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF("Channel"); out.writeUTF(sendplayer); out.writeUTF(chatchannel); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1176,7 +1179,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(sendplayer); out.writeUTF(mutePlayer); out.writeUTF(server); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1190,7 +1193,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(sendplayer); out.writeUTF(cc.getName()); out.writeUTF(cc.getColor()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1205,7 +1208,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(mutePlayer); out.writeUTF(cc.getName()); out.writeUTF(cc.getColor()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1237,7 +1240,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(cc.getName()); out.writeUTF(cc.getColor()); out.writeUTF(time); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1249,7 +1252,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF("Time"); out.writeUTF(sendplayer); out.writeUTF(time); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1262,7 +1265,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF("Time"); out.writeUTF(sendplayer); out.writeUTF(time); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e1) { e1.printStackTrace(); @@ -1284,7 +1287,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(cc.getName()); out.writeUTF(cc.getColor()); out.writeUTF(time); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1304,7 +1307,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(sendplayer); out.writeUTF(muteplayer); out.writeUTF(server); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1332,7 +1335,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF("Valid"); out.writeUTF(sendplayer); out.writeUTF(muteplayer); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1352,7 +1355,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(sendplayer); out.writeUTF(muteplayer); out.writeUTF(server); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1378,7 +1381,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF("Valid"); out.writeUTF(sendplayer); out.writeUTF(muteplayer); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1398,7 +1401,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF("Channel"); out.writeUTF(sendplayer); out.writeUTF(chatchannel); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1412,7 +1415,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(sendplayer); out.writeUTF(mutePlayer); out.writeUTF(server); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1427,7 +1430,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(mutePlayer); out.writeUTF(cc.getName()); out.writeUTF(cc.getColor()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); @@ -1447,7 +1450,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(mutePlayer); out.writeUTF(cc.getName()); out.writeUTF(cc.getColor()); - player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); + player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); } catch(Exception e) { e.printStackTrace(); diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java index c327267..0d30180 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java @@ -39,6 +39,7 @@ public class MineverseChatBungee extends Plugin implements Listener { private Configuration playerData; public static Set players = new HashSet(); public static HashMap networkPlayers = new HashMap(); + public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; @Override public void onEnable() { @@ -84,7 +85,7 @@ public class MineverseChatBungee extends Plugin implements Listener { boolean messageToggle = playerData.getBoolean(uuidString + ".messagetoggle"); players.add(new SynchronizedMineverseChatPlayer(uuid, listening, mutes, ignores, spy, messageToggle)); } - this.getProxy().registerChannel("venturechat:data"); + this.getProxy().registerChannel(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL); this.getProxy().getPluginManager().registerListener(this, this); if(bungeeconfig.getBoolean("muting")) { getProxy().getPluginManager().registerCommand(this, new GlobalMute(this, "globalmute")); @@ -136,7 +137,7 @@ public class MineverseChatBungee extends Plugin implements Listener { @EventHandler public void onPluginMessage(PluginMessageEvent ev) { //System.out.println(ev.getTag() + "," + ev.getSender().toString() + "," + (ev.getSender() instanceof Server)); - if(!ev.getTag().equals("venturechat:data") && !ev.getTag().contains("viaversion:")) { + if(!ev.getTag().equals(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL) && !ev.getTag().contains("viaversion:")) { return; } if(!(ev.getSender() instanceof Server)) { @@ -172,7 +173,7 @@ public class MineverseChatBungee extends Plugin implements Listener { if(!bungeeToggle && !getProxy().getServers().get(send).getName().equalsIgnoreCase(ser.getInfo().getName())) { continue; } - getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); + getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -192,7 +193,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(channel); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); + getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -224,7 +225,7 @@ public class MineverseChatBungee extends Plugin implements Listener { } smcp.clearMessageData(); Server server = getProxy().getPlayer(name).getServer(); - server.sendData("venturechat:data", outstream.toByteArray()); + server.sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -234,7 +235,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(hash); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); + getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -253,7 +254,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(sender); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); + getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -276,7 +277,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(player); out.writeUTF(sender); if(getProxy().getServers().get(server).getPlayers().size() > 0) { - getProxy().getServers().get(server).sendData("venturechat:data", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -289,7 +290,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(player); out.writeUTF(sender); if(getProxy().getServers().get(server).getPlayers().size() > 0) { - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -316,7 +317,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(spy); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -339,7 +340,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(player); out.writeUTF(sender); if(getProxy().getServers().get(server).getPlayers().size() > 0) { - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -352,7 +353,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(player); out.writeUTF(sender); if(getProxy().getServers().get(server).getPlayers().size() > 0) { - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } if(identifier.equals("Blocked")) { @@ -364,7 +365,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(player); out.writeUTF(sender); if(getProxy().getServers().get(server).getPlayers().size() > 0) { - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } if(identifier.equals("Echo")) { @@ -380,7 +381,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(sender); out.writeUTF(echo); if(getProxy().getServers().get(server).getPlayers().size() > 0) { - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } outstream = new ByteArrayOutputStream(); out = new DataOutputStream(outstream); @@ -392,7 +393,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(spy); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } @@ -436,7 +437,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(ignore.toString()); } if(getProxy().getServers().get(server).getPlayers().size() > 0) - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } if(identifier.equals("Update")) { UUID uuid = UUID.fromString(in.readUTF()); @@ -477,7 +478,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(s + "," + networkPlayers.get(s)); } if(getProxy().getServers().get(server).getPlayers().size() > 0) - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } if(identifier.equals("PlayersUpdate")) { networkPlayers.clear(); @@ -495,7 +496,7 @@ public class MineverseChatBungee extends Plugin implements Listener { } for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) - getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java index 311c5a9..f081bdc 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -55,7 +55,7 @@ public class Chwho extends MineverseCommand { out.writeUTF(mcp.getUUID().toString()); out.writeUTF(mcp.getName()); out.writeUTF(channel.getName()); - mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); + mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); out.close(); } catch(Exception e) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java index f374df8..d5cc3e1 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -56,7 +56,7 @@ public class Removemessage extends MineverseCommand { try { out.writeUTF("RemoveMessage"); out.writeUTF(String.valueOf(hash)); - ((Player) sender).sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); + ((Player) sender).sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); out.close(); } catch(Exception e) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java index 9fc08ef..af809e8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java @@ -87,7 +87,7 @@ public class Message extends MineverseCommand { out.writeUTF(send); out.writeUTF(echo); out.writeUTF(spy); - mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); + mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); out.close(); } catch(Exception e) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java index f142cb1..d7f6701 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java @@ -73,7 +73,7 @@ public class Reply extends MineverseCommand { out.writeUTF(send); out.writeUTF(echo); out.writeUTF(spy); - mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); + mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); out.close(); } catch(Exception e) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 26359b6..438d699 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -739,7 +739,7 @@ public class ChatListener implements Listener { if(plugin.getConfig().getString("loglevel", "info").equals("debug")) { System.out.println(out.size() + " bytes size with json"); } - mcp.getPlayer().sendPluginMessage(plugin, "venturechat:data", byteOutStream.toByteArray()); + mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); //PluginMessageRecipient test = (PluginMessageRecipient) mcp.getPlayer(); //System.out.println("Listening plugin channels?"); diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml index 7bc5158..4317173 100644 --- a/MineverseChat/plugin.yml +++ b/MineverseChat/plugin.yml @@ -1,5 +1,5 @@ name: VentureChat -version: 2.17.1 +version: 2.17.2 api-version: 1.13 main: mineverse.Aust1n46.chat.MineverseChat depend: [Vault, ProtocolLib, PlaceholderAPI]