mirror of
https://github.com/Aust1n46/VentureChat.git
synced 2025-05-22 18:09:06 +00:00
Updated to 1.13
This commit is contained in:
Aust1n46
parent
e30338c926
commit
c57f178b3d
34
.classpath
34
.classpath
@ -1,17 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="MineverseChat"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.11.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/plugins/Vault.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/plugins/PlaceholderAPI.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.8.8-R0.1-SNAPSHOT.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/MineverseChat Dependencies/Factions-2.7.3/Factions-2.7.3/Factions.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/MineverseChat Dependencies/Factions-2.7.3/Factions-2.7.3/MassiveCore.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/MineverseChat Dependencies/Upload/Plugins/Towny.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/MineverseChat Dependencies/BungeeCord.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/MineverseChat Dependencies/Upload/Plugins/Heroes.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/MineverseChat Dependencies/pircbotx-2.0.1.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/plugins/ProtocolLib.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="MineverseChat"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Factions.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Heroes.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/MassiveCore.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/pircbotx-2.0.1.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/PlaceholderAPI-2.8.2.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/ProtocolLib.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/spigot-1.12.2-R0.1-SNAPSHOT-b1581.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Towny.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Vault.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/BungeeCord.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/spigot-1.8.8-R0.1-SNAPSHOT.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@ -134,7 +134,7 @@ emptychannelalert: "&6No one is listening to you."
|
||||
messageremoverpermissions: '&cYou need additional permissions to view this message!'
|
||||
|
||||
# The name of the group is the permissions node for the format
|
||||
# Example: mineversechat.json.Owner is the node for the group Owner
|
||||
# Example: venturechat.json.Owner is the node for the group Owner
|
||||
# A lower priority overrides a higher priority if a player has more than 1 group
|
||||
# Possible options for click_name and click_prefix are suggest_command, run_command, and open_url
|
||||
jsonformatting:
|
||||
|
||||
@ -449,8 +449,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
|
||||
*/
|
||||
}
|
||||
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord"));
|
||||
Bukkit.getMessenger().registerOutgoingPluginChannel(this, "VentureChat");
|
||||
Bukkit.getMessenger().registerIncomingPluginChannel(this, "VentureChat", this);
|
||||
Bukkit.getMessenger().registerOutgoingPluginChannel(this, "venturechat:");
|
||||
Bukkit.getMessenger().registerIncomingPluginChannel(this, "venturechat:", this);
|
||||
if(pluginManager.isPluginEnabled("Towny")) {
|
||||
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Towny Formatting"));
|
||||
}
|
||||
@ -589,7 +589,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
else {
|
||||
else if(!VersionHandler.is1_13()){
|
||||
try {
|
||||
MineverseChat.posField = MinecraftReflection.getMinecraftClass("PacketPlayOutChat").getDeclaredField("b");
|
||||
MineverseChat.posField.setAccessible(true);
|
||||
@ -613,6 +613,34 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
try {
|
||||
MineverseChat.posField = MinecraftReflection.getMinecraftClass("PacketPlayOutChat").getDeclaredField("b");
|
||||
MineverseChat.posField.setAccessible(true);
|
||||
}
|
||||
catch(NoSuchFieldException | SecurityException localNoSuchFieldException) {
|
||||
localNoSuchFieldException.printStackTrace();
|
||||
}
|
||||
try {
|
||||
/*for(Method m : MinecraftReflection.getMinecraftClass("ChatBaseComponent").getDeclaredMethods()) {
|
||||
System.out.println(m.getName());
|
||||
}*/
|
||||
|
||||
MineverseChat.messageMethod = MinecraftReflection.getMinecraftClass("ChatBaseComponent").getDeclaredMethod("getString", new Class[0]);
|
||||
MineverseChat.messageMethod.setAccessible(true);
|
||||
}
|
||||
catch(SecurityException | NoSuchMethodException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if(!VersionHandler.is1_9() && !VersionHandler.is1_10() && !VersionHandler.is1_11()) {
|
||||
try {
|
||||
MineverseChat.chatMessageType = getNMSClass("ChatMessageType");
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Class<?> getNMSClass(String name) {
|
||||
@ -736,7 +764,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
|
||||
out.writeBoolean(mcp.getMessageToggle());
|
||||
}
|
||||
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
|
||||
p.getPlayer().sendPluginMessage(this, "VentureChat", outstream.toByteArray());
|
||||
p.getPlayer().sendPluginMessage(this, "venturechat:", outstream.toByteArray());
|
||||
break;
|
||||
}
|
||||
// System.out.println("Sync start bottom...");
|
||||
@ -765,7 +793,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, "venturechat:", outstream.toByteArray());
|
||||
// System.out.println("Sync start bottom...");
|
||||
out.close();
|
||||
}
|
||||
@ -776,7 +804,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
|
||||
|
||||
@Override
|
||||
public void onPluginMessageReceived(String channel, Player player, byte[] message) {
|
||||
if(!channel.equals("VentureChat")) {
|
||||
if(!channel.equals("venturechat:")) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
@ -917,7 +945,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, "venturechat:", stream.toByteArray());
|
||||
return;
|
||||
}
|
||||
p.setReplyPlayer(sender);
|
||||
@ -926,7 +954,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, "venturechat:", stream.toByteArray());
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Offline")) {
|
||||
@ -973,7 +1001,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, "venturechat:", stream.toByteArray());
|
||||
return;
|
||||
}
|
||||
if(p.getIgnores().contains(sender)) {
|
||||
@ -982,7 +1010,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, "venturechat:", stream.toByteArray());
|
||||
return;
|
||||
}
|
||||
if(!p.getMessageToggle()) {
|
||||
@ -991,7 +1019,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, "venturechat:", stream.toByteArray());
|
||||
return;
|
||||
}
|
||||
if(s != null) {
|
||||
@ -1029,7 +1057,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, "venturechat:", stream.toByteArray());
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Offline")) {
|
||||
@ -1102,7 +1130,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1116,7 +1144,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1130,7 +1158,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1145,7 +1173,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1177,7 +1205,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1189,7 +1217,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1202,7 +1230,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e1) {
|
||||
e1.printStackTrace();
|
||||
@ -1224,7 +1252,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1246,7 +1274,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1274,7 +1302,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1296,7 +1324,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1322,7 +1350,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1344,7 +1372,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1358,7 +1386,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1373,7 +1401,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
@ -1393,7 +1421,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, "venturechat:", stream.toByteArray());
|
||||
}
|
||||
catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
@ -84,7 +84,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");
|
||||
this.getProxy().registerChannel("venturechat:");
|
||||
this.getProxy().getPluginManager().registerListener(this, this);
|
||||
if(bungeeconfig.getBoolean("muting")) {
|
||||
getProxy().getPluginManager().registerCommand(this, new GlobalMute(this, "globalmute"));
|
||||
@ -135,8 +135,8 @@ public class MineverseChatBungee extends Plugin implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onPluginMessage(PluginMessageEvent ev) {
|
||||
//System.out.println(ev.getTag() + " " + ev.getSender().toString());
|
||||
if(!ev.getTag().equals("VentureChat")) {
|
||||
//System.out.println(ev.getTag() + "," + ev.getSender().toString() + "," + (ev.getSender() instanceof Server));
|
||||
if(!ev.getTag().equals("venturechat:")) {
|
||||
return;
|
||||
}
|
||||
if(!(ev.getSender() instanceof Server)) {
|
||||
@ -154,6 +154,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
|
||||
String chatchannel = in.readUTF();
|
||||
String message = in.readUTF();
|
||||
String playerName = in.readUTF();
|
||||
boolean bungeeToggle = in.readBoolean();
|
||||
String lastMessage = in.readUTF();
|
||||
String f = in.readUTF();
|
||||
String c = in.readUTF();
|
||||
@ -168,7 +169,10 @@ public class MineverseChatBungee extends Plugin implements Listener {
|
||||
out.writeUTF(json);
|
||||
for(String send : getProxy().getServers().keySet()) {
|
||||
if(getProxy().getServers().get(send).getPlayers().size() > 0) {
|
||||
getProxy().getServers().get(send).sendData("VentureChat", outstream.toByteArray());
|
||||
if(!bungeeToggle && !getProxy().getServers().get(send).getName().equalsIgnoreCase(ser.getInfo().getName())) {
|
||||
continue;
|
||||
}
|
||||
getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -178,7 +182,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", outstream.toByteArray());
|
||||
getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -197,7 +201,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
|
||||
out.writeUTF(player);
|
||||
out.writeUTF(sender);
|
||||
if(getProxy().getServers().get(send).getPlayers().size() > 0) {
|
||||
getProxy().getServers().get(send).sendData("VentureChat", outstream.toByteArray());
|
||||
getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -220,7 +224,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -233,7 +237,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -260,7 +264,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
|
||||
out.writeUTF(echo);
|
||||
out.writeUTF(spy);
|
||||
if(getProxy().getServers().get(send).getPlayers().size() > 0) {
|
||||
getProxy().getServers().get(send).sendData("VentureChat", outstream.toByteArray());
|
||||
getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -283,7 +287,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -296,7 +300,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
if(identifier.equals("Blocked")) {
|
||||
@ -308,7 +312,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
if(identifier.equals("Echo")) {
|
||||
@ -324,7 +328,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
outstream = new ByteArrayOutputStream();
|
||||
out = new DataOutputStream(outstream);
|
||||
@ -336,7 +340,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -380,7 +384,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
if(identifier.equals("Update")) {
|
||||
UUID uuid = UUID.fromString(in.readUTF());
|
||||
@ -421,7 +425,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
if(identifier.equals("PlayersUpdate")) {
|
||||
networkPlayers.clear();
|
||||
@ -439,7 +443,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("venturechat:", outstream.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -248,13 +248,17 @@ public class Party extends MineverseCommand {
|
||||
String members = "";
|
||||
long linecount = plugin.getLineLength();
|
||||
for(MineverseChatPlayer p : MineverseChat.players) {
|
||||
if(p.getParty().equals(player.getUUID())) {
|
||||
if(p.getParty() != null && p.getParty().equals(player.getUUID())) {
|
||||
if(members.length() + p.getName().length() > linecount) {
|
||||
members += "\n";
|
||||
linecount = linecount + plugin.getLineLength();
|
||||
}
|
||||
if(p.isOnline()) members += ChatColor.GREEN + p.getName() + ChatColor.WHITE + ", ";
|
||||
else members += ChatColor.RED + p.getName() + ChatColor.WHITE + ", ";
|
||||
if(p.isOnline()) {
|
||||
members += ChatColor.GREEN + p.getName() + ChatColor.WHITE + ", ";
|
||||
}
|
||||
else {
|
||||
members += ChatColor.RED + p.getName() + ChatColor.WHITE + ", ";
|
||||
}
|
||||
}
|
||||
}
|
||||
if(members.length() > 2) {
|
||||
|
||||
@ -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, "venturechat:", byteOutStream.toByteArray());
|
||||
out.close();
|
||||
}
|
||||
catch(Exception e) {
|
||||
|
||||
@ -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, "venturechat:", byteOutStream.toByteArray());
|
||||
out.close();
|
||||
}
|
||||
catch(Exception e) {
|
||||
|
||||
@ -106,4 +106,10 @@ public class IRCCommandSender implements CommandSender {
|
||||
}
|
||||
Bukkit.getConsoleSender().sendMessage(messages);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Spigot spigot() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -722,6 +722,7 @@ public class ChatListener implements Listener {
|
||||
out.writeUTF(eventChannel.getName());
|
||||
out.writeUTF(Channelformat + event.getMessage());
|
||||
out.writeUTF(mcp.getName());
|
||||
out.writeBoolean(mcp.getBungeeToggle());
|
||||
out.writeUTF(message);
|
||||
out.writeUTF(format);
|
||||
out.writeUTF(chat);
|
||||
@ -732,7 +733,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", byteOutStream.toByteArray());
|
||||
mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray());
|
||||
out.close();
|
||||
}
|
||||
catch(Exception e) {
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
package mineverse.Aust1n46.chat.listeners;
|
||||
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
public class VentureChatListener implements Listener {
|
||||
|
||||
}
|
||||
@ -61,6 +61,10 @@ public class VersionHandler {
|
||||
return Bukkit.getVersion().contains("1.12");
|
||||
}
|
||||
|
||||
public static boolean is1_13() {
|
||||
return Bukkit.getVersion().contains("1.13");
|
||||
}
|
||||
|
||||
public static boolean isCauldron() {
|
||||
return false;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user