Update emote parsing, update placeholder api, tweak mixin to make 1.1…

…9.3 version compatible with 1.19.4

build.gradle

@@ -44,7 +44,7 @@ dependencies {
 	modCompileOnly fabricApi.module("fabric-message-api-v1", project.fabric_version)
 
 	modImplementation include("eu.pb4:predicate-api:0.1.0+1.19.3")
-	modImplementation include("eu.pb4:placeholder-api:2.0.0-pre.2+1.19.3")
+	modImplementation include("eu.pb4:placeholder-api:2.0.0-rc.1+1.19.3")
 	modImplementation include("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
 	modImplementation include("eu.pb4:player-data-api:0.2.2+1.19.3")
 

gradle.properties

@@ -12,7 +12,7 @@ fabric_version=0.68.1+1.19.3
 
 # Mod Properties
 
-	mod_version = 2.1.2+1.19.3
+	mod_version = 2.1.3+1.19.3
 	maven_group = eu.pb4
 	archives_base_name = styled-chat
 

src/main/java/eu/pb4/styledchat/StyledChatUtils.java

@@ -7,10 +7,7 @@
 import eu.pb4.placeholders.api.node.EmptyNode;
 import eu.pb4.placeholders.api.node.LiteralNode;
 import eu.pb4.placeholders.api.node.TextNode;
-import eu.pb4.placeholders.api.parsers.LegacyFormattingParser;
-import eu.pb4.placeholders.api.parsers.MarkdownLiteParserV1;
-import eu.pb4.placeholders.api.parsers.NodeParser;
-import eu.pb4.placeholders.api.parsers.TextParserV1;
+import eu.pb4.placeholders.api.parsers.*;
 import eu.pb4.playerdata.api.PlayerDataApi;
 import eu.pb4.playerdata.api.storage.JsonDataStorage;
 import eu.pb4.styledchat.config.ChatStyle;
@@ -63,7 +60,7 @@ public final class StyledChatUtils {
 
     public static final String FORMAT_PERMISSION_BASE = "styledchat.format.";
     public static final String FORMAT_PERMISSION_UNSAFE = "styledchat.unsafe_format.";
-    public static final Pattern EMOTE_PATTERN = Pattern.compile("[:](?<id>[^:]+)[:]");
+    public static final Pattern EMOTE_PATTERN = Pattern.compile("(?<!((?<!(\\\\))\\\\))[:](?<id>[^:]+)[:]");;
     public static final Text EMPTY_TEXT = Text.empty();
     private static final Set<RegistryKey<MessageType>> DECORABLE = Set.of(MessageType.CHAT, MessageType.EMOTE_COMMAND, MessageType.MSG_COMMAND_INCOMING, MessageType.MSG_COMMAND_OUTGOING, MessageType.SAY_COMMAND, MessageType.TEAM_MSG_COMMAND_INCOMING, MessageType.TEAM_MSG_COMMAND_OUTGOING);
 
@@ -113,6 +110,10 @@ public static NodeParser createParser(PlaceholderContext context) {
                 form.add(MarkdownLiteParserV1.MarkdownFormat.SPOILER);
             }
 
+            if (base.getTagParser("link") != null) {
+                form.add(MarkdownLiteParserV1.MarkdownFormat.URL);
+            }
+
             if (!form.isEmpty()) {
                 list.add(new MarkdownLiteParserV1(SpoilerNode::new, MarkdownLiteParserV1::defaultQuoteFormatting, form.toArray(new MarkdownLiteParserV1.MarkdownFormat[0])));
             }
@@ -133,6 +134,12 @@ public static NodeParser createParser(PlaceholderContext context) {
             }
         }
 
+        var emotes = getEmotes(context);
+
+        if (!emotes.isEmpty()) {
+            list.add(new PatternPlaceholderParser(EMOTE_PATTERN, emotes::get));
+        }
+
         return NodeParser.merge(list);
     }
 
@@ -173,21 +180,13 @@ public static Text formatFor(PlaceholderContext context, String input) {
             input = StyledChatEvents.PRE_MESSAGE_CONTENT.invoker().onPreMessage(input, context);
         }
 
-        var emotes = getEmotes(context);
-
         var value = TextNode.asSingle(parser.parseNodes(new LiteralNode(input)));
 
         if (StyledChatMod.USE_FABRIC_API) {
             value = StyledChatEvents.MESSAGE_CONTENT.invoker().onMessage(value, context);
         }
 
-
-        var text = Placeholders.parseText(
-                value,
-                context,
-                EMOTE_PATTERN,
-                (id) -> emotes.containsKey(id) ? ((ctx, arg) -> PlaceholderResult.value(Placeholders.parseText(emotes.get(id), ctx))) : null
-        );
+        var text = value.toText(context);
 
         if (config.configData.formatting.allowModdedDecorators) {
             try {

src/main/java/eu/pb4/styledchat/mixin/MinecraftServerMixin.java

@@ -12,7 +12,7 @@
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
-    @Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;setFavicon(Lnet/minecraft/server/ServerMetadata;)V"))
+    @Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J", ordinal = 0))
     private void styledChat_registerStarting(CallbackInfo ci) {
         StyledChatMod.serverStarting((MinecraftServer) (Object) this);
     }