Chat: fix noRecipient message to be after main message

Flectone · Dec 22, 2023 · 822b3e7 · 822b3e7
1 parent c0664ab
commit 822b3e7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/src/main/java/net/flectone/chat/module/playerMessage/formatting/FormattingModule.java b/src/main/java/net/flectone/chat/module/playerMessage/formatting/FormattingModule.java
@@ -250,6 +250,11 @@ && isUrlAllowed(sender, word)
                 if (valueStats != null && valueStats.equals(word)) {
                     return processStats(wordParams, sender);
                 }
+
+                String valueSkin = formattingMap.get("skin");
+                if (isAsync && valueSkin != null && valueSkin.equals(word)) {
+                    return processSkin(wordParams, sender);
+                }
             }
 
             wordParams.addParameters(textParameters.getParameters());
@@ -385,6 +390,19 @@ public WordParams processStats(@NotNull WordParams wordParams, @NotNull Player s
         return wordParams;
     }
 
+    public WordParams processSkin(@NotNull WordParams wordParams, @NotNull Player sender) {
+        String playerAvatar = PlayerUtil.constructAvatarUrl(sender);
+        FImageComponent fImageComponent = new FImageComponent(playerAvatar);
+        if (!fImageComponent.isCorrect()) return wordParams;
+        wordParams.setImageComponent(fImageComponent);
+        wordParams.setImage(true);
+
+        String word = config.getVaultString(sender, this + ".list.skin.format")
+                .replace("<message>", sender.getName());
+        wordParams.setText(word);
+        return wordParams;
+    }
+
     public WordParams processMarkdownHide(@NotNull WordParams wordParams, @Nullable CommandSender sender, @NotNull String word) {
         wordParams.setHide(true);
 

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -259,6 +259,11 @@ default:
           enable: true
           trigger: "%stats%"
 
+        skin:
+          enable: true
+          trigger: "%skin%"
+          format: "&&1🎨<message>.png"
+
         url:
           enable: true
           hover:

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -72,6 +72,8 @@ permissions:
     default: true
   flectonechat.player-message.formatting.stats:
     default: true
+  flectonechat.player-message.formatting.skin:
+    default: true
   flectonechat.player-message.formatting.url:
     default: true
   flectonechat.player-message.formatting.markdown-url: