mm started rework

Author: bierdosenhalter

.github/workflows/release.yml

@@ -13,11 +13,12 @@ jobs:
       - name: Git
         uses: actions/checkout@v4
 
-      - name: Java
-        uses: actions/setup-java@v4.0.0
+      - name: Setup Java
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '8'
+          java-version: '21'
+          distribution: 'temurin'
+          check-latest: true
 
       - name: Cache
         uses: actions/cache@v4.0.0

pom.xml

@@ -5,14 +5,14 @@
 
     <groupId>org.zeroBzeroT.chatCo</groupId>
     <artifactId>ChatCoPlus</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
 
     <description>An efficient chat system with colored text, ignore list, whispering and chat logging.</description>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/org/zeroBzeroT/chatCo/Components.java

@@ -0,0 +1,13 @@
+package org.zeroBzeroT.chatCo;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+
+/**
+ * helper method because the MiniMessage syntax is too verbose
+ */
+public final class Components {
+    public static Component mm(String miniMessageString) { // mm, short for MiniMessage
+        return MiniMessage.miniMessage().deserialize(miniMessageString);
+    }
+}

src/main/java/org/zeroBzeroT/chatCo/PublicChat.java

@@ -19,7 +19,7 @@
 
 import java.io.File;
 
-import static org.zeroBzeroT.chatCo.Utils.componentFromLegacyText;
+import static org.zeroBzeroT.chatCo.Components.mm;
 
 public class PublicChat implements Listener {
     public final Main plugin;
@@ -81,21 +81,21 @@ public void onAsyncChat(AsyncChatEvent event) {
         }
 
         // Message text
-        TextComponent messageText = componentFromLegacyText(legacyMessage);
+        Component messageText = Component.text(legacyMessage);
 
         // Sender name
-        TextComponent messageSender = componentFromLegacyText(player.getDisplayName());
+        Component sender = player.displayName();
 
         if (plugin.getConfig().getBoolean("ChatCo.whisperOnClick", true)) {
-            messageSender = messageSender.clickEvent(ClickEvent.suggestCommand("/w " + player.getName() + " "));
-            messageSender = messageSender.hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, Component.text("Whisper to " + player.getName())));
+            sender = sender.clickEvent(ClickEvent.suggestCommand("/w " + player.getName() + " "));
+            sender = sender.hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, Component.text("Whisper to " + player.getName())));
         }
 
         // Message
         TextComponent message = Component.text("")
-                .append(componentFromLegacyText("<"))
-                .append(messageSender)
-                .append(componentFromLegacyText("> "))
+                .append(Component.text("<"))
+                .append(sender)
+                .append(Component.text("> "))
                 .append(messageText);
 
         // Send to the players

src/main/java/org/zeroBzeroT/chatCo/Utils.java

@@ -28,12 +28,12 @@ public static boolean isVanished(Player player) {
         return false;
     }
 
-    /**
-     * Converts a string into a single text component while retaining the old formatting
-     */
-    public static TextComponent componentFromLegacyText(String legacyText) {
-        return LegacyComponentSerializer.legacyAmpersand().deserialize(legacyText);
-    }
+    ///**
+    // * Converts a string into a single text component while retaining the old formatting
+    // */
+    //public static TextComponent componentFromLegacyText(String legacyText) {
+    //    return LegacyComponentSerializer.legacyAmpersand().deserialize(legacyText);
+    //}
 
     /**
      * Saves a stream to a file

src/main/java/org/zeroBzeroT/chatCo/Whispers.java

@@ -1,11 +1,8 @@
 package org.zeroBzeroT.chatCo;
 
-import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -19,7 +16,7 @@
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
-import static org.zeroBzeroT.chatCo.Utils.componentFromLegacyText;
+import static org.zeroBzeroT.chatCo.Components.mm;
 import static org.zeroBzeroT.chatCo.Utils.now;
 
 public record Whispers(Main plugin) implements Listener {
@@ -97,31 +94,33 @@ public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
         }
     }
 
-    public TextComponent whisperFormat(Boolean send, final Player sender, final Player target) {
-        String legacyMessage = send ? plugin.getConfig().getString("ChatCo.whisperFormat.send") : plugin.getConfig().getString("ChatCo.whisperFormat.receive");
+    public Component whisperFormat(Boolean isSending, final Player sender, final Player target) {
+        String legacyMessage = isSending ?
+                plugin.getConfig().getString("ChatCo.whisperFormat.send") :
+                plugin.getConfig().getString("ChatCo.whisperFormat.receive");
 
-        for (ChatColor color : ChatColor.values()) {
-            legacyMessage = legacyMessage.replace("%" + color.name() + "%", color.toString());
-        }
+        //for (ChatColor color : ChatColor.values()) {
+        //    legacyMessage = legacyMessage.replace("%" + color.name() + "%", color.toString());
+        //}
 
         String[] parts;
         String name;
 
-        if (send) {
-            legacyMessage = legacyMessage.replace("%SENDER%", sender.getName());
+        if (isSending) {
+            //legacyMessage = legacyMessage.replace("%SENDER%", sender.getName());
             parts = legacyMessage.split("%RECEIVER%", 2);
             name = target.getName();
         } else {
-            legacyMessage = legacyMessage.replace("%RECEIVER%", target.getName());
+            //legacyMessage = legacyMessage.replace("%RECEIVER%", target.getName());
             parts = legacyMessage.split("%SENDER%", 2);
             name = sender.getName();
         }
 
         // Part before player name
-        TextComponent message = componentFromLegacyText(parts[0]);
+        var message = mm(parts[0]);
 
         // Player name
-        TextComponent messagePlayer = componentFromLegacyText(name);
+        var messagePlayer = mm(name);
 
         if (plugin.getConfig().getBoolean("ChatCo.whisperOnClick", true)) {
             messagePlayer = messagePlayer.clickEvent(ClickEvent.suggestCommand("/w " + name + " "));
@@ -135,7 +134,7 @@ public TextComponent whisperFormat(Boolean send, final Player sender, final Play
 
         // Part after player name
         if (parts.length == 2) {
-            TextComponent part1 = componentFromLegacyText(parts[1]);
+            Component part1 = mm(parts[1]);
 
             if (part1.color() != message.color())
                 message = message.color(part1.color());
@@ -159,8 +158,8 @@ private void sendPrivateMessage(Player sender, Player receiver, String message)
             isIgnoring = true;
         }
 
-        TextComponent senderMessage = whisperFormat(true, sender, receiver);
-        TextComponent receiverMessage = whisperFormat(false, sender, receiver);
+        Component senderMessage = whisperFormat(true, sender, receiver);
+        Component receiverMessage = whisperFormat(false, sender, receiver);
 
         receiverMessage = receiverMessage.append(Component.text(message));
         senderMessage = senderMessage.append(Component.text(message));

src/main/resources/config.yml

@@ -17,8 +17,8 @@ ChatCo:
   whisperLog: false
   whisperMonitoring: false
   whisperFormat:
-    receive: "%LIGHT_PURPLE%%SENDER% whispers: "
-    send: "%LIGHT_PURPLE%To %RECEIVER%: "
+    receive: "<light_purple>%SENDER% whispers: "
+    send: "<light_purple>To %RECEIVER%: "
   chatPrefixes:
     AQUA: null
     BLACK: null