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

Merge branch 'master' into cleanup

Browse Source
This commit is contained in:
Aust1n46 2022-05-01 15:35:28 -05:00
commit 6e79fcedf1
2 changed files with 306 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
src/main/java/venture/Aust1n46/chat/controllers/PluginMessageController.java
View File

@ -65,8 +65,7 @@ public class PluginMessageController {
out.writeUTF(message); out.writeUTF(message);
sendPluginMessage(byteOutStream); sendPluginMessage(byteOutStream);
out.close(); out.close();
} } catch (Exception e) {
catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -100,8 +99,7 @@ public class PluginMessageController {
synchronize(mcp, false); synchronize(mcp, false);
} }
}, 20L); // one second delay before running again }, 20L); // one second delay before running again
} } else {
else {
out.writeUTF("Update"); out.writeUTF("Update");
out.writeUTF(mcp.getUuid().toString()); out.writeUTF(mcp.getUuid().toString());
// out.writeUTF("Channels"); // out.writeUTF("Channels");
@ -152,8 +150,7 @@ public class PluginMessageController {
sendPluginMessage(outstream); sendPluginMessage(outstream);
// System.out.println("Sync start bottom..."); // System.out.println("Sync start bottom...");
out.close(); out.close();
} } catch (IOException e) {
catch(IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -202,7 +199,8 @@ public class PluginMessageController {
@Override @Override
public void run() { public void run() {
// Create VentureChatEvent // Create VentureChatEvent
VentureChatEvent ventureChatEvent = new VentureChatEvent(null, senderName, primaryGroup, chatChannelObject, recipients, recipients.size(), format, chat, globalJSON, hash, false); VentureChatEvent ventureChatEvent = new VentureChatEvent(null, senderName, primaryGroup, chatChannelObject, recipients, recipients.size(), format, chat,
globalJSON, hash, false);
// Fire event and wait for other plugin listeners to act on it // Fire event and wait for other plugin listeners to act on it
Bukkit.getServer().getPluginManager().callEvent(ventureChatEvent); Bukkit.getServer().getPluginManager().callEvent(ventureChatEvent);
} }
@ -305,8 +303,7 @@ public class PluginMessageController {
if (playerList.length() > 2) { if (playerList.length() > 2) {
playerList = playerList.substring(0, playerList.length() - 2); playerList = playerList.substring(0, playerList.length() - 2);
} }
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_PLAYER_LIST_HEADER.toString() mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_PLAYER_LIST_HEADER.toString().replace("{channel_color}", chatchannel.getColor().toString())
.replace("{channel_color}", chatchannel.getColor().toString())
.replace("{channel_name}", chatchannel.getName())); .replace("{channel_name}", chatchannel.getName()));
mcp.getPlayer().sendMessage(FormatUtils.FormatStringAll(playerList)); mcp.getPlayer().sendMessage(FormatUtils.FormatStringAll(playerList));
} }
@ -413,8 +410,7 @@ public class PluginMessageController {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", receiver));
.replace("{args}", receiver));
} }
if (identifier.equals("Echo")) { if (identifier.equals("Echo")) {
UUID receiver = UUID.fromString(msgin.readUTF()); UUID receiver = UUID.fromString(msgin.readUTF());
@ -423,16 +419,14 @@ public class PluginMessageController {
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
if (p.getIgnores().contains(receiver)) { if (p.getIgnores().contains(receiver)) {
p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString() p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString().replace("{player}", receiverName));
.replace("{player}", receiverName));
p.removeIgnore(receiver); p.removeIgnore(receiver);
synchronize(p, true); synchronize(p, true);
return; return;
} }
p.addIgnore(receiver); p.addIgnore(receiver);
p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString() p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString().replace("{player}", receiverName));
.replace("{player}", receiverName));
synchronize(p, true); synchronize(p, true);
} }
} }
@ -476,38 +470,23 @@ public class PluginMessageController {
if (reason.isEmpty()) { if (reason.isEmpty()) {
playerToMuteMCP.addMute(chatChannelObj.getName(), datetime + time); playerToMuteMCP.addMute(chatChannelObj.getName(), datetime + time);
String timeString = FormatUtils.parseTimeStringFromMillis(time); String timeString = FormatUtils.parseTimeStringFromMillis(time);
playerToMuteMCP.getPlayer() playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString().replace("{channel_color}", chatChannelObj.getColor())
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString() .replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString));
.replace("{channel_color}", chatChannelObj.getColor()) } else {
.replace("{channel_name}", chatChannelObj.getName())
.replace("{time}", timeString));
}
else {
playerToMuteMCP.addMute(chatChannelObj.getName(), datetime + time, reason); playerToMuteMCP.addMute(chatChannelObj.getName(), datetime + time, reason);
String timeString = FormatUtils.parseTimeStringFromMillis(time); String timeString = FormatUtils.parseTimeStringFromMillis(time);
playerToMuteMCP.getPlayer() playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME_REASON.toString().replace("{channel_color}", chatChannelObj.getColor())
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME_REASON.toString() .replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString).replace("{reason}", reason));
.replace("{channel_color}", chatChannelObj.getColor())
.replace("{channel_name}", chatChannelObj.getName())
.replace("{time}", timeString)
.replace("{reason}", reason));
} }
} } else {
else {
if (reason.isEmpty()) { if (reason.isEmpty()) {
playerToMuteMCP.addMute(chatChannelObj.getName()); playerToMuteMCP.addMute(chatChannelObj.getName());
playerToMuteMCP.getPlayer() playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER.toString().replace("{channel_color}", chatChannelObj.getColor())
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER.toString()
.replace("{channel_color}", chatChannelObj.getColor())
.replace("{channel_name}", chatChannelObj.getName())); .replace("{channel_name}", chatChannelObj.getName()));
} } else {
else {
playerToMuteMCP.addMute(chatChannelObj.getName(), reason); playerToMuteMCP.addMute(chatChannelObj.getName(), reason);
playerToMuteMCP.getPlayer() playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_REASON.toString().replace("{channel_color}", chatChannelObj.getColor())
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_REASON.toString() .replace("{channel_name}", chatChannelObj.getName()).replace("{reason}", reason));
.replace("{channel_color}", chatChannelObj.getColor())
.replace("{channel_name}", chatChannelObj.getName())
.replace("{reason}", reason));
} }
} }
synchronize(playerToMuteMCP, true); synchronize(playerToMuteMCP, true);
@ -536,76 +515,49 @@ public class PluginMessageController {
String timeString = FormatUtils.parseTimeStringFromMillis(time); String timeString = FormatUtils.parseTimeStringFromMillis(time);
if (reason.isEmpty()) { if (reason.isEmpty()) {
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString));
.replace("{channel_color}", chatChannelObj.getColor()) } else {
.replace("{channel_name}", chatChannelObj.getName())
.replace("{time}", timeString));
}
else {
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString));
.replace("{channel_color}", chatChannelObj.getColor())
.replace("{channel_name}", chatChannelObj.getName())
.replace("{time}", timeString));
} }
} } else {
else {
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString() Bukkit.getConsoleSender()
.replace("{player}", playerToMute) .sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString().replace("{player}", playerToMute)
.replace("{channel_color}", chatChannelObj.getColor()) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName())
.replace("{channel_name}", chatChannelObj.getName()) .replace("{time}", timeString).replace("{reason}", reason));
.replace("{time}", timeString) } else {
.replace("{reason}", reason));
}
else {
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString() senderMCP.getPlayer()
.replace("{player}", playerToMute) .sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString().replace("{player}", playerToMute)
.replace("{channel_color}", chatChannelObj.getColor()) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName())
.replace("{channel_name}", chatChannelObj.getName()) .replace("{time}", timeString).replace("{reason}", reason));
.replace("{time}", timeString)
.replace("{reason}", reason));
} }
} }
} } else {
else {
if (reason.isEmpty()) { if (reason.isEmpty()) {
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_color}", chatChannelObj.getColor()) } else {
.replace("{channel_name}", chatChannelObj.getName()));
}
else {
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_color}", chatChannelObj.getColor())
.replace("{channel_name}", chatChannelObj.getName()));
} }
} } else {
else {
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{reason}", reason));
.replace("{channel_color}", chatChannelObj.getColor()) } else {
.replace("{channel_name}", chatChannelObj.getName())
.replace("{reason}", reason));
}
else {
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{reason}", reason));
.replace("{channel_color}", chatChannelObj.getColor())
.replace("{channel_name}", chatChannelObj.getName())
.replace("{reason}", reason));
} }
} }
} }
@ -615,14 +567,12 @@ public class PluginMessageController {
String senderIdentifier = msgin.readUTF(); String senderIdentifier = msgin.readUTF();
String playerToMute = msgin.readUTF(); String playerToMute = msgin.readUTF();
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToMute));
.replace("{args}", playerToMute));
return; return;
} }
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToMute));
.replace("{args}", playerToMute));
return; return;
} }
if (identifier.equals("AlreadyMuted")) { if (identifier.equals("AlreadyMuted")) {
@ -634,16 +584,14 @@ public class PluginMessageController {
} }
ChatChannel chatChannelObj = configService.getChannel(channelName); ChatChannel chatChannelObj = configService.getChannel(channelName);
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute).replace("{channel_color}", chatChannelObj.getColor()) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_name}", chatChannelObj.getName()));
return; return;
} }
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString().replace("{player}", playerToMute)
.replace("{player}", playerToMute).replace("{channel_color}", chatChannelObj.getColor()) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_name}", chatChannelObj.getName()));
return; return;
} }
} }
@ -681,9 +629,8 @@ public class PluginMessageController {
return; return;
} }
playerToUnmuteMCP.removeMute(chatChannelObj.getName()); playerToUnmuteMCP.removeMute(chatChannelObj.getName());
playerToUnmuteMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_PLAYER.toString() playerToUnmuteMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_PLAYER.toString().replace("{player}", player.getName())
.replace("{player}", player.getName()).replace("{channel_color}", chatChannelObj.getColor()) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_name}", chatChannelObj.getName()));
synchronize(playerToUnmuteMCP, true); synchronize(playerToUnmuteMCP, true);
out.writeUTF("Unmute"); out.writeUTF("Unmute");
out.writeUTF("Valid"); out.writeUTF("Valid");
@ -703,18 +650,13 @@ public class PluginMessageController {
} }
ChatChannel chatChannelObj = configService.getChannel(channelName); ChatChannel chatChannelObj = configService.getChannel(channelName);
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString().replace("{player}", playerToUnmute)
.replace("{player}", playerToUnmute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_color}", chatChannelObj.getColor()) } else {
.replace("{channel_name}", chatChannelObj.getName()));
}
else {
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString().replace("{player}", playerToUnmute)
.replace("{player}", playerToUnmute) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_color}", chatChannelObj.getColor())
.replace("{channel_name}", chatChannelObj.getName()));
} }
return; return;
} }
@ -722,14 +664,12 @@ public class PluginMessageController {
String senderIdentifier = msgin.readUTF(); String senderIdentifier = msgin.readUTF();
String playerToUnmute = msgin.readUTF(); String playerToUnmute = msgin.readUTF();
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToUnmute));
.replace("{args}", playerToUnmute));
return; return;
} }
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToUnmute));
.replace("{args}", playerToUnmute));
return; return;
} }
if (identifier.equals("NotMuted")) { if (identifier.equals("NotMuted")) {
@ -741,16 +681,14 @@ public class PluginMessageController {
} }
ChatChannel chatChannelObj = configService.getChannel(channelName); ChatChannel chatChannelObj = configService.getChannel(channelName);
if (senderIdentifier.equals("VentureChat:Console")) { if (senderIdentifier.equals("VentureChat:Console")) {
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString() Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString().replace("{player}", playerToUnmute)
.replace("{player}", playerToUnmute).replace("{channel_color}", chatChannelObj.getColor()) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_name}", chatChannelObj.getName()));
return; return;
} }
UUID sender = UUID.fromString(senderIdentifier); UUID sender = UUID.fromString(senderIdentifier);
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString() senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString().replace("{player}", playerToUnmute)
.replace("{player}", playerToUnmute).replace("{channel_color}", chatChannelObj.getColor()) .replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
.replace("{channel_name}", chatChannelObj.getName()));
return; return;
} }
} }
@ -819,23 +757,20 @@ public class PluginMessageController {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", receiver));
.replace("{args}", receiver));
p.setReplyPlayer(null); p.setReplyPlayer(null);
} }
if (identifier.equals("Ignore")) { if (identifier.equals("Ignore")) {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
p.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString() p.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString().replace("{player}", receiver));
.replace("{player}", receiver));
} }
if (identifier.equals("Blocked")) { if (identifier.equals("Blocked")) {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender); VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
p.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() p.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString().replace("{player}", receiver));
.replace("{player}", receiver));
} }
if (identifier.equals("Echo")) { if (identifier.equals("Echo")) {
String receiverName = msgin.readUTF(); String receiverName = msgin.readUTF();
@ -864,8 +799,7 @@ public class PluginMessageController {
} }
} }
} }
} } catch (Exception e) {
catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }

