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

Added final batch of custom messages.

Browse Source
This commit is contained in:
Aust1n46 2020-03-19 22:50:39 -04:00
parent 0ed5b39a9b
commit 2b36ac643b
4 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MineverseChat/Messages.yml
View File

@ -1,18 +1,21 @@
Version: 2.17.3
BlockCommandPlayer: '&cYou have been blocked from entering command {command}.'
BlockCommandSender: '&cBlocked player &6{player} &cfrom entering command {command}.'
BlockedCommand: '&cYou are blocked from entering this command: {command}'
BlockingMessage: '&6{player} is currently blocking messages.'
BungeeToggleOff: '&6You are now blocking BungeeCord chat.'
BungeeToggleOn: '&6You are now receiving BungeeCord chat.'
ClearChatSender: '&aCleared the server chat.'
ClearChatServer: '&aYour chat has been cleared.'
ChannelCannotMute: '&cYou cannot mute players in this channel: {channel_color}{channel_name}'
ChannelCooldown: '&c{cooldown} {units} of cooldown remaining.'
ChannelList: '{channel_color}{channel_name} : {channel_alias}'
ChannelListHeader: '&6Channel List : Alias'
ChannelListWithPermissions: '{channel_color}{channel_name} : {channel_alias} - Permission Required'
ChannelNoPermission: '&cYou do not have permission for this channel.'
ChannelNoPermissionView: '&cYou do not have permission to look at this channel.'
ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}'
ChannelMuted: '&cYou are muted in this channel: {channel_color}{channel_name}&c{time}'
CommandInvalidArguments: '&cInvalid command: {command} {args}'
CommandInvalidArgumentsIgnore: '&cInvalid command: /ignore [player] or /ignore list'
CommandMustBeRunByPlayer: '&cThis command must be run by a player.'
@ -50,6 +53,7 @@ MutePlayerAllPlayer: '&cYou have just been muted in all channels.'
MutePlayerAllSender: '&cMuted player &6{player} &cin all channels.'
MutePlayerPlayer: '&cYou have just been muted in: {channel_color}{channel_name}'
MutePlayerPlayerTime: '&cYou have just been muted in: {channel_color}{channel_name} &cfor {time} {units}'
MutePlayerSpam: '&cYou have been muted for spamming in: {channel_color}{channel_name}&c{time}'
MutePlayerSender: '&cMuted player &6{player} &cin: {channel_color}{channel_name}'
MutePlayerSenderTime: '&cMuted player &6{player} &cin: {channel_color}{channel_name} &cfor {time} {units}'
NoPlayerToReplyTo: '&cYou do not have anyone to reply to.'
@ -66,6 +70,7 @@ SetChannelAllPlayer: '&cYou have been set into all channels.'
SetChannelAllSender: '&6Set player &c{player} &6into all channels.'
SetChannelPlayerChannelNoPermission: '&cThis player does not have permission for channel: {channel_color}{channel_name}'
SetChannelSender: '&6Set player &c{player} &6into channel: {channel_color}{channel_name}'
SpamWarning: '&cSlow down your chat! You''re halfway to being muted for spam!'
SpyOff: '&6You are no longer spying.'
SpyOn: '&6You are now spying.'
UnblockCommandPlayer: '&cYou have been unblocked from entering command {command}.'

33
MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
View File

@ -41,6 +41,7 @@ import mineverse.Aust1n46.chat.api.events.ChatMessageEvent;
import mineverse.Aust1n46.chat.channel.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.database.DatabaseSender;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
import mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.utilities.FormatTags;
import mineverse.Aust1n46.chat.versions.VersionHandler;
@ -115,7 +116,9 @@ public class ChatListener implements Listener {
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
if(p.isSpy()) {
p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + tp.getName() + ".");
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", mcp.getName())
.replace("{player_receiver}", tp.getName()));
}
}
}
@ -123,12 +126,14 @@ public class ChatListener implements Listener {
}
else {
if(tp.getIgnores().contains(mcp.getUUID())) {
mcp.getPlayer().sendMessage(ChatColor.GOLD + tp.getName() + " is currently ignoring your messages.");
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()
.replace("{player}", tp.getName()));
event.setCancelled(true);
return;
}
if(!tp.getMessageToggle()) {
mcp.getPlayer().sendMessage(ChatColor.GOLD + tp.getName() + " is currently blocking messages.");
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()
.replace("{player}", tp.getName()));
event.setCancelled(true);
return;
}
@ -420,9 +425,12 @@ public class ChatListener implements Listener {
int remaining = timemark - time;
if(remaining <= 0) remaining = 1;
if(remaining == 1) keyword = "minute";
timedMute = ChatColor.RED + " for " + remaining + " more " + keyword;
timedMute = " for " + remaining + " more " + keyword;
}
mcp.getPlayer().sendMessage(ChatColor.RED + "You are muted in this channel: " + ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + eventChannel.getName() + timedMute);
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_MUTED.toString()
.replace("{channel_color}", ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + "")
.replace("{channel_name}", eventChannel.getName())
.replace("{time}", timedMute));
mcp.setQuickChat(false);
event.setCancelled(true);
return;
@ -433,7 +441,7 @@ public class ChatListener implements Listener {
String Channelformat;
boolean irc = false;
if(eventChannel.hasPermission() && !mcp.getPlayer().hasPermission(eventChannel.getPermission())) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this channel.");
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION.toString());
mcp.setQuickChat(false);
mcp.removeListening(eventChannel.getName());
mcp.setCurrentChannel(cc.getDefaultChannel());
@ -462,7 +470,9 @@ public class ChatListener implements Listener {
int remaining = timemark - time;
String keyword = "seconds";
if(remaining == 1) keyword = "second";
mcp.getPlayer().sendMessage(ChatColor.RED + "" + remaining + " " + keyword + " of cooldown remaining.");
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_COOLDOWN.toString()
.replace("{cooldown}", remaining + "")
.replace("{units}", keyword));
mcp.setQuickChat(false);
event.setCancelled(true);
bungee = false;
@ -493,17 +503,20 @@ public class ChatListener implements Listener {
if(mutedfor > 0) {
String keyword = "minutes";
if(mutedfor == 1) keyword = "minute";
timedmute = ChatColor.RED + " for " + mutedfor + " " + keyword;
timedmute = " for " + mutedfor + " " + keyword;
}
mcp.getSpam().get(eventChannel).set(0, 0);
mcp.getPlayer().sendMessage(ChatColor.RED + "You have been muted for spamming in: " + ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + eventChannel.getName() + timedmute);
mcp.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SPAM.toString()
.replace("{channel_color}", ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + "")
.replace("{channel_name}", eventChannel.getName())
.replace("{time}", timedmute));
mcp.setQuickChat(false);
event.setCancelled(true);
}
else {
if(spamtimeconfig % 2 != 0) spamtimeconfig++;
if(spamcount + 1 == spamtimeconfig / 2) {
mcp.getPlayer().sendMessage(ChatColor.RED + "Slow down your chat! You're halfway to being muted for spam!");
mcp.getPlayer().sendMessage(LocalizedMessage.SPAM_WARNING.toString());
}
mcp.getSpam().get(eventChannel).set(0, spamcount + 1);
}

