mirror of
https://github.com/Aust1n46/VentureChat.git
synced 2025-05-23 02:19:05 +00:00
Merge branch 'master' into cleanup
This commit is contained in:
Aust1n46
commit
6e79fcedf1
@ -48,13 +48,13 @@ public class PluginMessageController {
|
||||
private ConfigService configService;
|
||||
|
||||
public void sendPluginMessage(ByteArrayOutputStream byteOutStream) {
|
||||
if(playerApiService.getOnlineMineverseChatPlayers().size() > 0) {
|
||||
if (playerApiService.getOnlineMineverseChatPlayers().size() > 0) {
|
||||
playerApiService.getOnlineMineverseChatPlayers().iterator().next().getPlayer().sendPluginMessage(plugin, PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray());
|
||||
}
|
||||
}
|
||||
|
||||
public void sendDiscordSRVPluginMessage(String chatChannel, String message) {
|
||||
if(playerApiService.getOnlineMineverseChatPlayers().size() == 0) {
|
||||
if (playerApiService.getOnlineMineverseChatPlayers().size() == 0) {
|
||||
return;
|
||||
}
|
||||
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
|
||||
@ -65,8 +65,7 @@ public class PluginMessageController {
|
||||
out.writeUTF(message);
|
||||
sendPluginMessage(byteOutStream);
|
||||
out.close();
|
||||
}
|
||||
catch(Exception e) {
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
@ -86,7 +85,7 @@ public class PluginMessageController {
|
||||
DataOutputStream out = new DataOutputStream(outstream);
|
||||
try {
|
||||
out.writeUTF("Sync");
|
||||
if(!changes) {
|
||||
if (!changes) {
|
||||
out.writeUTF("Receive");
|
||||
// System.out.println(mcp.getPlayer().getServer().getServerName());
|
||||
// out.writeUTF(mcp.getPlayer().getServer().getServerName());
|
||||
@ -94,56 +93,55 @@ public class PluginMessageController {
|
||||
Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if(!mcp.isOnline() || mcp.isHasPlayed()) {
|
||||
if (!mcp.isOnline() || mcp.isHasPlayed()) {
|
||||
return;
|
||||
}
|
||||
synchronize(mcp, false);
|
||||
}
|
||||
}, 20L); // one second delay before running again
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
out.writeUTF("Update");
|
||||
out.writeUTF(mcp.getUuid().toString());
|
||||
// out.writeUTF("Channels");
|
||||
int channelCount = 0;
|
||||
for(String c : mcp.getListening()) {
|
||||
for (String c : mcp.getListening()) {
|
||||
ChatChannel channel = configService.getChannel(c);
|
||||
if(channel.getBungee()) {
|
||||
if (channel.getBungee()) {
|
||||
channelCount++;
|
||||
}
|
||||
}
|
||||
out.write(channelCount);
|
||||
for(String c : mcp.getListening()) {
|
||||
for (String c : mcp.getListening()) {
|
||||
ChatChannel channel = configService.getChannel(c);
|
||||
if(channel.getBungee()) {
|
||||
if (channel.getBungee()) {
|
||||
out.writeUTF(channel.getName());
|
||||
}
|
||||
}
|
||||
// out.writeUTF("Mutes");
|
||||
int muteCount = 0;
|
||||
for(MuteContainer mute : mcp.getMutes()) {
|
||||
for (MuteContainer mute : mcp.getMutes()) {
|
||||
ChatChannel channel = configService.getChannel(mute.getChannel());
|
||||
if(channel.getBungee()) {
|
||||
if (channel.getBungee()) {
|
||||
muteCount++;
|
||||
}
|
||||
}
|
||||
// System.out.println(muteCount + " mutes");
|
||||
out.write(muteCount);
|
||||
for(MuteContainer mute : mcp.getMutes()) {
|
||||
for (MuteContainer mute : mcp.getMutes()) {
|
||||
ChatChannel channel = configService.getChannel(mute.getChannel());
|
||||
if(channel.getBungee()) {
|
||||
if (channel.getBungee()) {
|
||||
out.writeUTF(channel.getName());
|
||||
out.writeLong(mute.getDuration());
|
||||
out.writeUTF(mute.getReason());
|
||||
}
|
||||
}
|
||||
int ignoreCount = 0;
|
||||
for(@SuppressWarnings("unused")
|
||||
for (@SuppressWarnings("unused")
|
||||
UUID c : mcp.getIgnores()) {
|
||||
ignoreCount++;
|
||||
}
|
||||
out.write(ignoreCount);
|
||||
for(UUID c : mcp.getIgnores()) {
|
||||
for (UUID c : mcp.getIgnores()) {
|
||||
out.writeUTF(c.toString());
|
||||
}
|
||||
out.writeBoolean(mcp.isSpy());
|
||||
@ -152,25 +150,24 @@ public class PluginMessageController {
|
||||
sendPluginMessage(outstream);
|
||||
// System.out.println("Sync start bottom...");
|
||||
out.close();
|
||||
}
|
||||
catch(IOException e) {
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public void processInboundPluginMessage(final String channel, final Player player, final byte[] inputStream) {
|
||||
if(!channel.equals(PLUGIN_MESSAGING_CHANNEL)) {
|
||||
if (!channel.equals(PLUGIN_MESSAGING_CHANNEL)) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
DataInputStream msgin = new DataInputStream(new ByteArrayInputStream(inputStream));
|
||||
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
|
||||
if (plugin.getConfig().getString("loglevel", "info").equals("debug")) {
|
||||
System.out.println(msgin.available() + " size on receiving end");
|
||||
}
|
||||
String subchannel = msgin.readUTF();
|
||||
ByteArrayOutputStream stream = new ByteArrayOutputStream();
|
||||
DataOutputStream out = new DataOutputStream(stream);
|
||||
if(subchannel.equals("Chat")) {
|
||||
if (subchannel.equals("Chat")) {
|
||||
String server = msgin.readUTF();
|
||||
String chatchannel = msgin.readUTF();
|
||||
String senderName = msgin.readUTF();
|
||||
@ -182,18 +179,18 @@ public class PluginMessageController {
|
||||
String globalJSON = msgin.readUTF();
|
||||
String primaryGroup = msgin.readUTF();
|
||||
|
||||
if(!configService.isChannel(chatchannel)) {
|
||||
if (!configService.isChannel(chatchannel)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObject = configService.getChannel(chatchannel);
|
||||
|
||||
if(!chatChannelObject.getBungee()) {
|
||||
if (!chatChannelObject.getBungee()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Set<Player> recipients = new HashSet<Player>();
|
||||
for(VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if(configService.isListening(p, chatChannelObject.getName())) {
|
||||
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if (configService.isListening(p, chatChannelObject.getName())) {
|
||||
recipients.add(p.getPlayer());
|
||||
}
|
||||
}
|
||||
@ -201,30 +198,31 @@ public class PluginMessageController {
|
||||
Bukkit.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
//Create VentureChatEvent
|
||||
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
|
||||
// Create VentureChatEvent
|
||||
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
|
||||
Bukkit.getServer().getPluginManager().callEvent(ventureChatEvent);
|
||||
}
|
||||
});
|
||||
|
||||
Bukkit.getConsoleSender().sendMessage(consoleChat);
|
||||
|
||||
if(databaseService.isEnabled()) {
|
||||
if (databaseService.isEnabled()) {
|
||||
databaseService.writeVentureChat(senderUUID.toString(), senderName, server, chatchannel, chat.replace("'", "''"), "Chat");
|
||||
}
|
||||
|
||||
for(VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if(configService.isListening(p, chatChannelObject.getName())) {
|
||||
if(!p.isBungeeToggle() && playerApiService.getOnlineMineverseChatPlayer(senderName) == null) {
|
||||
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if (configService.isListening(p, chatChannelObject.getName())) {
|
||||
if (!p.isBungeeToggle() && playerApiService.getOnlineMineverseChatPlayer(senderName) == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String json = formatService.formatModerationGUI(globalJSON, p.getPlayer(), senderName, chatchannel, hash);
|
||||
PacketContainer packet = formatService.createPacketPlayOutChat(json);
|
||||
|
||||
if(plugin.getConfig().getBoolean("ignorechat", false)) {
|
||||
if(!p.getIgnores().contains(senderUUID)) {
|
||||
if (plugin.getConfig().getBoolean("ignorechat", false)) {
|
||||
if (!p.getIgnores().contains(senderUUID)) {
|
||||
// System.out.println("Chat sent");
|
||||
formatService.sendPacketPlayOutChat(p.getPlayer(), packet);
|
||||
}
|
||||
@ -234,47 +232,47 @@ public class PluginMessageController {
|
||||
}
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("DiscordSRV")) {
|
||||
if (subchannel.equals("DiscordSRV")) {
|
||||
String chatChannel = msgin.readUTF();
|
||||
String message = msgin.readUTF();
|
||||
if(!configService.isChannel(chatChannel)) {
|
||||
if (!configService.isChannel(chatChannel)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObj = configService.getChannel(chatChannel);
|
||||
if(!chatChannelObj.getBungee()) {
|
||||
if (!chatChannelObj.getBungee()) {
|
||||
return;
|
||||
}
|
||||
|
||||
String json = formatService.convertPlainTextToJson(message, true);
|
||||
int hash = (message.replaceAll("([<5B>]([a-z0-9]))", "")).hashCode();
|
||||
|
||||
for(VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if(configService.isListening(p, chatChannelObj.getName())) {
|
||||
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if (configService.isListening(p, chatChannelObj.getName())) {
|
||||
String finalJSON = formatService.formatModerationGUI(json, p.getPlayer(), "Discord", chatChannelObj.getName(), hash);
|
||||
PacketContainer packet = formatService.createPacketPlayOutChat(finalJSON);
|
||||
formatService.sendPacketPlayOutChat(p.getPlayer(), packet);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("PlayerNames")) {
|
||||
if (subchannel.equals("PlayerNames")) {
|
||||
playerApiService.clearNetworkPlayerNames();
|
||||
int playerCount = msgin.readInt();
|
||||
for(int a = 0; a < playerCount; a ++) {
|
||||
for (int a = 0; a < playerCount; a++) {
|
||||
playerApiService.addNetworkPlayerName(msgin.readUTF());
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("Chwho")) {
|
||||
if (subchannel.equals("Chwho")) {
|
||||
String identifier = msgin.readUTF();
|
||||
if(identifier.equals("Get")) {
|
||||
if (identifier.equals("Get")) {
|
||||
String server = msgin.readUTF();
|
||||
String sender = msgin.readUTF();
|
||||
String chatchannel = msgin.readUTF();
|
||||
List<String> listening = new ArrayList<String>();
|
||||
if(configService.isChannel(chatchannel)) {
|
||||
for(VentureChatPlayer mcp : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if(configService.isListening(mcp, chatchannel)) {
|
||||
if (configService.isChannel(chatchannel)) {
|
||||
for (VentureChatPlayer mcp : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if (configService.isListening(mcp, chatchannel)) {
|
||||
String entry = "&f" + mcp.getName();
|
||||
if(mcp.isMuted(chatchannel)) {
|
||||
if (mcp.isMuted(chatchannel)) {
|
||||
entry = "&c" + mcp.getName();
|
||||
}
|
||||
listening.add(entry);
|
||||
@ -287,56 +285,55 @@ public class PluginMessageController {
|
||||
out.writeUTF(sender);
|
||||
out.writeUTF(chatchannel);
|
||||
out.writeInt(listening.size());
|
||||
for(String s : listening) {
|
||||
for (String s : listening) {
|
||||
out.writeUTF(s);
|
||||
}
|
||||
sendPluginMessage(stream);
|
||||
}
|
||||
if(identifier.equals("Receive")) {
|
||||
if (identifier.equals("Receive")) {
|
||||
String sender = msgin.readUTF();
|
||||
String stringchannel = msgin.readUTF();
|
||||
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(UUID.fromString(sender));
|
||||
ChatChannel chatchannel = configService.getChannel(stringchannel);
|
||||
String playerList = "";
|
||||
int size = msgin.readInt();
|
||||
for(int a = 0; a < size; a++) {
|
||||
for (int a = 0; a < size; a++) {
|
||||
playerList += msgin.readUTF() + ChatColor.WHITE + ", ";
|
||||
}
|
||||
if(playerList.length() > 2) {
|
||||
if (playerList.length() > 2) {
|
||||
playerList = playerList.substring(0, playerList.length() - 2);
|
||||
}
|
||||
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_PLAYER_LIST_HEADER.toString()
|
||||
.replace("{channel_color}", chatchannel.getColor().toString())
|
||||
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_PLAYER_LIST_HEADER.toString().replace("{channel_color}", chatchannel.getColor().toString())
|
||||
.replace("{channel_name}", chatchannel.getName()));
|
||||
mcp.getPlayer().sendMessage(FormatUtils.FormatStringAll(playerList));
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("RemoveMessage")) {
|
||||
if (subchannel.equals("RemoveMessage")) {
|
||||
String hash = msgin.readUTF();
|
||||
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), "removemessage " + hash);
|
||||
}
|
||||
if(subchannel.equals("Sync")) {
|
||||
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
|
||||
if (subchannel.equals("Sync")) {
|
||||
if (plugin.getConfig().getString("loglevel", "info").equals("debug")) {
|
||||
Bukkit.getConsoleSender().sendMessage(FormatUtils.FormatStringAll("&8[&eVentureChat&8]&e - Received update..."));
|
||||
}
|
||||
String uuid = msgin.readUTF();
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(UUID.fromString(uuid));
|
||||
if(p == null || p.isHasPlayed()) {
|
||||
if (p == null || p.isHasPlayed()) {
|
||||
return;
|
||||
}
|
||||
for(Object ch : p.getListening().toArray()) {
|
||||
for (Object ch : p.getListening().toArray()) {
|
||||
String c = ch.toString();
|
||||
ChatChannel cha = configService.getChannel(c);
|
||||
if(cha.getBungee()) {
|
||||
if (cha.getBungee()) {
|
||||
p.removeListening(c);
|
||||
}
|
||||
}
|
||||
int size = msgin.read();
|
||||
for(int a = 0; a < size; a++) {
|
||||
for (int a = 0; a < size; a++) {
|
||||
String ch = msgin.readUTF();
|
||||
if(configService.isChannel(ch)) {
|
||||
if (configService.isChannel(ch)) {
|
||||
ChatChannel cha = configService.getChannel(ch);
|
||||
if(!cha.hasPermission() || p.getPlayer().hasPermission(cha.getPermission())) {
|
||||
if (!cha.hasPermission() || p.getPlayer().hasPermission(cha.getPermission())) {
|
||||
p.addListening(ch);
|
||||
}
|
||||
}
|
||||
@ -344,12 +341,12 @@ public class PluginMessageController {
|
||||
p.getMutes().removeIf(mute -> configService.getChannel(mute.getChannel()).getBungee());
|
||||
int sizeB = msgin.read();
|
||||
// System.out.println(sizeB + " mute size");
|
||||
for(int b = 0; b < sizeB; b++) {
|
||||
for (int b = 0; b < sizeB; b++) {
|
||||
String ch = msgin.readUTF();
|
||||
long muteTime = msgin.readLong();
|
||||
String muteReason = msgin.readUTF();
|
||||
// System.out.println(ch);
|
||||
if(configService.isChannel(ch)) {
|
||||
if (configService.isChannel(ch)) {
|
||||
p.addMute(ch, muteTime, muteReason);
|
||||
}
|
||||
}
|
||||
@ -357,41 +354,41 @@ public class PluginMessageController {
|
||||
p.setSpy(msgin.readBoolean());
|
||||
p.setMessageToggle(msgin.readBoolean());
|
||||
// System.out.println(msgin.available() + " available after");
|
||||
for(Object o : p.getIgnores().toArray()) {
|
||||
for (Object o : p.getIgnores().toArray()) {
|
||||
p.removeIgnore((UUID) o);
|
||||
}
|
||||
int sizeC = msgin.read();
|
||||
// System.out.println(sizeC + " ignore size");
|
||||
for(int c = 0; c < sizeC; c++) {
|
||||
for (int c = 0; c < sizeC; c++) {
|
||||
String i = msgin.readUTF();
|
||||
// System.out.println(i);
|
||||
p.addIgnore(UUID.fromString(i));
|
||||
}
|
||||
if(!p.isHasPlayed()) {
|
||||
if (!p.isHasPlayed()) {
|
||||
boolean isThereABungeeChannel = false;
|
||||
for(ChatChannel ch : configService.getAutojoinList()) {
|
||||
if((!ch.hasPermission() || p.getPlayer().hasPermission(ch.getPermission())) && !configService.isListening(p, ch.getName())) {
|
||||
for (ChatChannel ch : configService.getAutojoinList()) {
|
||||
if ((!ch.hasPermission() || p.getPlayer().hasPermission(ch.getPermission())) && !configService.isListening(p, ch.getName())) {
|
||||
p.addListening(ch.getName());
|
||||
if(ch.getBungee()) {
|
||||
if (ch.getBungee()) {
|
||||
isThereABungeeChannel = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
p.setHasPlayed(true);
|
||||
// Only run a sync update if the player joined a BungeeCord channel
|
||||
if(isThereABungeeChannel) {
|
||||
if (isThereABungeeChannel) {
|
||||
synchronize(p, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("Ignore")) {
|
||||
if (subchannel.equals("Ignore")) {
|
||||
String identifier = msgin.readUTF();
|
||||
if(identifier.equals("Send")) {
|
||||
if (identifier.equals("Send")) {
|
||||
String server = msgin.readUTF();
|
||||
String receiver = msgin.readUTF();
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(receiver);
|
||||
UUID sender = UUID.fromString(msgin.readUTF());
|
||||
if(!plugin.getConfig().getBoolean("bungeecordmessaging", true) || p == null || !p.isOnline()) {
|
||||
if (!plugin.getConfig().getBoolean("bungeecordmessaging", true) || p == null || !p.isOnline()) {
|
||||
out.writeUTF("Ignore");
|
||||
out.writeUTF("Offline");
|
||||
out.writeUTF(server);
|
||||
@ -409,36 +406,33 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Offline")) {
|
||||
if (identifier.equals("Offline")) {
|
||||
String receiver = msgin.readUTF();
|
||||
UUID sender = UUID.fromString(msgin.readUTF());
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||
.replace("{args}", receiver));
|
||||
p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", receiver));
|
||||
}
|
||||
if(identifier.equals("Echo")) {
|
||||
if (identifier.equals("Echo")) {
|
||||
UUID receiver = UUID.fromString(msgin.readUTF());
|
||||
String receiverName = msgin.readUTF();
|
||||
UUID sender = UUID.fromString(msgin.readUTF());
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
|
||||
if(p.getIgnores().contains(receiver)) {
|
||||
p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
|
||||
.replace("{player}", receiverName));
|
||||
if (p.getIgnores().contains(receiver)) {
|
||||
p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString().replace("{player}", receiverName));
|
||||
p.removeIgnore(receiver);
|
||||
synchronize(p, true);
|
||||
return;
|
||||
}
|
||||
|
||||
p.addIgnore(receiver);
|
||||
p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString()
|
||||
.replace("{player}", receiverName));
|
||||
p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString().replace("{player}", receiverName));
|
||||
synchronize(p, true);
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("Mute")) {
|
||||
if (subchannel.equals("Mute")) {
|
||||
String identifier = msgin.readUTF();
|
||||
if(identifier.equals("Send")) {
|
||||
if (identifier.equals("Send")) {
|
||||
String server = msgin.readUTF();
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String temporaryDataInstanceUUIDString = msgin.readUTF();
|
||||
@ -447,7 +441,7 @@ public class PluginMessageController {
|
||||
long time = msgin.readLong();
|
||||
String reason = msgin.readUTF();
|
||||
VentureChatPlayer playerToMuteMCP = playerApiService.getOnlineMineverseChatPlayer(playerToMute);
|
||||
if(playerToMuteMCP == null) {
|
||||
if (playerToMuteMCP == null) {
|
||||
out.writeUTF("Mute");
|
||||
out.writeUTF("Offline");
|
||||
out.writeUTF(server);
|
||||
@ -457,7 +451,7 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(!configService.isChannel(channelName)) {
|
||||
if (!configService.isChannel(channelName)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObj = configService.getChannel(channelName);
|
||||
@ -471,43 +465,28 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(time > 0) {
|
||||
if (time > 0) {
|
||||
long datetime = System.currentTimeMillis();
|
||||
if(reason.isEmpty()) {
|
||||
if (reason.isEmpty()) {
|
||||
playerToMuteMCP.addMute(chatChannelObj.getName(), datetime + time);
|
||||
String timeString = FormatUtils.parseTimeStringFromMillis(time);
|
||||
playerToMuteMCP.getPlayer()
|
||||
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString()
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString));
|
||||
}
|
||||
else {
|
||||
playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString().replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString));
|
||||
} else {
|
||||
playerToMuteMCP.addMute(chatChannelObj.getName(), datetime + time, reason);
|
||||
String timeString = FormatUtils.parseTimeStringFromMillis(time);
|
||||
playerToMuteMCP.getPlayer()
|
||||
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME_REASON.toString()
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString)
|
||||
.replace("{reason}", reason));
|
||||
playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME_REASON.toString().replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString).replace("{reason}", reason));
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(reason.isEmpty()) {
|
||||
} else {
|
||||
if (reason.isEmpty()) {
|
||||
playerToMuteMCP.addMute(chatChannelObj.getName());
|
||||
playerToMuteMCP.getPlayer()
|
||||
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER.toString()
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER.toString().replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
playerToMuteMCP.addMute(chatChannelObj.getName(), reason);
|
||||
playerToMuteMCP.getPlayer()
|
||||
.sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_REASON.toString()
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{reason}", reason));
|
||||
playerToMuteMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_REASON.toString().replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()).replace("{reason}", reason));
|
||||
}
|
||||
}
|
||||
synchronize(playerToMuteMCP, true);
|
||||
@ -522,141 +501,110 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Valid")) {
|
||||
if (identifier.equals("Valid")) {
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String playerToMute = msgin.readUTF();
|
||||
String channelName = msgin.readUTF();
|
||||
long time = msgin.readLong();
|
||||
String reason = msgin.readUTF();
|
||||
if(!configService.isChannel(channelName)) {
|
||||
if (!configService.isChannel(channelName)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObj = configService.getChannel(channelName);
|
||||
if(time > 0) {
|
||||
if (time > 0) {
|
||||
String timeString = FormatUtils.parseTimeStringFromMillis(time);
|
||||
if(reason.isEmpty()) {
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString));
|
||||
}
|
||||
else {
|
||||
if (reason.isEmpty()) {
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString));
|
||||
} else {
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{time}", timeString));
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString)
|
||||
.replace("{reason}", reason));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender()
|
||||
.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString).replace("{reason}", reason));
|
||||
} else {
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString)
|
||||
.replace("{reason}", reason));
|
||||
senderMCP.getPlayer()
|
||||
.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME_REASON.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{time}", timeString).replace("{reason}", reason));
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(reason.isEmpty()) {
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (reason.isEmpty()) {
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
} else {
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{reason}", reason));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{reason}", reason));
|
||||
} else {
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString()
|
||||
.replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName())
|
||||
.replace("{reason}", reason));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_REASON.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()).replace("{reason}", reason));
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Offline")) {
|
||||
if (identifier.equals("Offline")) {
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String playerToMute = msgin.readUTF();
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||
.replace("{args}", playerToMute));
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToMute));
|
||||
return;
|
||||
}
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||
.replace("{args}", playerToMute));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToMute));
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("AlreadyMuted")) {
|
||||
if (identifier.equals("AlreadyMuted")) {
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String playerToMute = msgin.readUTF();
|
||||
String channelName = msgin.readUTF();
|
||||
if(!configService.isChannel(channelName)) {
|
||||
if (!configService.isChannel(channelName)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObj = configService.getChannel(channelName);
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString()
|
||||
.replace("{player}", playerToMute).replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
return;
|
||||
}
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString()
|
||||
.replace("{player}", playerToMute).replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString().replace("{player}", playerToMute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("Unmute")) {
|
||||
if (subchannel.equals("Unmute")) {
|
||||
String identifier = msgin.readUTF();
|
||||
if(identifier.equals("Send")) {
|
||||
if (identifier.equals("Send")) {
|
||||
String server = msgin.readUTF();
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String temporaryDataInstanceUUIDString = msgin.readUTF();
|
||||
String playerToUnmute = msgin.readUTF();
|
||||
String channelName = msgin.readUTF();
|
||||
VentureChatPlayer playerToUnmuteMCP = playerApiService.getOnlineMineverseChatPlayer(playerToUnmute);
|
||||
if(playerToUnmuteMCP == null) {
|
||||
if (playerToUnmuteMCP == null) {
|
||||
out.writeUTF("Unmute");
|
||||
out.writeUTF("Offline");
|
||||
out.writeUTF(server);
|
||||
@ -666,7 +614,7 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(!configService.isChannel(channelName)) {
|
||||
if (!configService.isChannel(channelName)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObj = configService.getChannel(channelName);
|
||||
@ -681,9 +629,8 @@ public class PluginMessageController {
|
||||
return;
|
||||
}
|
||||
playerToUnmuteMCP.removeMute(chatChannelObj.getName());
|
||||
playerToUnmuteMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_PLAYER.toString()
|
||||
.replace("{player}", player.getName()).replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
playerToUnmuteMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_PLAYER.toString().replace("{player}", player.getName())
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
synchronize(playerToUnmuteMCP, true);
|
||||
out.writeUTF("Unmute");
|
||||
out.writeUTF("Valid");
|
||||
@ -694,69 +641,60 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Valid")) {
|
||||
if (identifier.equals("Valid")) {
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String playerToUnmute = msgin.readUTF();
|
||||
String channelName = msgin.readUTF();
|
||||
if(!configService.isChannel(channelName)) {
|
||||
if (!configService.isChannel(channelName)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObj = configService.getChannel(channelName);
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString()
|
||||
.replace("{player}", playerToUnmute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
}
|
||||
else {
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString().replace("{player}", playerToUnmute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
} else {
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString()
|
||||
.replace("{player}", playerToUnmute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString().replace("{player}", playerToUnmute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
}
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Offline")) {
|
||||
if (identifier.equals("Offline")) {
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String playerToUnmute = msgin.readUTF();
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||
.replace("{args}", playerToUnmute));
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToUnmute));
|
||||
return;
|
||||
}
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||
.replace("{args}", playerToUnmute));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", playerToUnmute));
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("NotMuted")) {
|
||||
if (identifier.equals("NotMuted")) {
|
||||
String senderIdentifier = msgin.readUTF();
|
||||
String playerToUnmute = msgin.readUTF();
|
||||
String channelName = msgin.readUTF();
|
||||
if(!configService.isChannel(channelName)) {
|
||||
if (!configService.isChannel(channelName)) {
|
||||
return;
|
||||
}
|
||||
ChatChannel chatChannelObj = configService.getChannel(channelName);
|
||||
if(senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString()
|
||||
.replace("{player}", playerToUnmute).replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
if (senderIdentifier.equals("VentureChat:Console")) {
|
||||
Bukkit.getConsoleSender().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString().replace("{player}", playerToUnmute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
return;
|
||||
}
|
||||
UUID sender = UUID.fromString(senderIdentifier);
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString()
|
||||
.replace("{player}", playerToUnmute).replace("{channel_color}", chatChannelObj.getColor())
|
||||
.replace("{channel_name}", chatChannelObj.getName()));
|
||||
senderMCP.getPlayer().sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString().replace("{player}", playerToUnmute)
|
||||
.replace("{channel_color}", chatChannelObj.getColor()).replace("{channel_name}", chatChannelObj.getName()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(subchannel.equals("Message")) {
|
||||
if (subchannel.equals("Message")) {
|
||||
String identifier = msgin.readUTF();
|
||||
if(identifier.equals("Send")) {
|
||||
if (identifier.equals("Send")) {
|
||||
String server = msgin.readUTF();
|
||||
String receiver = msgin.readUTF();
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(receiver);
|
||||
@ -766,7 +704,7 @@ public class PluginMessageController {
|
||||
String echo = msgin.readUTF();
|
||||
String spy = msgin.readUTF();
|
||||
String msg = msgin.readUTF();
|
||||
if(!plugin.getConfig().getBoolean("bungeecordmessaging", true) || p == null) {
|
||||
if (!plugin.getConfig().getBoolean("bungeecordmessaging", true) || p == null) {
|
||||
out.writeUTF("Message");
|
||||
out.writeUTF("Offline");
|
||||
out.writeUTF(server);
|
||||
@ -775,7 +713,7 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(p.getIgnores().contains(sender)) {
|
||||
if (p.getIgnores().contains(sender)) {
|
||||
out.writeUTF("Message");
|
||||
out.writeUTF("Ignore");
|
||||
out.writeUTF(server);
|
||||
@ -784,7 +722,7 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(!p.isMessageToggle()) {
|
||||
if (!p.isMessageToggle()) {
|
||||
out.writeUTF("Message");
|
||||
out.writeUTF("Blocked");
|
||||
out.writeUTF(server);
|
||||
@ -794,10 +732,10 @@ public class PluginMessageController {
|
||||
return;
|
||||
}
|
||||
p.getPlayer().sendMessage(FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), send.replaceAll("receiver_", ""))) + msg);
|
||||
if(p.isNotifications()) {
|
||||
if (p.isNotifications()) {
|
||||
formatService.playMessageSound(p);
|
||||
}
|
||||
if(playerApiService.getMineverseChatPlayer(sender) == null) {
|
||||
if (playerApiService.getMineverseChatPlayer(sender) == null) {
|
||||
VentureChatPlayer senderMCP = new VentureChatPlayer(sender, sName, configService.getDefaultChannel());
|
||||
playerApiService.addMineverseChatPlayerToMap(senderMCP);
|
||||
playerApiService.addNameToMap(senderMCP);
|
||||
@ -815,35 +753,32 @@ public class PluginMessageController {
|
||||
sendPluginMessage(stream);
|
||||
return;
|
||||
}
|
||||
if(identifier.equals("Offline")) {
|
||||
if (identifier.equals("Offline")) {
|
||||
String receiver = msgin.readUTF();
|
||||
UUID sender = UUID.fromString(msgin.readUTF());
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||
.replace("{args}", receiver));
|
||||
p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", receiver));
|
||||
p.setReplyPlayer(null);
|
||||
}
|
||||
if(identifier.equals("Ignore")) {
|
||||
if (identifier.equals("Ignore")) {
|
||||
String receiver = msgin.readUTF();
|
||||
UUID sender = UUID.fromString(msgin.readUTF());
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
p.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()
|
||||
.replace("{player}", receiver));
|
||||
p.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString().replace("{player}", receiver));
|
||||
}
|
||||
if(identifier.equals("Blocked")) {
|
||||
if (identifier.equals("Blocked")) {
|
||||
String receiver = msgin.readUTF();
|
||||
UUID sender = UUID.fromString(msgin.readUTF());
|
||||
VentureChatPlayer p = playerApiService.getOnlineMineverseChatPlayer(sender);
|
||||
p.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()
|
||||
.replace("{player}", receiver));
|
||||
p.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString().replace("{player}", receiver));
|
||||
}
|
||||
if(identifier.equals("Echo")) {
|
||||
if (identifier.equals("Echo")) {
|
||||
String receiverName = msgin.readUTF();
|
||||
UUID receiverUUID = UUID.fromString(msgin.readUTF());
|
||||
UUID senderUUID = UUID.fromString(msgin.readUTF());
|
||||
VentureChatPlayer senderMCP = playerApiService.getOnlineMineverseChatPlayer(senderUUID);
|
||||
String echo = msgin.readUTF();
|
||||
if(playerApiService.getMineverseChatPlayer(receiverUUID) == null) {
|
||||
if (playerApiService.getMineverseChatPlayer(receiverUUID) == null) {
|
||||
VentureChatPlayer receiverMCP = new VentureChatPlayer(receiverUUID, receiverName, configService.getDefaultChannel());
|
||||
playerApiService.addMineverseChatPlayerToMap(receiverMCP);
|
||||
playerApiService.addNameToMap(receiverMCP);
|
||||
@ -851,21 +786,20 @@ public class PluginMessageController {
|
||||
senderMCP.setReplyPlayer(receiverUUID);
|
||||
senderMCP.getPlayer().sendMessage(echo);
|
||||
}
|
||||
if(identifier.equals("Spy")) {
|
||||
if (identifier.equals("Spy")) {
|
||||
String receiverName = msgin.readUTF();
|
||||
String senderName = msgin.readUTF();
|
||||
String spy = msgin.readUTF();
|
||||
if(!spy.startsWith("VentureChat:NoSpy")) {
|
||||
for(VentureChatPlayer pl : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if(pl.isSpy() && !pl.getName().equals(senderName) && !pl.getName().equals(receiverName)) {
|
||||
if (!spy.startsWith("VentureChat:NoSpy")) {
|
||||
for (VentureChatPlayer pl : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if (pl.isSpy() && !pl.getName().equals(senderName) && !pl.getName().equals(receiverName)) {
|
||||
pl.getPlayer().sendMessage(spy);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch(Exception e) {
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@ -58,25 +58,24 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) throws FileNotFoundException {
|
||||
if(event.getPlayer() == null) {
|
||||
if (event.getPlayer() == null) {
|
||||
Bukkit.getConsoleSender().sendMessage(FormatUtils.FormatStringAll("&8[&eVentureChat&8]&c - Event.getPlayer() returned null in PlayerCommandPreprocessEvent"));
|
||||
return;
|
||||
}
|
||||
ConfigurationSection cs = plugin.getConfig().getConfigurationSection("commandspy");
|
||||
Boolean wec = cs.getBoolean("worldeditcommands", true);
|
||||
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer(event.getPlayer());
|
||||
if(!mcp.getPlayer().hasPermission("venturechat.commandspy.override")) {
|
||||
for(VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if(p.hasCommandSpy()) {
|
||||
if(wec) {
|
||||
if (!mcp.getPlayer().hasPermission("venturechat.commandspy.override")) {
|
||||
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if (p.hasCommandSpy()) {
|
||||
if (wec) {
|
||||
p.getPlayer().sendMessage(FormatUtils.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage())));
|
||||
}
|
||||
else {
|
||||
if(!(event.getMessage().toLowerCase().startsWith("//"))) {
|
||||
p.getPlayer().sendMessage(FormatUtils.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage())));
|
||||
}
|
||||
else {
|
||||
if(!(event.getMessage().toLowerCase().startsWith("//"))) {
|
||||
} else {
|
||||
if (!(event.getMessage().toLowerCase().startsWith("//"))) {
|
||||
p.getPlayer()
|
||||
.sendMessage(FormatUtils.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage())));
|
||||
} else {
|
||||
if (!(event.getMessage().toLowerCase().startsWith("//"))) {
|
||||
p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage());
|
||||
}
|
||||
}
|
||||
@ -86,63 +85,66 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
|
||||
}
|
||||
|
||||
String[] blocked = event.getMessage().split(" ");
|
||||
if(mcp.getBlockedCommands().contains(blocked[0])) {
|
||||
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKED_COMMAND.toString()
|
||||
.replace("{command}", event.getMessage()));
|
||||
if (mcp.getBlockedCommands().contains(blocked[0])) {
|
||||
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKED_COMMAND.toString().replace("{command}", event.getMessage()));
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
String message = event.getMessage();
|
||||
|
||||
if(databaseService.isEnabled()) {
|
||||
if (databaseService.isEnabled()) {
|
||||
databaseService.writeVentureChat(mcp.getUuid().toString(), mcp.getName(), "Local", "Command_Component", event.getMessage().replace("'", "''"), "Command");
|
||||
}
|
||||
|
||||
for(Alias a : configService.getAliases()) {
|
||||
if(message.toLowerCase().substring(1).split(" ")[0].equals(a.getName().toLowerCase())) {
|
||||
for(String s : a.getComponents()) {
|
||||
if(!mcp.getPlayer().hasPermission(a.getPermission()) && a.hasPermission()) {
|
||||
for (Alias a : configService.getAliases()) {
|
||||
if (message.toLowerCase().substring(1).split(" ")[0].equals(a.getName().toLowerCase())) {
|
||||
for (String s : a.getComponents()) {
|
||||
if (!mcp.getPlayer().hasPermission(a.getPermission()) && a.hasPermission()) {
|
||||
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this alias.");
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
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;
|
||||
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 send = "";
|
||||
if(args.length - arg < a.getArguments()) {
|
||||
if (args.length - arg < a.getArguments()) {
|
||||
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);
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
for(int b = 0; b < args.length; b++) {
|
||||
for (int b = 0; b < args.length; b++) {
|
||||
send += " " + args[b];
|
||||
}
|
||||
if(send.length() > 0) send = send.substring(1);
|
||||
if (send.length() > 0)
|
||||
send = send.substring(1);
|
||||
s = FormatUtils.FormatStringAll(s);
|
||||
if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
|
||||
if (mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
|
||||
send = FormatUtils.FormatStringLegacyColor(send);
|
||||
}
|
||||
if(mcp.getPlayer().hasPermission("venturechat.color")) {
|
||||
if (mcp.getPlayer().hasPermission("venturechat.color")) {
|
||||
send = FormatUtils.FormatStringColor(send);
|
||||
}
|
||||
if(mcp.getPlayer().hasPermission("venturechat.format")) {
|
||||
if (mcp.getPlayer().hasPermission("venturechat.format")) {
|
||||
send = FormatUtils.FormatString(send);
|
||||
}
|
||||
if(s.startsWith("Command:")) {
|
||||
if (s.startsWith("Command:")) {
|
||||
mcp.getPlayer().chat(s.substring(9).replace("$", send));
|
||||
event.setCancelled(true);
|
||||
}
|
||||
if(s.startsWith("Message:")) {
|
||||
if (s.startsWith("Message:")) {
|
||||
mcp.getPlayer().sendMessage(s.substring(9).replace("$", send));
|
||||
event.setCancelled(true);
|
||||
}
|
||||
if(s.startsWith("Broadcast:")) {
|
||||
if (s.startsWith("Broadcast:")) {
|
||||
formatService.broadcastToServer(s.substring(11).replace("$", send));
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@ -150,51 +152,55 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
|
||||
}
|
||||
}
|
||||
|
||||
if(!configService.areAliasesRegisteredAsCommands()) {
|
||||
for(ChatChannel channel : configService.getChatChannels()) {
|
||||
if(!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) {
|
||||
if(message.equals("/" + channel.getAlias())) {
|
||||
mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
|
||||
.replace("{channel_color}", channel.getColor() + "")
|
||||
.replace("{channel_name}", channel.getName()));
|
||||
if(mcp.hasConversation()) {
|
||||
for(VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if(p.isSpy()) {
|
||||
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString()
|
||||
.replace("{player_sender}", mcp.getName())
|
||||
if (!configService.areAliasesRegisteredAsCommands()) {
|
||||
for (ChatChannel channel : configService.getChatChannels()) {
|
||||
if (!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) {
|
||||
if (message.equals("/" + channel.getAlias())) {
|
||||
mcp.getPlayer().sendMessage(
|
||||
LocalizedMessage.SET_CHANNEL.toString().replace("{channel_color}", channel.getColor() + "").replace("{channel_name}", channel.getName()));
|
||||
if (mcp.hasConversation()) {
|
||||
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
|
||||
if (p.isSpy()) {
|
||||
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString().replace("{player_sender}", mcp.getName())
|
||||
.replace("{player_receiver}", playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName()));
|
||||
}
|
||||
}
|
||||
mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString()
|
||||
.replace("{player_receiver}", playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName()));
|
||||
mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString().replace("{player_receiver}",
|
||||
playerApiService.getMineverseChatPlayer(mcp.getConversation()).getName()));
|
||||
mcp.setConversation(null);
|
||||
}
|
||||
mcp.addListening(channel.getName());
|
||||
mcp.setCurrentChannel(channel);
|
||||
if(channel.getBungee()) {
|
||||
if (channel.getBungee()) {
|
||||
pluginMessageController.synchronize(mcp, true);
|
||||
}
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
if(message.toLowerCase().startsWith("/" + channel.getAlias() + " ")) {
|
||||
if (message.toLowerCase().startsWith("/" + channel.getAlias() + " ")) {
|
||||
message = message.substring(channel.getAlias().length() + 1);
|
||||
mcp.addListening(channel.getName());
|
||||
if(channel.getBungee()) {
|
||||
if (channel.getBungee()) {
|
||||
pluginMessageController.synchronize(mcp, true);
|
||||
}
|
||||
mcp.setQuickChannel(channel);
|
||||
/*String format = "";
|
||||
if(plugin.getConfig().getConfigurationSection("channels." + channel.getName()).getString("format").equalsIgnoreCase("Default")) {
|
||||
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"));
|
||||
}
|
||||
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(" ", " ");
|
||||
}
|
||||
}*/
|
||||
/*
|
||||
* String format = ""; if(plugin.getConfig().getConfigurationSection("channels."
|
||||
* + channel.getName()).getString("format").equalsIgnoreCase("Default")) {
|
||||
* 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")); } 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.getPlayer().chat(message);
|
||||
event.setCancelled(true);
|
||||
@ -204,11 +210,11 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
|
||||
}
|
||||
}
|
||||
|
||||
//old 1.8 command map
|
||||
// old 1.8 command map
|
||||
@EventHandler
|
||||
public void onServerCommand(ServerCommandEvent event) {
|
||||
if (databaseService.isEnabled()) {
|
||||
databaseService.writeVentureChat("N/A", "Console", "Local", "Command_Component", event.getCommand().replace("'", "''") , "Command");
|
||||
databaseService.writeVentureChat("N/A", "Console", "Local", "Command_Component", event.getCommand().replace("'", "''"), "Command");
|
||||
}
|
||||
}
|
||||
|
||||
@ -217,26 +223,27 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
|
||||
*/
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
if(!(sender instanceof Player)) {
|
||||
if (!(sender instanceof Player)) {
|
||||
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
|
||||
return true;
|
||||
}
|
||||
VentureChatPlayer mcp = playerApiService.getOnlineMineverseChatPlayer((Player) sender);
|
||||
for(ChatChannel channel : configService.getChatChannels()) {
|
||||
if(command.getName().toLowerCase().equals(channel.getAlias())) {
|
||||
if(args.length == 0) {
|
||||
for (ChatChannel channel : configService.getChatChannels()) {
|
||||
if (command.getName().toLowerCase().equals(channel.getAlias())) {
|
||||
if (args.length == 0) {
|
||||
mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /" + channel.getAlias() + " message");
|
||||
return true;
|
||||
}
|
||||
mcp.setQuickChat(true);
|
||||
mcp.setQuickChannel(channel);
|
||||
mcp.addListening(channel.getName());
|
||||
if(channel.getBungee()) {
|
||||
if (channel.getBungee()) {
|
||||
pluginMessageController.synchronize(mcp, true);
|
||||
}
|
||||
String msg = "";
|
||||
for(int x = 0; x < args.length; x++) {
|
||||
if(args[x].length() > 0) msg += " " + args[x];
|
||||
for (int x = 0; x < args.length; x++) {
|
||||
if (args[x].length() > 0)
|
||||
msg += " " + args[x];
|
||||
}
|
||||
mcp.getPlayer().chat(msg);
|
||||
return true;
|
||||
@ -248,7 +255,7 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
|
||||
@SuppressWarnings("deprecation")
|
||||
@EventHandler(priority = EventPriority.LOW)
|
||||
public void InventoryClick(InventoryClickEvent e) {
|
||||
if(!e.getView().getTitle().contains("VentureChat")) {
|
||||
if (!e.getView().getTitle().contains("VentureChat")) {
|
||||
return;
|
||||
}
|
||||
e.setCancelled(true);
|
||||
@ -263,26 +270,24 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
|
||||
SkullMeta skullMeta = (SkullMeta) skull.getItemMeta();
|
||||
ChatChannel channel = configService.getChannel(ChatColor.stripColor(skullMeta.getLore().get(0)).replace("Channel: ", ""));
|
||||
int hash = Integer.parseInt(ChatColor.stripColor(skullMeta.getLore().get(1).replace("Hash: ", "")));
|
||||
if(versionService.is1_7()) {
|
||||
if(item.getType() == Material.BEDROCK) {
|
||||
if (versionService.is1_7()) {
|
||||
if (item.getType() == Material.BEDROCK) {
|
||||
mcp.getPlayer().closeInventory();
|
||||
}
|
||||
} else {
|
||||
if (item.getType() == Material.BARRIER) {
|
||||
mcp.getPlayer().closeInventory();
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(item.getType() == Material.BARRIER) {
|
||||
mcp.getPlayer().closeInventory();
|
||||
}
|
||||
}
|
||||
for(GuiSlot g : configService.getGuiSlots()) {
|
||||
if(g.getIcon() == item.getType() && g.getDurability() == item.getDurability() && g.getSlot() == e.getSlot()) {
|
||||
for (GuiSlot g : configService.getGuiSlots()) {
|
||||
if (g.getIcon() == item.getType() && g.getDurability() == item.getDurability() && g.getSlot() == e.getSlot()) {
|
||||
String command = g.getCommand().replace("{channel}", channel.getName()).replace("{hash}", hash + "");
|
||||
if(target != null) {
|
||||
if (target != null) {
|
||||
command = command.replace("{player_name}", target.getName());
|
||||
if(target.isOnline()) {
|
||||
if (target.isOnline()) {
|
||||
command = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(target.getPlayer(), command));
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
command = command.replace("{player_name}", "Discord_Message");
|
||||
}
|
||||
mcp.getPlayer().chat(command);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user