Merge pull request #163 from beanbeanjuice/integration

Release v0.4.2

README.md

@@ -286,6 +286,7 @@ file-version: 7
 * `%original_from%` - Same as `%from%`, but does not use the alias.
 * `%player%` - The player's Minecraft username.
 * `%user%` - The player's Discord username.
+* `%nick%` - The player's Discord nickname.
 * `%role%` - The player's Discord role.
 * `%prefix%` - The player's prefix. **LuckPerms Only**
 * `%suffix%` - The player's suffix. **LuckPerms Only**

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "com.beanbeanjuice"
-version = "0.4.1"
+version = "0.4.2"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

src/main/java/com/beanbeanjuice/simpleproxychat/chat/ChatHandler.java

@@ -292,7 +292,10 @@ public void sendFromDiscord(MessageReceivedEvent event) {
 
         if (event.getMember() == null) return;
 
-        String username = event.getMember().getEffectiveName();
+        String username = event.getMember().getUser().getName();
+        String nickname = event.getMember().getNickname();
+
+        if (nickname == null) nickname = username;
 
         String roleName = "[no-role]";
         Color roleColor = Color.GRAY;
@@ -311,6 +314,7 @@ public void sendFromDiscord(MessageReceivedEvent event) {
                 message,
                 Tuple.of("role", String.format("<%s>%s</%s>", hex, roleName, hex)),
                 Tuple.of("user", username),
+                Tuple.of("nick", nickname),
                 Tuple.of("message", discordMessage),
                 Tuple.of("epoch", String.valueOf(epochHelper.getEpochSecond())),
                 Tuple.of("time", getTimeString()),

src/main/java/com/beanbeanjuice/simpleproxychat/utility/Helper.java

@@ -15,13 +15,16 @@
 
 import java.util.List;
 import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class Helper {
 
     /**
      * @see <a href="https://docs.advntr.dev/minimessage/format.html">Mini-Message Decorations</a>
      */
     public static String translateLegacyCodes(String string) {
+        string = replaceEssentialsColorCodes(string);
         return string
                 .replace('§', '&')
                 .replace("&0", convertToTag(NamedTextColor.BLACK.asHexString()))
@@ -51,6 +54,24 @@ public static String translateLegacyCodes(String string) {
                 .replaceAll("&#([A-Fa-f0-9]{6})", "<#$1>");  // "&#FFC0CBHello! -> <#FFC0CB>Hello!
     }
 
+    public static String replaceEssentialsColorCodes(String string) {
+        Pattern pattern = Pattern.compile("§x(§[0-9a-fA-F]){6}");  // "§x§f§b§6§3§f§5Hello!" -> "&#fb63f5Hello!"
+        Matcher matcher = pattern.matcher(string);
+
+        StringBuilder result = new StringBuilder();
+
+        while (matcher.find()) {
+            String hexColor = matcher.group(0)
+                    .replace("§x", "")
+                    .replace("§", "");
+            matcher.appendReplacement(result, "&#" + hexColor);
+        }
+
+        matcher.appendTail(result);
+
+        return result.toString();
+    }
+
     public static String convertAlias(Config config, String serverName) {
         String alias = config.getAsStringMap(ConfigDataKey.ALIASES).get(serverName);
         return (alias == null) ? serverName : alias;