-
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Tweak order of link parsing * add: Player mentions Co-authored-by: Patbox <[email protected]>
- Loading branch information
Showing
9 changed files
with
180 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package eu.pb4.styledchat.parser; | ||
|
|
||
| import eu.pb4.placeholders.api.PlaceholderContext; | ||
| import eu.pb4.placeholders.api.Placeholders; | ||
| import eu.pb4.placeholders.api.node.LiteralNode; | ||
| import eu.pb4.placeholders.api.node.TextNode; | ||
| import eu.pb4.placeholders.api.node.parent.ClickActionNode; | ||
| import eu.pb4.placeholders.api.node.parent.ParentTextNode; | ||
| import eu.pb4.placeholders.api.parsers.NodeParser; | ||
| import eu.pb4.styledchat.config.ConfigManager; | ||
| import net.minecraft.text.ClickEvent; | ||
| import net.minecraft.text.Text; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.regex.Matcher; | ||
|
|
||
| import static eu.pb4.styledchat.StyledChatUtils.URL_REGEX; | ||
|
|
||
| public record LinkParser(TextNode style) implements NodeParser { | ||
|
|
||
| @Override | ||
| public TextNode[] parseNodes(TextNode node) { | ||
| if (node instanceof LiteralNode literalNode) { | ||
| var input = literalNode.value(); | ||
| var list = new ArrayList<TextNode>(); | ||
|
|
||
| Matcher matcher = URL_REGEX.matcher(input); | ||
| int currentPos = 0; | ||
| int currentEnd = input.length(); | ||
|
|
||
| while (matcher.find()) { | ||
| if (currentEnd <= matcher.start()) { | ||
| break; | ||
| } | ||
|
|
||
| String betweenText = input.substring(currentPos, matcher.start()); | ||
|
|
||
| if (betweenText.length() != 0) { | ||
| list.add(new LiteralNode(betweenText)); | ||
| } | ||
|
|
||
| list.add(new ClickActionNode(Placeholders.parseNodes(style, Placeholders.PREDEFINED_PLACEHOLDER_PATTERN, Map.of("link", Text.literal(matcher.group()))).getChildren(), ClickEvent.Action.OPEN_URL, new LiteralNode(matcher.group()))); | ||
|
|
||
| currentPos = matcher.end(); | ||
| } | ||
|
|
||
| if (currentPos < currentEnd) { | ||
| String restOfText = input.substring(currentPos, currentEnd); | ||
| if (restOfText.length() != 0) { | ||
| list.add(new LiteralNode(restOfText)); | ||
| } | ||
| } | ||
|
|
||
| return list.toArray(new TextNode[0]); | ||
| } else if (node instanceof ParentTextNode parentTextNode) { | ||
| var list = new ArrayList<TextNode>(); | ||
|
|
||
| for (var child : parentTextNode.getChildren()) { | ||
| list.addAll(List.of(this.parseNodes(child))); | ||
| } | ||
|
|
||
| return new TextNode[] { parentTextNode.copyWith(list.toArray(new TextNode[0])) }; | ||
| } | ||
|
|
||
| return new TextNode[] { node }; | ||
| } | ||
|
|
||
| public static TextNode[] parse(TextNode node, PlaceholderContext context) { | ||
| return new LinkParser(ConfigManager.getConfig().getLinkStyle(context)).parseNodes(node); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package eu.pb4.styledchat.parser; | ||
|
|
||
| import eu.pb4.placeholders.api.PlaceholderContext; | ||
| import eu.pb4.placeholders.api.Placeholders; | ||
| import eu.pb4.placeholders.api.node.LiteralNode; | ||
| import eu.pb4.placeholders.api.node.TextNode; | ||
| import eu.pb4.placeholders.api.node.parent.ParentTextNode; | ||
| import eu.pb4.placeholders.api.parsers.NodeParser; | ||
| import me.drex.vanish.api.VanishAPI; | ||
| import net.fabricmc.loader.api.FabricLoader; | ||
| import net.minecraft.server.network.ServerPlayerEntity; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public record MentionParser(TextNode style, PlaceholderContext context) implements NodeParser { | ||
|
|
||
| public static final boolean VANISH = FabricLoader.getInstance().isModLoaded("melius-vanish"); | ||
|
|
||
| @Override | ||
| public TextNode[] parseNodes(TextNode node) { | ||
| if (node instanceof LiteralNode literalNode) { | ||
| return parseInput(literalNode.value()); | ||
| } else if (node instanceof ParentTextNode parentTextNode) { | ||
| var list = new ArrayList<TextNode>(); | ||
|
|
||
| for (var child : parentTextNode.getChildren()) { | ||
| list.addAll(List.of(this.parseNodes(child))); | ||
| } | ||
|
|
||
| return new TextNode[]{parentTextNode.copyWith(list.toArray(new TextNode[]{}))}; | ||
| } | ||
|
|
||
| return new TextNode[]{node}; | ||
| } | ||
|
|
||
| public TextNode[] parseInput(String input) { | ||
| if (input.isEmpty()) return new TextNode[]{}; | ||
| for (ServerPlayerEntity player : context.server().getPlayerManager().getPlayerList()) { | ||
| if (VANISH && VanishAPI.isVanished(player)) continue; | ||
| int startPos = input.indexOf(player.getEntityName()); | ||
| if (startPos != -1) { | ||
| int endPos = startPos + player.getEntityName().length(); | ||
| TextNode[] before = parseInput(input.substring(0, startPos)); | ||
| TextNode mention = TextNode.convert(Placeholders.parseText(style, PlaceholderContext.of(player))); | ||
| TextNode[] after = parseInput(input.substring(Math.min(endPos, input.length()))); | ||
| return Stream.of(before, new TextNode[]{mention}, after).flatMap(Stream::of).toArray(TextNode[]::new); | ||
| } | ||
| } | ||
| return new TextNode[]{new LiteralNode(input)}; | ||
| } | ||
| } |