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

Updated messaging formats for toggled conversations.

Browse Source
This commit is contained in:
Aust1n46 2021-02-07 23:51:37 -06:00
parent e6a0f928bc
commit 53b6e0b0c7
3 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,17 +91,14 @@ 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_", "")));
send = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", "")); send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", "")); echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", "")); spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;
player.setReplyPlayer(mcp.getUUID()); player.setReplyPlayer(mcp.getUUID());
mcp.setReplyPlayer(player.getUUID()); mcp.setReplyPlayer(player.getUUID());
@ -133,6 +130,9 @@ public class MessageCommandExecutor implements TabExecutor {
mcp.setConversation(player.getUUID()); mcp.setConversation(player.getUUID());
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) {
if(sp.getName().equals(mcp.getName())) {
continue;
}
if(sp.isSpy()) { if(sp.isSpy()) {
sp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION_SPY.toString() sp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", mcp.getName()) .replace("{player_sender}", mcp.getName())
@ -147,6 +147,9 @@ public class MessageCommandExecutor implements TabExecutor {
mcp.setConversation(null); mcp.setConversation(null);
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) {
if(sp.getName().equals(mcp.getName())) {
continue;
}
if(sp.isSpy()) { if(sp.isSpy()) {
sp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() sp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", mcp.getName()) .replace("{player_sender}", mcp.getName())

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

@ -77,17 +77,13 @@ public class Reply extends MineverseCommand {
msg = Format.FormatString(msg); msg = Format.FormatString(msg);
} }
echo = Format.FormatStringAll(plugin.getConfig().getString("replyformatto")) + msg; send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
send = Format.FormatStringAll(plugin.getConfig().getString("replyformatfrom")) + msg; echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
spy = Format.FormatStringAll(plugin.getConfig().getString("replyformatspy")) + msg; spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));
send = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), send.replaceAll("sender_", "")); send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), echo.replaceAll("sender_", "")); echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), spy.replaceAll("sender_", "")); spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;
send = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""));
echo = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""));
spy = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""));
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {

37
src/mineverse/Aust1n46/chat/listeners/ChatListener.java
View File

@ -83,6 +83,9 @@ public class ChatListener implements Listener {
mcp.getPlayer().sendMessage(ChatColor.RED + tp.getName() + " is not available."); mcp.getPlayer().sendMessage(ChatColor.RED + tp.getName() + " is not available.");
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
if(p.getName().equals(mcp.getName())) {
continue;
}
if(p.isSpy()) { if(p.isSpy()) {
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", mcp.getName()) .replace("{player_sender}", mcp.getName())
@ -109,7 +112,6 @@ public class ChatListener implements Listener {
String echo = ""; String echo = "";
String send = ""; String send = "";
String spy = ""; String spy = "";
String tellColor = plugin.getConfig().getString("tellcolor", "gray");
if(mcp.hasFilter()) { if(mcp.hasFilter()) {
filtered = Format.FilterChat(filtered); filtered = Format.FilterChat(filtered);
} }
@ -123,27 +125,21 @@ public class ChatListener implements Listener {
filtered = Format.FormatString(filtered); filtered = Format.FormatString(filtered);
} }
filtered = " " + filtered; filtered = " " + filtered;
if(plugin.getConfig().getString("tellformatto").equalsIgnoreCase("Default")) {
echo = "You message " + tp.getPlayer().getDisplayName() + ":" + ChatColor.valueOf(tellColor.toUpperCase()) + filtered; send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
} echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
else { spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto").replace("{playerto}", tp.getPlayer().getDisplayName()).replace("{playerfrom}", mcp.getPlayer().getDisplayName())) + filtered;
} send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), send.replaceAll("receiver_", ""))) + filtered;
if(plugin.getConfig().getString("tellformatfrom").equalsIgnoreCase("Default")) { echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), echo.replaceAll("receiver_", ""))) + filtered;
send = mcp.getPlayer().getDisplayName() + " messages you:" + ChatColor.valueOf(tellColor.toUpperCase()) + filtered; spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), spy.replaceAll("receiver_", ""))) + filtered;
}
else {
send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom").replace("{playerto}", tp.getPlayer().getDisplayName()).replace("{playerfrom}", mcp.getPlayer().getDisplayName())) + filtered;
}
if(plugin.getConfig().getString("tellformatspy").equalsIgnoreCase("Default")) {
spy = mcp.getName() + " messages " + tp.getName() + ":" + ChatColor.valueOf(tellColor.toUpperCase()) + filtered;
}
else {
spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy").replace("{playerto}", tp.getName()).replace("{playerfrom}", mcp.getName())) + filtered;
}
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
if(p.isOnline() && p.isSpy()) { if(p.getName().equals(mcp.getName()) || p.getName().equals(tp.getName())) {
continue;
}
if(p.isSpy()) {
p.getPlayer().sendMessage(spy); p.getPlayer().sendMessage(spy);
} }
} }
@ -160,7 +156,6 @@ public class ChatListener implements Listener {
} }
mcp.setReplyPlayer(tp.getUUID()); mcp.setReplyPlayer(tp.getUUID());
tp.setReplyPlayer(mcp.getUUID()); tp.setReplyPlayer(mcp.getUUID());
Bukkit.getConsoleSender().sendMessage(mcp.getName() + " messages " + tp.getName() + ":" + ChatColor.valueOf(tellColor.toUpperCase()) + filtered);
if(plugin.db != null) { if(plugin.db != null) {
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");