chatcolors to namedtextcolors in public chat

bierdosenhalter · bierdosenhalter · commit 9a5885b216d4 · 2024-11-29T12:27:45.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.zeroBzeroT.chatCo</groupId>
     <artifactId>ChatCoPlus</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
 
@@ -16,7 +16,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <minecraft.version>1.20.1</minecraft.version>
+        <minecraft.version>1.20.2</minecraft.version>
     </properties>
 
     <build>
@@ -91,7 +91,6 @@
     </build>
 
     <repositories>
-        <!-- This adds the Spigot Maven repository to the build -->
         <repository>
             <id>papermc</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
@@ -104,8 +103,12 @@
     </repositories>
 
     <dependencies>
-        <!--This adds the Spigot API artifact to the build -->
-        <!-- folia api -->
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>${minecraft.version}-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>dev.folia</groupId>
             <artifactId>folia-api</artifactId>
diff --git a/src/main/java/org/zeroBzeroT/chatCo/PublicChat.java b/src/main/java/org/zeroBzeroT/chatCo/PublicChat.java
@@ -4,10 +4,13 @@
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TextReplacementConfig;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
@@ -18,66 +21,94 @@
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.io.File;
-import java.util.Objects;
+import java.util.regex.Pattern;
 
 public class PublicChat implements Listener {
     public final Main plugin;
     private final FileConfiguration permissionConfig;
 
+    public static final Pattern DEFAULT_URL_PATTERN = Pattern.compile("https?://(?:www\\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b[-a-zA-Z0-9()@:%_\\\\+.~#?&/=]*");
+
     public PublicChat(final Main plugin) {
         this.plugin = plugin;
         File customConfig = Main.PermissionConfig;
         permissionConfig = YamlConfiguration.loadConfiguration(customConfig);
     }
 
-    public String replacePrefixColors(String message, final Player player) {
-        for (ChatColor color : ChatColor.values()) {
-            if (plugin.getConfig().getString("ChatCo.chatPrefixes." + color.name()) != null && message.startsWith(Objects.requireNonNull(plugin.getConfig().getString("ChatCo.chatPrefixes." + color.name())))) {
+    public Component replacePrefixColors(Component message, final Player player) {
+        String messagePlain = PlainTextComponentSerializer.plainText().serialize(message);
 
-                // check for global or player permission
-                if (permissionConfig.getBoolean("ChatCo.chatPrefixes." + color.name(), false) || player.hasPermission("ChatCo.chatPrefixes." + color.name())) {
-                    message = color + message;
-                }
+        for (String color : NamedTextColor.NAMES.keys()) {
+            String configKey = "ChatCo.chatPrefixes." + color;
+            String configValue = plugin.getConfig().getString(configKey);
 
-                // break here since we found a prefix color code
-                break;
+            if (configValue != null && messagePlain.startsWith(configValue)) {
+                if (permissionConfig.getBoolean(configKey, false) || player.hasPermission(configKey)) {
+                    return message.color(NamedTextColor.NAMES.value(color));
+                }
             }
         }
 
         return message;
     }
 
-    public String replaceInlineColors(String message, final Player player) {
-        for (ChatColor color : ChatColor.values()) {
-            if ((permissionConfig.getBoolean("ChatCo.chatColors." + color.name(), false) || player.hasPermission("ChatCo.chatColors." + color.name())) && plugin.getConfig().getString("ChatCo.chatColors." + color.name()) != null) {
-                message = message.replace(Objects.requireNonNull(plugin.getConfig().getString("ChatCo.chatColors." + color.name())), color.toString());
+    public Component replaceInlineColors(Component message, final Player player) {
+        for (String color : NamedTextColor.NAMES.keys()) {
+            String configKey = "ChatCo.chatColors." + color;
+            String configValue = plugin.getConfig().getString(configKey);
+
+            if (configValue != null) {
+                if (permissionConfig.getBoolean(configKey, false) || player.hasPermission(configKey)) {
+                    return message.replaceText(TextReplacementConfig.builder()
+                            .match(Pattern.quote(configValue) + ".*$")
+                            .replacement(s -> s.content(s.content().substring(configValue.length())).color(NamedTextColor.NAMES.value(color)))
+                            .build());
+                }
             }
         }
 
         return message;
     }
 
+    private Component replaceUrls(Component component) {
+        return component.replaceText(
+                TextReplacementConfig.builder()
+                        .match(DEFAULT_URL_PATTERN)
+                        .replacement(url -> url
+                                .decorate(TextDecoration.UNDERLINED)
+                                .clickEvent(ClickEvent.openUrl(url.content()))
+                                .hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, Component.text(url.content())))
+                        )
+                        .build()
+        );
+    }
+
     /**
      * See <a href="https://docs.advntr.dev/text.html">Text (Chat Components)</a>
      */
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onAsyncChat(AsyncChatEvent event) {
-        // Plain message
-        final Player player = event.getPlayer();
-
         String legacyMessage = LegacyComponentSerializer.legacyAmpersand().serialize(event.message());
-        legacyMessage = replacePrefixColors(legacyMessage, player);
-        legacyMessage = replaceInlineColors(legacyMessage, player);
 
         // Do not send empty messages
         if (legacyMessage.trim().isEmpty()) {
-            event.setCancelled(true);
+            event.viewers().clear();
             return;
         }
 
         // Message text
         Component messageText = Component.text(legacyMessage);
 
+        // Player
+        final Player player = event.getPlayer();
+
+        // Replace color codes
+        messageText = replacePrefixColors(messageText, player);
+        messageText = replaceInlineColors(messageText, player);
+
+        // Clickable links
+        messageText = replaceUrls(messageText);
+
         // Sender name
         Component sender = player.displayName();
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -21,46 +21,46 @@ ChatCo:
     send: "To %RECEIVER%: "
     color: light_purple
   chatPrefixes:
-    AQUA: null
-    BLACK: null
-    BLUE: null
-    BOLD: null
-    DARK_AQUA: null
-    DARK_BLUE: null
-    DARK_GRAY: null
-    DARK_GREEN: null
-    DARK_PURPLE: null
-    DARK_RED: null
-    GOLD: null
-    GRAY: null
-    GREEN: ">"
-    ITALIC: null
-    LIGHT_PURPLE: null
-    MAGIC: null
-    RED: null
-    STRIKETHROUGH: null
-    UNDERLINE: null
-    WHITE: null
-    YELLOW: null
+    aqua: null
+    black: null
+    blue: null
+    bold: null
+    dark_aqua: null
+    dark_blue: null
+    dark_gray: null
+    dark_green: null
+    dark_purple: null
+    dark_red: null
+    gold: null
+    gray: null
+    green: ">"
+    italic: null
+    light_purple: null
+    magic: null
+    red: null
+    strikethrough: null
+    underline: null
+    white: null
+    yellow: null
   chatColors:
-    AQUA: null
-    BLACK: null
-    BLUE: "`"
-    BOLD: null
-    DARK_AQUA: null
-    DARK_BLUE: null
-    DARK_GRAY: null
-    DARK_GREEN: null
-    DARK_PURPLE: null
-    DARK_RED: null
-    GOLD: null
-    GRAY: null
-    GREEN: null
-    ITALIC: null
-    LIGHT_PURPLE: null
-    MAGIC: null
-    RED: null
-    STRIKETHROUGH: null
-    UNDERLINE: null
-    WHITE: null
-    YELLOW: null
+    aqua: null
+    black: null
+    blue: "`"
+    bold: null
+    dark_aqua: null
+    dark_blue: null
+    dark_gray: null
+    dark_green: null
+    dark_purple: null
+    dark_red: null
+    gold: null
+    gray: null
+    green: null
+    italic: null
+    light_purple: null
+    magic: null
+    red: null
+    strikethrough: null
+    underline: null
+    white: null
+    yellow: null
diff --git a/src/main/resources/permissionConfig.yml b/src/main/resources/permissionConfig.yml
@@ -1,45 +1,45 @@
 ChatCo:
   version: ${project.version}
   chatPrefixes:
-    AQUA: true
-    BLACK: true
-    BLUE: true
-    BOLD: true
-    DARK_AQUA: true
-    DARK_BLUE: true
-    DARK_GRAY: true
-    DARK_GREEN: true
-    DARK_PURPLE: true
-    DARK_RED: true
-    GOLD: true
-    GRAY: true
-    GREEN: true
-    ITALIC: true
-    LIGHT_PURPLE: true
-    MAGIC: true
-    RED: true
-    STRIKETHROUGH: true
-    UNDERLINE: true
-    YELLOW: true
+    aqua: true
+    black: true
+    blue: true
+    bold: true
+    dark_aqua: true
+    dark_blue: true
+    dark_gray: true
+    dark_green: true
+    dark_purple: true
+    dark_red: true
+    gold: true
+    gray: true
+    green: true
+    italic: true
+    light_purple: true
+    magic: true
+    red: true
+    strikethrough: true
+    underline: true
+    yellow: true
   chatColors:
-    AQUA: true
-    BLACK: true
-    BLUE: true
-    BOLD: true
-    DARK_AQUA: true
-    DARK_BLUE: true
-    DARK_GRAY: true
-    DARK_GREEN: true
-    DARK_PURPLE: true
-    DARK_RED: true
-    GOLD: true
-    GRAY: true
-    GREEN: true
-    ITALIC: true
-    LIGHT_PURPLE: true
-    MAGIC: true
-    RED: true
-    STRIKETHROUGH: true
-    UNDERLINE: true
-    WHITE: true
-    YELLOW: true
+    aqua: true
+    black: true
+    blue: true
+    bold: true
+    dark_aqua: true
+    dark_blue: true
+    dark_gray: true
+    dark_green: true
+    dark_purple: true
+    dark_red: true
+    gold: true
+    gray: true
+    green: true
+    italic: true
+    light_purple: true
+    magic: true
+    red: true
+    strikethrough: true
+    underline: true
+    white: true
+    yellow: true
