Skip to content

GH-250 Update ChatHandlerImpl.java #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
P1otrulla wants to merge 4 commits into
base: master
Choose a base branch
from
Open

GH-250 Update ChatHandlerImpl.java #250

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c888bb2
Update ChatHandlerImpl.java
P1otrulla Oct 1, 2026
5e93b97
Refactored ChatHandlerImpl code for clarity and removed placeholders
P1otrulla Oct 1, 2026
0106f49
Refactored ChatHandlerImpl for code consistency and improved formatti…
P1otrulla Oct 1, 2026
b1843a2
Refactored ChatHandlerImpl for code consistency and improved formatti…
P1otrulla Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 38 additions & 17 deletions chatformatter-core/src/main/java/com/eternalcode/formatter/ChatHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.eternalcode.formatter.template.TemplateService;
import com.google.common.collect.ImmutableMap;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.minimessage.MiniMessage;
Expand All @@ -16,7 +17,6 @@
import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.json.JSONOptions;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.entity.Player;

import java.util.ArrayList;
Expand Down Expand Up @@ -114,15 +114,13 @@ public ChatRenderedMessage process(ChatMessage chatMessage) {

private TagResolver createTags(ChatMessage chatMessage) {
Player sender = chatMessage.sender();

Component message = GSON.deserialize(chatMessage.jsonMessage());
String serialize = LegacyComponentSerializer.legacySection().serialize(message);

TagResolver.Single displayNamePlaceholder = displayNamePlaceholder(sender);
TagResolver.Single namePlaceholder = namePlaceholder(sender);
TagResolver.Single messagePlaceholder = messagePlaceholder(sender, serialize);

return TagResolver.resolver(displayNamePlaceholder, namePlaceholder, messagePlaceholder);
return TagResolver.resolver(
this.displayNamePlaceholder(sender),
this.namePlaceholder(sender),
this.messagePlaceholder(sender, message)
);
}

private TagResolver.Single displayNamePlaceholder(Player sender) {
Expand All @@ -133,20 +131,44 @@ private TagResolver.Single namePlaceholder(Player sender) {
return Placeholder.parsed("name", sender.getName());
}

private TagResolver.Single messagePlaceholder(Player sender, String rawMessage) {
private TagResolver.Single messagePlaceholder(Player sender, Component message) {
TagResolver permittedTags = this.providePermittedTags(sender);
rawMessage = Legacy.legacyToAdventure(rawMessage, permission -> sender.hasPermission(permission));
Component componentMessage = EMPTY_MESSAGE_DESERIALIZER.deserialize(rawMessage, permittedTags);
return Placeholder.component("message", componentMessage);
Component parsedMessage = this.parsePlayerText(message, sender, permittedTags);

return Placeholder.component("message", parsedMessage);
}

private TagResolver providePermittedTags(Player player) {
List<TagResolver> tagResolvers = new ArrayList<>();
/**
* Parses only raw text content with permission-filtered tags.
* Styles already present on components (e.g. from AsyncChatDecorateEvent) are preserved.
*/
private Component parsePlayerText(Component component, Player sender, TagResolver permittedTags) {
List<Component> parsedChildren = component.children()
.stream()
.map(child -> this.parsePlayerText(child, sender, permittedTags))
.toList();

if (!(component instanceof TextComponent textComponent)) {
return component.children(parsedChildren);
}

String rawContent = Legacy.legacyToAdventure(textComponent.content(), sender::hasPermission);
Component parsedContent = EMPTY_MESSAGE_DESERIALIZER.deserialize(rawContent, permittedTags);

return Component.text()
.style(textComponent.style())
.append(parsedContent)
.append(parsedChildren)
.build();
}

private TagResolver providePermittedTags(Player player) {
if (player.hasPermission(PERMISSION_ALL)) {
return TagResolver.standard();
}


List<TagResolver> tagResolvers = new ArrayList<>();

for (Map.Entry<String, TagResolver> entry : TAG_RESOLVERS_BY_PERMISSION.entrySet()) {
if (player.hasPermission(entry.getKey())) {
tagResolvers.add(entry.getValue());
Expand All @@ -155,5 +177,4 @@ private TagResolver providePermittedTags(Player player) {

return TagResolver.resolver(tagResolvers);
}

}
}
Loading