Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.papermc.paper.event.player.AsyncChatEvent;
import net.ess3.provider.AbstractChatEvent;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.entity.Player;

import java.util.Collections;
Expand All @@ -12,12 +13,12 @@

public class PaperChatEvent implements AbstractChatEvent {
private final AsyncChatEvent event;
private final LegacyComponentSerializer serializer;
private String fakeFormat;
private String fakeMessage;

public PaperChatEvent(final AsyncChatEvent event) {
public PaperChatEvent(final AsyncChatEvent event, final LegacyComponentSerializer serializer) {
this.event = event;
this.fakeMessage = event.signedMessage().message();
this.serializer = serializer;
}

@Override
Expand Down Expand Up @@ -47,12 +48,12 @@ public void setFormat(String format) {

@Override
public String getMessage() {
return fakeMessage;
return serializer.serialize(event.message());
}

@Override
public void setMessage(String message) {
this.fakeMessage = message;
event.message(serializer.deserialize(message));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public void onHighest(final AsyncChatEvent event) {
final PaperChatEvent paperChatEvent = wrap(event);
onChatHighest(paperChatEvent);

final TextComponent format = serializer.deserialize(paperChatEvent.getFormat());
final TextComponent eventMessage = serializer.deserialize(paperChatEvent.getMessage());

if (!event.isCancelled()) {
final TextComponent format = serializer.deserialize(paperChatEvent.getFormat());
final TextComponent eventMessage = serializer.deserialize(paperChatEvent.getMessage());

event.renderer(ChatRenderer.viewerUnaware((player, displayName, message) ->
format.replaceText(builder -> builder
.match("%(\\d)\\$s").replacement((index, match) -> {
Expand All @@ -68,7 +68,7 @@ private PaperChatEvent wrap(final AsyncChatEvent event) {
return paperChatEvent;
}

paperChatEvent = new PaperChatEvent(event);
paperChatEvent = new PaperChatEvent(event, serializer);
eventMap.put(event, paperChatEvent);

return paperChatEvent;
Expand Down
Loading