Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unify usafe of util methods

Browse Source
This commit is contained in:
destro174 2021-08-25 22:11:29 +02:00
parent 2f8a8fc8ff
commit 0199a67e77
4 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/com/alttd/chat/config/Config.java
View File

@ -164,7 +164,6 @@ public final class Config {
public static String MINIMIUMSTAFFRANK = "trainee";
public static String CONSOLENAME = "Console";
public static UUID CONSOLEUUID = UUID.randomUUID();
public static String NOTIFICATIONFORMAT = "<red>[<prefix>] <displayname> <target> <input>";
private static void settings() {
PREFIXGROUPS = getList("settings.prefix-groups",
Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch", "developer"));
@ -175,7 +174,6 @@ public final class Config {
CONSOLENAME = getString("settings.console-name", CONSOLENAME);
CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString()));
MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK);
NOTIFICATIONFORMAT = getString("settings.blockedmessage-notification", NOTIFICATIONFORMAT);
}
public static List<String> MESSAGECOMMANDALIASES = new ArrayList<>();
@ -290,4 +288,9 @@ public final class Config {
PASSWORD = getString("database.password", PASSWORD);
}
public static String NOTIFICATIONFORMAT = "<red>[<prefix>] <displayname> <target> <input>";
private static void notificationSettings() {
NOTIFICATIONFORMAT = getString("settings.blockedmessage-notification", NOTIFICATIONFORMAT);
}
}

2
galaxy/dependency-reduced-pom.xml
View File

@ -70,7 +70,7 @@
<dependency>
<groupId>com.alttd</groupId>
<artifactId>galaxy-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>

12
galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
View File

@ -255,17 +255,7 @@ public class ChatHandler {
private boolean isMuted(Player player, String message, String prefix) {
if (Database.get().isPlayerMuted(player.getUniqueId(), null) || (ChatPlugin.getInstance().serverMuted() && !player.hasPermission("chat.bypass-server-muted"))) {
MiniMessage miniMessage = MiniMessage.get();
Component blockedNotification = miniMessage.parse("<red>" + prefix
+ Utility.getDisplayName(player.getUniqueId(), player.getName())
+ " tried to say: "
+ message + "</red>");
Bukkit.getOnlinePlayers().forEach(a ->{
if (a.hasPermission("chat.alert-blocked")) {
a.sendMessage(blockedNotification);//TODO make configurable (along with all the messages)
}
});
GalaxyUtility.sendBlockedNotification(prefix, player, message, "");
return true;
}
return false;

8
galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
View File

@ -34,13 +34,7 @@ public class ChatListener implements Listener, ChatRenderer {
event.setCancelled(true);
Player player = event.getPlayer();
MiniMessage miniMessage = MiniMessage.get();
Component blockedNotification = miniMessage.parse("<red>[Chat Muted] "
+ Utility.getDisplayName(player.getUniqueId(), player.getName())
+ " tried to say: "
+ PlainComponentSerializer.plain().serialize(event.message()) + "</red>");
Bukkit.broadcast(blockedNotification, "chat.alert-blocked");
GalaxyUtility.sendBlockedNotification("Chat Muted", player, event.message(), "");
return;
}