Skip to content

Add support for AsyncChatEvent in Paper server #5908

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.

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

Merged
merged 10 commits into from
Feb 22, 2025
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 @@ -37,11 +37,12 @@
import net.essentialsx.discord.interactions.commands.ExecuteCommand;
import net.essentialsx.discord.interactions.commands.ListCommand;
import net.essentialsx.discord.interactions.commands.MessageCommand;
import net.essentialsx.discord.listeners.BukkitChatListener;
import net.essentialsx.discord.listeners.BukkitListener;
import net.essentialsx.discord.listeners.DiscordCommandDispatcher;
import net.essentialsx.discord.listeners.DiscordListener;
import net.essentialsx.discord.listeners.EssentialsChatListener;
import net.essentialsx.discord.listeners.BukkitChatListener;
import net.essentialsx.discord.listeners.PaperChatListener;
import net.essentialsx.discord.util.ConsoleInjector;
import net.essentialsx.discord.util.DiscordUtil;
import net.essentialsx.discord.util.MessageUtil;
Expand Down Expand Up @@ -350,9 +351,13 @@ public void updateListener() {
chatListener = null;
}

chatListener = getSettings().isUseEssentialsEvents() && plugin.isEssentialsChat()
? new EssentialsChatListener(this)
: new BukkitChatListener(this);
if (getSettings().isUseEssentialsEvents() && plugin.isEssentialsChat()) {
chatListener = new EssentialsChatListener(this);
} else if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_16_5_R01) && VersionUtil.isPaper() && plugin.getEss().getSettings().isUsePaperChatEvent()) {
chatListener = new PaperChatListener(this);
} else {
chatListener = new BukkitChatListener(this);
}

Bukkit.getPluginManager().registerEvents(chatListener, plugin);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package net.essentialsx.discord.listeners;

import net.ess3.provider.AbstractChatEvent;
import net.ess3.provider.providers.PaperChatListenerProvider;
import net.essentialsx.api.v2.ChatType;
import net.essentialsx.api.v2.events.discord.DiscordChatMessageEvent;
import net.essentialsx.discord.JDADiscordService;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

public class PaperChatListener extends PaperChatListenerProvider {
private final JDADiscordService jda;

public PaperChatListener(JDADiscordService jda) {
this.jda = jda;
}

@Override
public void onChatMonitor(AbstractChatEvent event) {
if (event.isCancelled()) {
return;
}

final Player player = event.getPlayer();
Bukkit.getScheduler().runTask(jda.getPlugin(), () -> {
final DiscordChatMessageEvent chatEvent = new DiscordChatMessageEvent(event.getPlayer(), event.getMessage(), ChatType.UNKNOWN);
chatEvent.setCancelled(!jda.getSettings().isShowAllChat() && !event.recipients().containsAll(Bukkit.getOnlinePlayers()));
Bukkit.getPluginManager().callEvent(chatEvent);
if (chatEvent.isCancelled()) {
return;
}

jda.sendChatMessage(player, chatEvent.getMessage());
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,42 +23,59 @@ public PaperChatListenerProvider() {
.useUnusualXRepeatedCharacterHexFormat().build();
}

public abstract void onChatLowest(final AbstractChatEvent event);
public void onChatLowest(final AbstractChatEvent event) {

public abstract void onChatNormal(final AbstractChatEvent event);
}

public void onChatNormal(final AbstractChatEvent event) {

}

public void onChatHighest(final AbstractChatEvent event) {

}

public void onChatMonitor(final AbstractChatEvent event) {

public abstract void onChatHighest(final AbstractChatEvent event);
}

@EventHandler(priority = EventPriority.LOWEST)
public void onLowest(final AsyncChatEvent event) {
public final void onLowest(final AsyncChatEvent event) {
onChatLowest(wrap(event));
}

@EventHandler(priority = EventPriority.NORMAL)
public void onNormal(final AsyncChatEvent event) {
public final void onNormal(final AsyncChatEvent event) {
onChatNormal(wrap(event));
}

@EventHandler(priority = EventPriority.HIGHEST)
public void onHighest(final AsyncChatEvent event) {
public final void onHighest(final AsyncChatEvent event) {
final PaperChatEvent paperChatEvent = wrap(event);
onChatHighest(paperChatEvent);

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) -> {
if (index.group(1).equals("1")) {
return displayName;
}
return eventMessage;
})
)));
if (event.isCancelled()) {
return;
}

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) -> {
if (index.group(1).equals("1")) {
return displayName;
}
return eventMessage;
})
)));
}

@EventHandler(priority = EventPriority.MONITOR)
public final void onMonitor(final AsyncChatEvent event) {
onChatMonitor(wrap(event));

eventMap.remove(event);
}

Expand Down
Loading