15
MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java
View File

@ -14,6 +14,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.gui.GuiSlot;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
import mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.versions.VersionHandler;
@ -82,7 +83,8 @@ public class CommandListener implements CommandExecutor, Listener {
String[] blocked = event.getMessage().split(" ");
if(mcp.getBlockedCommands().contains(blocked[0])) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You are blocked from entering this command: " + event.getMessage());
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKED_COMMAND.toString()
.replace("{command}", event.getMessage()));
event.setCancelled(true);
return;
}
@ -169,14 +171,19 @@ public class CommandListener implements CommandExecutor, Listener {
for(ChatChannel channel : cc.getChannelsInfo()) {
if(!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) {
if(message.equals("/" + channel.getAlias())) {
mcp.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]");
mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
.replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "")
.replace("{channel_name}", channel.getName()));
if(mcp.hasConversation()) {
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
if(p.isSpy()) {
p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + ".");
p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString()
.replace("{player_sender}", mcp.getName())
.replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName()));
}
}
mcp.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + ".");
mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString()
.replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName()));
mcp.setConversation(null);
}
mcp.addListening(channel.getName());

5
MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java
View File

@ -8,18 +8,21 @@ import mineverse.Aust1n46.chat.utilities.Format;
public enum LocalizedMessage {
BLOCK_COMMAND_PLAYER("BlockCommandPlayer"),
BLOCK_COMMAND_SENDER("BlockCommandSender"),
BLOCKED_COMMAND("BlockedCommand"),
BLOCKING_MESSAGE("BlockingMessage"),
BUNGEE_TOGGLE_OFF("BungeeToggleOff"),
BUNGEE_TOGGLE_ON("BungeeToggleOn"),
CLEAR_CHAT_SENDER("ClearChatSender"),
CLEAR_CHAT_SERVER("ClearChatServer"),
CHANNEL_CANNOT_MUTE("ChannelCannotMute"),
CHANNEL_COOLDOWN("ChannelCooldown"),
CHANNEL_LIST("ChannelList"),
CHANNEL_LIST_HEADER("ChannelListHeader"),
CHANNEL_LIST_WITH_PERMISSIONS("ChannelListWithPermissions"),
CHANNEL_NO_PERMISSION("ChannelNoPermission"),
CHANNEL_NO_PERMISSION_VIEW("ChannelNoPermissionView"),
CHANNEL_PLAYER_LIST_HEADER("ChannelPlayerListHeader"),
CHANNEL_MUTED("ChannelMuted"),
COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"),
COMMAND_INVALID_ARGUMENTS_IGNORE("CommandInvalidArgumentsIgnore"),
COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"),
@ -57,6 +60,7 @@ public enum LocalizedMessage {
MUTE_PLAYER_ALL_SENDER("MutePlayerAllSender"),
MUTE_PLAYER_PLAYER("MutePlayerPlayer"),
MUTE_PLAYER_PLAYER_TIME("MutePlayerPlayerTime"),
MUTE_PLAYER_SPAM("MutePlayerSpam"),
MUTE_PLAYER_SENDER("MutePlayerSender"),
MUTE_PLAYER_SENDER_TIME("MutePlayerSenderTime"),
NO_PLAYER_TO_REPLY_TO("NoPlayerToReplyTo"),
@ -73,6 +77,7 @@ public enum LocalizedMessage {
SET_CHANNEL_ALL_SENDER("SetChannelAllSender"),
SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION("SetChannelPlayerChannelNoPermission"),
SET_CHANNEL_SENDER("SetChannelSender"),
SPAM_WARNING("SpamWarning"),
SPY_OFF("SpyOff"),
SPY_ON("SpyOn"),
UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"),