73
src/main/java/venture/Aust1n46/chat/initiators/listeners/PreProcessCommandListener.java
View File

@ -70,12 +70,11 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
if (p.hasCommandSpy()) { if (p.hasCommandSpy()) {
if (wec) { if (wec) {
p.getPlayer().sendMessage(FormatUtils.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage()))); p.getPlayer().sendMessage(FormatUtils.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage())));
} } else {
else {
if (!(event.getMessage().toLowerCase().startsWith("//"))) { if (!(event.getMessage().toLowerCase().startsWith("//"))) {
p.getPlayer().sendMessage(FormatUtils.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage()))); p.getPlayer()
} .sendMessage(FormatUtils.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage())));
else { } else {
if (!(event.getMessage().toLowerCase().startsWith("//"))) { if (!(event.getMessage().toLowerCase().startsWith("//"))) {
p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage()); p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage());
} }
@ -87,8 +86,7 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
String[] blocked = event.getMessage().split(" "); String[] blocked = event.getMessage().split(" ");
if (mcp.getBlockedCommands().contains(blocked[0])) { if (mcp.getBlockedCommands().contains(blocked[0])) {
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKED_COMMAND.toString() mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKED_COMMAND.toString().replace("{command}", event.getMessage()));
.replace("{command}", event.getMessage()));
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -108,14 +106,17 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
return; return;
} }
int num = 1; int num = 1;
if(message.length() < a.getName().length() + 2 || a.getArguments() == 0) num = 0; if (message.length() < a.getName().length() + 2 || a.getArguments() == 0)
num = 0;
int arg = 0; int arg = 0;
if(message.substring(a.getName().length() + 1 + num).length() == 0) arg = 1; if (message.substring(a.getName().length() + 1 + num).length() == 0)
arg = 1;
String[] args = message.substring(a.getName().length() + 1 + num).split(" "); String[] args = message.substring(a.getName().length() + 1 + num).split(" ");
String send = ""; String send = "";
if (args.length - arg < a.getArguments()) { if (args.length - arg < a.getArguments()) {
String keyword = "arguments."; String keyword = "arguments.";
if(a.getArguments() == 1) keyword = "argument."; if (a.getArguments() == 1)
keyword = "argument.";
mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments for this alias, enter at least " + a.getArguments() + " " + keyword); mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments for this alias, enter at least " + a.getArguments() + " " + keyword);
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -123,7 +124,8 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
for (int b = 0; b < args.length; b++) { for (int b = 0; b < args.length; b++) {
send += " " + args[b]; send += " " + args[b];
} }
if(send.length() > 0) send = send.substring(1); if (send.length() > 0)
send = send.substring(1);
s = FormatUtils.FormatStringAll(s); s = FormatUtils.FormatStringAll(s);
if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) { if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
send = FormatUtils.FormatStringLegacyColor(send); send = FormatUtils.FormatStringLegacyColor(send);
@ -154,19 +156,17 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
for (ChatChannel channel : configService.getChatChannels()) { for (ChatChannel channel : configService.getChatChannels()) {
if (!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) { if (!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) {
if (message.equals("/" + channel.getAlias())) { if (message.equals("/" + channel.getAlias())) {
mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() mcp.getPlayer().sendMessage(
.replace("{channel_color}", channel.getColor() + "") LocalizedMessage.SET_CHANNEL.toString().replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
.replace("{channel_name}", channel.getName()));
if (mcp.hasConversation()) { if (mcp.hasConversation()) {
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) { for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
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())
.replace("{player_receiver}", playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName())); .replace("{player_receiver}", playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName()));
} }
} }
mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString() mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString().replace("{player_receiver}",
.replace("{player_receiver}", playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName())); playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName()));
mcp.setConversation(null); mcp.setConversation(null);
} }
mcp.addListening(channel.getName()); mcp.addListening(channel.getName());
@ -184,17 +184,23 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
pluginMessageController.synchronize(mcp, true); pluginMessageController.synchronize(mcp, true);
} }
mcp.setQuickChannel(channel); mcp.setQuickChannel(channel);
/*String format = ""; /*
if(plugin.getConfig().getConfigurationSection("channels." + channel.getName()).getString("format").equalsIgnoreCase("Default")) { * String format = ""; if(plugin.getConfig().getConfigurationSection("channels."
format = FormatTags.ChatFormat(ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "] {prefix}{name}" + ChatColor.valueOf(channel.getColor().toUpperCase()) + ":" + ChatColor.valueOf(channel.getChatColor().toUpperCase()), mcp.getPlayer(), plugin, cc, channel, plugin.getConfig().getBoolean("jsonFormat")); * + channel.getName()).getString("format").equalsIgnoreCase("Default")) {
} * format =
else { * FormatTags.ChatFormat(ChatColor.valueOf(channel.getColor().toUpperCase()) +
format = FormatTags.ChatFormat(plugin.getConfig().getConfigurationSection("channels." + channel.getName()).getString("format"), mcp.getPlayer(), plugin, cc, channel, plugin.getConfig().getBoolean("jsonFormat")); * "[" + channel.getName() + "] {prefix}{name}" +
if(plugin.getConfig().getBoolean("formatcleaner", false)) { * ChatColor.valueOf(channel.getColor().toUpperCase()) + ":" +
format = format.replace("[]", " "); * ChatColor.valueOf(channel.getChatColor().toUpperCase()), mcp.getPlayer(),
format = format.replace(" ", " ").replace(" ", " ").replace(" ", " "); * plugin, cc, channel, plugin.getConfig().getBoolean("jsonFormat")); } else {
} * format =
}*/ * FormatTags.ChatFormat(plugin.getConfig().getConfigurationSection("channels."
* + channel.getName()).getString("format"), mcp.getPlayer(), plugin, cc,
* channel, plugin.getConfig().getBoolean("jsonFormat"));
* if(plugin.getConfig().getBoolean("formatcleaner", false)) { format =
* format.replace("[]", " "); format = format.replace(" ",
* " ").replace(" ", " ").replace(" ", " "); } }
*/
mcp.setQuickChat(true); mcp.setQuickChat(true);
mcp.getPlayer().chat(message); mcp.getPlayer().chat(message);
event.setCancelled(true); event.setCancelled(true);
@ -236,7 +242,8 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
} }
String msg = ""; String msg = "";
for (int x = 0; x < args.length; x++) { for (int x = 0; x < args.length; x++) {
if(args[x].length() > 0) msg += " " + args[x]; if (args[x].length() > 0)
msg += " " + args[x];
} }
mcp.getPlayer().chat(msg); mcp.getPlayer().chat(msg);
return true; return true;
@ -267,8 +274,7 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
if (item.getType() == Material.BEDROCK) { if (item.getType() == Material.BEDROCK) {
mcp.getPlayer().closeInventory(); mcp.getPlayer().closeInventory();
} }
} } else {
else {
if (item.getType() == Material.BARRIER) { if (item.getType() == Material.BARRIER) {
mcp.getPlayer().closeInventory(); mcp.getPlayer().closeInventory();
} }
@ -281,8 +287,7 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
if (target.isOnline()) { if (target.isOnline()) {
command = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(target.getPlayer(), command)); command = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(target.getPlayer(), command));
} }
} } else {
else {
command = command.replace("{player_name}", "Discord_Message"); command = command.replace("{player_name}", "Discord_Message");
} }
mcp.getPlayer().chat(command); mcp.getPlayer().chat(command);