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

Changed plugin message channel from 'venturechat:' to 'venturechat:data'

Browse Source 
(additional files)
This commit is contained in:
Aust1n46 2019-12-29 17:59:11 -05:00
parent bd59a5c449
commit ad4bf319f7
9 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MineverseChat/bungee.yml
View File

@ -1,4 +1,4 @@
name: VentureChat name: VentureChat
main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
version: 2.17.1 version: 2.17.2
author: Aust1n46 author: Aust1n46

59
MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
View File

@ -168,6 +168,9 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
public static boolean capeToggle = false; public static boolean capeToggle = false;
private boolean firstRun = true; private boolean firstRun = true;
// Plugin Messaging Channel
public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data";
// Vault -------------------------------- // Vault --------------------------------
public static Permission permission = null; public static Permission permission = null;
public static Chat chat = null; public static Chat chat = null;
@ -440,8 +443,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
*/ */
} }
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord")); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord"));
Bukkit.getMessenger().registerOutgoingPluginChannel(this, "venturechat:data"); Bukkit.getMessenger().registerOutgoingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL);
Bukkit.getMessenger().registerIncomingPluginChannel(this, "venturechat:data", this); Bukkit.getMessenger().registerIncomingPluginChannel(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, this);
if(pluginManager.isPluginEnabled("Towny")) { if(pluginManager.isPluginEnabled("Towny")) {
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Towny Formatting")); 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()); out.writeBoolean(mcp.getMessageToggle());
} }
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
p.getPlayer().sendPluginMessage(this, "venturechat:data", outstream.toByteArray()); p.getPlayer().sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
break; break;
} }
// System.out.println("Sync start bottom..."); // System.out.println("Sync start bottom...");
@ -781,7 +784,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(p + "," + networkPlayers.get(p)); 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..."); // System.out.println("Sync start bottom...");
out.close(); out.close();
} }
@ -792,7 +795,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
@Override @Override
public void onPluginMessageReceived(String channel, Player player, byte[] message) { public void onPluginMessageReceived(String channel, Player player, byte[] message) {
if(!channel.equals("venturechat:data")) { if(!channel.equals(MineverseChat.PLUGIN_MESSAGING_CHANNEL)) {
return; return;
} }
try { try {
@ -867,7 +870,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
for(String s : listening) { for(String s : listening) {
out.writeUTF(s); out.writeUTF(s);
} }
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
if(identifier.equals("Receive")) { if(identifier.equals("Receive")) {
String sender = msgin.readUTF(); String sender = msgin.readUTF();
@ -981,7 +984,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(server); out.writeUTF(server);
out.writeUTF(receiver); out.writeUTF(receiver);
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }
p.setReplyPlayer(sender); p.setReplyPlayer(sender);
@ -990,7 +993,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(server); out.writeUTF(server);
out.writeUTF(p.getUUID().toString()); out.writeUTF(p.getUUID().toString());
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }
if(identifier.equals("Offline")) { if(identifier.equals("Offline")) {
@ -1035,7 +1038,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(server); out.writeUTF(server);
out.writeUTF(receiver); out.writeUTF(receiver);
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }
if(p.getIgnores().contains(sender)) { if(p.getIgnores().contains(sender)) {
@ -1044,7 +1047,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(server); out.writeUTF(server);
out.writeUTF(receiver); out.writeUTF(receiver);
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }
if(!p.getMessageToggle()) { if(!p.getMessageToggle()) {
@ -1053,7 +1056,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(server); out.writeUTF(server);
out.writeUTF(receiver); out.writeUTF(receiver);
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }
if(s != null) { if(s != null) {
@ -1091,7 +1094,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(sName); out.writeUTF(sName);
out.writeUTF(echo); out.writeUTF(echo);
out.writeUTF(spy); out.writeUTF(spy);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }
if(identifier.equals("Offline")) { if(identifier.equals("Offline")) {
@ -1162,7 +1165,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Channel"); out.writeUTF("Channel");
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(chatchannel); out.writeUTF(chatchannel);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1176,7 +1179,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(mutePlayer); out.writeUTF(mutePlayer);
out.writeUTF(server); out.writeUTF(server);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1190,7 +1193,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(cc.getName()); out.writeUTF(cc.getName());
out.writeUTF(cc.getColor()); out.writeUTF(cc.getColor());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1205,7 +1208,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(mutePlayer); out.writeUTF(mutePlayer);
out.writeUTF(cc.getName()); out.writeUTF(cc.getName());
out.writeUTF(cc.getColor()); out.writeUTF(cc.getColor());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1237,7 +1240,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(cc.getName()); out.writeUTF(cc.getName());
out.writeUTF(cc.getColor()); out.writeUTF(cc.getColor());
out.writeUTF(time); out.writeUTF(time);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1249,7 +1252,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Time"); out.writeUTF("Time");
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(time); out.writeUTF(time);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1262,7 +1265,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Time"); out.writeUTF("Time");
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(time); out.writeUTF(time);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e1) { catch(Exception e1) {
e1.printStackTrace(); e1.printStackTrace();
@ -1284,7 +1287,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(cc.getName()); out.writeUTF(cc.getName());
out.writeUTF(cc.getColor()); out.writeUTF(cc.getColor());
out.writeUTF(time); out.writeUTF(time);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1304,7 +1307,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(muteplayer); out.writeUTF(muteplayer);
out.writeUTF(server); out.writeUTF(server);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1332,7 +1335,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Valid"); out.writeUTF("Valid");
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(muteplayer); out.writeUTF(muteplayer);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1352,7 +1355,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(muteplayer); out.writeUTF(muteplayer);
out.writeUTF(server); out.writeUTF(server);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1378,7 +1381,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Valid"); out.writeUTF("Valid");
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(muteplayer); out.writeUTF(muteplayer);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1398,7 +1401,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Channel"); out.writeUTF("Channel");
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(chatchannel); out.writeUTF(chatchannel);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1412,7 +1415,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(sendplayer); out.writeUTF(sendplayer);
out.writeUTF(mutePlayer); out.writeUTF(mutePlayer);
out.writeUTF(server); out.writeUTF(server);
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1427,7 +1430,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(mutePlayer); out.writeUTF(mutePlayer);
out.writeUTF(cc.getName()); out.writeUTF(cc.getName());
out.writeUTF(cc.getColor()); out.writeUTF(cc.getColor());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1447,7 +1450,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(mutePlayer); out.writeUTF(mutePlayer);
out.writeUTF(cc.getName()); out.writeUTF(cc.getName());
out.writeUTF(cc.getColor()); out.writeUTF(cc.getColor());
player.sendPluginMessage(this, "venturechat:", stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
} }
catch(Exception e) { catch(Exception e) {
e.printStackTrace(); e.printStackTrace();

37
MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
View File

@ -39,6 +39,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
private Configuration playerData; private Configuration playerData;
public static Set<SynchronizedMineverseChatPlayer> players = new HashSet<SynchronizedMineverseChatPlayer>(); public static Set<SynchronizedMineverseChatPlayer> players = new HashSet<SynchronizedMineverseChatPlayer>();
public static HashMap<String, String> networkPlayers = new HashMap<String, String>(); public static HashMap<String, String> networkPlayers = new HashMap<String, String>();
public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data";
@Override @Override
public void onEnable() { public void onEnable() {
@ -84,7 +85,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
boolean messageToggle = playerData.getBoolean(uuidString + ".messagetoggle"); boolean messageToggle = playerData.getBoolean(uuidString + ".messagetoggle");
players.add(new SynchronizedMineverseChatPlayer(uuid, listening, mutes, ignores, spy, 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); this.getProxy().getPluginManager().registerListener(this, this);
if(bungeeconfig.getBoolean("muting")) { if(bungeeconfig.getBoolean("muting")) {
getProxy().getPluginManager().registerCommand(this, new GlobalMute(this, "globalmute")); getProxy().getPluginManager().registerCommand(this, new GlobalMute(this, "globalmute"));
@ -136,7 +137,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
@EventHandler @EventHandler
public void onPluginMessage(PluginMessageEvent ev) { public void onPluginMessage(PluginMessageEvent ev) {
//System.out.println(ev.getTag() + "," + ev.getSender().toString() + "," + (ev.getSender() instanceof Server)); //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; return;
} }
if(!(ev.getSender() instanceof Server)) { 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())) { if(!bungeeToggle && !getProxy().getServers().get(send).getName().equalsIgnoreCase(ser.getInfo().getName())) {
continue; 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); out.writeUTF(channel);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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(); smcp.clearMessageData();
Server server = getProxy().getPlayer(name).getServer(); 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); out.writeUTF(hash);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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); out.writeUTF(sender);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { 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(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { 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); out.writeUTF(spy);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { 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(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { 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")) { if(identifier.equals("Blocked")) {
@ -364,7 +365,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { 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")) { if(identifier.equals("Echo")) {
@ -380,7 +381,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(sender); out.writeUTF(sender);
out.writeUTF(echo); out.writeUTF(echo);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { 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(); outstream = new ByteArrayOutputStream();
out = new DataOutputStream(outstream); out = new DataOutputStream(outstream);
@ -392,7 +393,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(spy); out.writeUTF(spy);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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()); out.writeUTF(ignore.toString());
} }
if(getProxy().getServers().get(server).getPlayers().size() > 0) 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")) { if(identifier.equals("Update")) {
UUID uuid = UUID.fromString(in.readUTF()); UUID uuid = UUID.fromString(in.readUTF());
@ -477,7 +478,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(s + "," + networkPlayers.get(s)); out.writeUTF(s + "," + networkPlayers.get(s));
} }
if(getProxy().getServers().get(server).getPlayers().size() > 0) 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")) { if(identifier.equals("PlayersUpdate")) {
networkPlayers.clear(); networkPlayers.clear();
@ -495,7 +496,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
} }
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) 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());
} }
} }
} }

2
MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java
View File

@ -55,7 +55,7 @@ public class Chwho extends MineverseCommand {
out.writeUTF(mcp.getUUID().toString()); out.writeUTF(mcp.getUUID().toString());
out.writeUTF(mcp.getName()); out.writeUTF(mcp.getName());
out.writeUTF(channel.getName()); out.writeUTF(channel.getName());
mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray());
out.close(); out.close();
} }
catch(Exception e) { catch(Exception e) {

2
MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java
View File

@ -56,7 +56,7 @@ public class Removemessage extends MineverseCommand {
try { try {
out.writeUTF("RemoveMessage"); out.writeUTF("RemoveMessage");
out.writeUTF(String.valueOf(hash)); out.writeUTF(String.valueOf(hash));
((Player) sender).sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); ((Player) sender).sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray());
out.close(); out.close();
} }
catch(Exception e) { catch(Exception e) {

2
MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java
View File

@ -87,7 +87,7 @@ public class Message extends MineverseCommand {
out.writeUTF(send); out.writeUTF(send);
out.writeUTF(echo); out.writeUTF(echo);
out.writeUTF(spy); out.writeUTF(spy);
mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray());
out.close(); out.close();
} }
catch(Exception e) { catch(Exception e) {

2
MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java
View File

@ -73,7 +73,7 @@ public class Reply extends MineverseCommand {
out.writeUTF(send); out.writeUTF(send);
out.writeUTF(echo); out.writeUTF(echo);
out.writeUTF(spy); out.writeUTF(spy);
mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray());
out.close(); out.close();
} }
catch(Exception e) { catch(Exception e) {

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

@ -739,7 +739,7 @@ public class ChatListener implements Listener {
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) { if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
System.out.println(out.size() + " bytes size with json"); 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(); //PluginMessageRecipient test = (PluginMessageRecipient) mcp.getPlayer();
//System.out.println("Listening plugin channels?"); //System.out.println("Listening plugin channels?");

2
MineverseChat/plugin.yml
View File

@ -1,5 +1,5 @@
name: VentureChat name: VentureChat
version: 2.17.1 version: 2.17.2
api-version: 1.13 api-version: 1.13
main: mineverse.Aust1n46.chat.MineverseChat main: mineverse.Aust1n46.chat.MineverseChat
depend: [Vault, ProtocolLib, PlaceholderAPI] depend: [Vault, ProtocolLib, PlaceholderAPI]