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

Fixed color formatting for private messages that respect permissions.

Browse Source
This commit is contained in:
Aust1n46 2021-02-07 21:36:16 -06:00
parent 13bd351c41
commit a943df7f3d
4 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mineverse/Aust1n46/chat/MineverseChat.java
View File

@ -949,9 +949,10 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
String sName = msgin.readUTF(); String sName = msgin.readUTF();
MineverseChatPlayer s = MineverseChatAPI.getMineverseChatPlayer(sender); MineverseChatPlayer s = MineverseChatAPI.getMineverseChatPlayer(sender);
String msg = msgin.readUTF(); String send = msgin.readUTF();
String echo = msgin.readUTF(); String echo = msgin.readUTF();
String spy = msgin.readUTF(); String spy = msgin.readUTF();
String msg = msgin.readUTF();
if(!this.getConfig().getBoolean("bungeecordmessaging", true) || p == null || !p.isOnline()) { if(!this.getConfig().getBoolean("bungeecordmessaging", true) || p == null || !p.isOnline()) {
out.writeUTF("Message"); out.writeUTF("Message");
out.writeUTF("Offline"); out.writeUTF("Offline");
@ -995,7 +996,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
s = new MineverseChatPlayer(uuid, name, current, ignores, listening, mutes, blockedCommands, false, null, true, true, name, jsonFormat, false, false, false, true, true); s = new MineverseChatPlayer(uuid, name, current, ignores, listening, mutes, blockedCommands, false, null, true, true, name, jsonFormat, false, false, false, true, true);
MineverseChat.players.add(s); MineverseChat.players.add(s);
} }
p.getPlayer().sendMessage(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), msg.replaceAll("receiver_", ""))); p.getPlayer().sendMessage(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), send.replaceAll("receiver_", ""))) + msg);
if(p.hasNotifications()) { if(p.hasNotifications()) {
if(VersionHandler.is1_8() || VersionHandler.is1_7_10() || VersionHandler.is1_7_2() || VersionHandler.is1_7_9()) { if(VersionHandler.is1_8() || VersionHandler.is1_7_10() || VersionHandler.is1_7_2() || VersionHandler.is1_7_9()) {
p.getPlayer().playSound(p.getPlayer().getLocation(), Sound.valueOf("LEVEL_UP"), 1, 0); p.getPlayer().playSound(p.getPlayer().getLocation(), Sound.valueOf("LEVEL_UP"), 1, 0);
@ -1011,8 +1012,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF(receiver); out.writeUTF(receiver);
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
out.writeUTF(sName); out.writeUTF(sName);
out.writeUTF(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))); out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg);
out.writeUTF(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))); out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))) + msg);
player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }

12
src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
View File

@ -350,9 +350,10 @@ public class MineverseChatBungee extends Plugin implements Listener {
String player = in.readUTF(); String player = in.readUTF();
String sender = in.readUTF(); String sender = in.readUTF();
String sName = in.readUTF(); String sName = in.readUTF();
String message = in.readUTF(); String send = in.readUTF();
String echo = in.readUTF(); String echo = in.readUTF();
String spy = in.readUTF(); String spy = in.readUTF();
String msg = in.readUTF();
SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender)); SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender));
smcp.clearMessagePackets(); smcp.clearMessagePackets();
out.writeUTF("Message"); out.writeUTF("Message");
@ -361,12 +362,13 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(sender); out.writeUTF(sender);
out.writeUTF(sName); out.writeUTF(sName);
out.writeUTF(message); out.writeUTF(send);
out.writeUTF(echo); out.writeUTF(echo);
out.writeUTF(spy); out.writeUTF(spy);
for(String send : getProxy().getServers().keySet()) { out.writeUTF(msg);
if(getProxy().getServers().get(send).getPlayers().size() > 0) { for(String serv : getProxy().getServers().keySet()) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); if(getProxy().getServers().get(serv).getPlayers().size() > 0) {
getProxy().getServers().get(serv).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }

10
src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java
View File

@ -198,13 +198,10 @@ public class MessageCommandExecutor implements TabExecutor {
if(mcp.getPlayer().hasPermission("venturechat.format")) { if(mcp.getPlayer().hasPermission("venturechat.format")) {
msg = Format.FormatString(msg); msg = Format.FormatString(msg);
} }
send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom")) + msg;
echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto")) + msg;
spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy")) + msg;
send = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), send.replaceAll("sender_", "")); send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
echo = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), echo.replaceAll("sender_", "")); echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
spy = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), spy.replaceAll("sender_", "")); spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
try { try {
out.writeUTF("Message"); out.writeUTF("Message");
out.writeUTF("Send"); out.writeUTF("Send");
@ -214,6 +211,7 @@ public class MessageCommandExecutor implements TabExecutor {
out.writeUTF(send); out.writeUTF(send);
out.writeUTF(echo); out.writeUTF(echo);
out.writeUTF(spy); out.writeUTF(spy);
out.writeUTF(msg);
mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray());
out.close(); out.close();
} }

22
src/mineverse/Aust1n46/chat/command/message/Reply.java
View File

@ -131,13 +131,22 @@ public class Reply extends MineverseCommand {
for(int r = 0; r < args.length; r++) { for(int r = 0; r < args.length; r++) {
msg += " " + args[r]; msg += " " + args[r];
} }
send = Format.FormatStringAll(plugin.getConfig().getString("replyformatfrom")) + msg; if(mcp.hasFilter()) {
echo = Format.FormatStringAll(plugin.getConfig().getString("replyformatto")) + msg; msg = Format.FilterChat(msg);
spy = Format.FormatStringAll(plugin.getConfig().getString("replyformatspy")) + msg; }
if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
msg = Format.FormatStringLegacyColor(msg);
}
if(mcp.getPlayer().hasPermission("venturechat.color")) {
msg = Format.FormatStringColor(msg);
}
if(mcp.getPlayer().hasPermission("venturechat.format")) {
msg = Format.FormatString(msg);
}
send = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), send.replaceAll("sender_", "")); send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
echo = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), echo.replaceAll("sender_", "")); echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
spy = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), spy.replaceAll("sender_", "")); spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));
try { try {
out.writeUTF("Message"); out.writeUTF("Message");
out.writeUTF("Send"); out.writeUTF("Send");
@ -147,6 +156,7 @@ public class Reply extends MineverseCommand {
out.writeUTF(send); out.writeUTF(send);
out.writeUTF(echo); out.writeUTF(echo);
out.writeUTF(spy); out.writeUTF(spy);
out.writeUTF(msg);
mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray());
out.close(); out.close();
} }