Upstream/UltimateModeration
1
0
Fork 0
mirror of https://github.com/songoda/UltimateModeration.git synced 2025-02-26 16:21:23 +01:00
Code Issues Projects Releases Wiki Activity

Various improvements to staff chat.

Browse Source
This commit is contained in:
Brianna 2020-05-02 14:17:28 -04:00
parent b00dc9ec69
commit 166d1c3a2c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/ultimatemoderation/commands/CommandStaffChat.java
View File

@ -38,6 +38,8 @@ public class CommandStaffChat extends AbstractCommand {
return ReturnType.FAILURE; return ReturnType.FAILURE;
} }
instance.getLocale().getMessage("event.staffchat.leave")
.processPlaceholder("channel", channelName).sendPrefixedMessage(player);
instance.getStaffChatManager().getChat(channelName).addMember(player); instance.getStaffChatManager().getChat(channelName).addMember(player);
return ReturnType.SUCCESS; return ReturnType.SUCCESS;
} }

11
src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChannel.java
View File

@ -28,6 +28,10 @@ public class StaffChannel {
public void addMember(Player player) { public void addMember(Player player) {
if (members.contains(player.getUniqueId())) return; if (members.contains(player.getUniqueId())) return;
messageAll(UltimateModeration.getInstance().getLocale()
.getMessage("event.staffchat.alljoin")
.processPlaceholder("player", player.getName()).getMessage());
UltimateModeration.getInstance().getStaffChatManager().getChats().values().stream().forEach(members1 -> { UltimateModeration.getInstance().getStaffChatManager().getChats().values().stream().forEach(members1 -> {
if (members1.listMembers().contains(player.getUniqueId())) { if (members1.listMembers().contains(player.getUniqueId())) {
members1.removeMember(player); members1.removeMember(player);
@ -37,16 +41,13 @@ public class StaffChannel {
if (chatLog.size() > 5) { if (chatLog.size() > 5) {
chatLog.stream().skip(chatLog.size() - 3).forEach(message -> player.sendMessage(Methods.formatText(message))); chatLog.stream().skip(chatLog.size() - 3).forEach(message -> player.sendMessage(Methods.formatText(message)));
} }
messageAll(UltimateModeration.getInstance().getLocale()
.getMessage("event.staffchat.join")
.processPlaceholder("channel", channelName).getMessage());
} }
public void removeMember(Player player) { public void removeMember(Player player) {
members.remove(player.getUniqueId()); members.remove(player.getUniqueId());
messageAll(UltimateModeration.getInstance().getLocale() messageAll(UltimateModeration.getInstance().getLocale()
.getMessage("event.staffchat.leave") .getMessage("event.staffchat.allleave")
.processPlaceholder("channel", channelName).getMessage()); .processPlaceholder("player", player.getName()).getMessage());
} }
public void processMessage(String message, Player player) { public void processMessage(String message, Player player) {

4
src/main/resources/en_US.lang
View File

@ -69,7 +69,9 @@ event:
message: '&7You have been warned' message: '&7You have been warned'
staffchat: staffchat:
leave: '&7You left &6%channel% &7successfully.' leave: '&7You left &6%channel% &7successfully.'
leave: '&7You joined &6%channel% &7successfully.' join: '&7You joined &6%channel% &7successfully.'
allleave: '&6%player% &7has left the channel.'
alljoin: '&6%player% has joined the channel.'
nochannels: '&cYou are not in any channels.' nochannels: '&cYou are not in any channels.'
format: '&%color%[%channel%] %player%&%color%: %message%' format: '&%color%[%channel%] %player%&%color%: %message%'
slowmode: slowmode: