Skip to content
Open
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
30 changes: 27 additions & 3 deletions src/main/java/com/slyph/cloverchat/CloverChatPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.slyph.cloverchat.feature.messageinspect.MessageAuditService;
import com.slyph.cloverchat.feature.proxysync.VelocityProxyChatService;
import com.slyph.cloverchat.feature.updatechecker.UpdateCheckerService;
import com.slyph.cloverchat.listener.CardboardChatBridge;
import com.slyph.cloverchat.listener.ChatListener;
import com.slyph.cloverchat.listener.CommandCooldownListener;
import com.slyph.cloverchat.listener.JoinQuitListener;
Expand Down Expand Up @@ -52,6 +53,7 @@ public final class CloverChatPlugin extends JavaPlugin {
private FileConfiguration hoversConfiguration;
private FileConfiguration autoMessagesConfiguration;
private boolean modernChatBridgeEnabled;
private boolean cardboardCompatibilityMode;
private String activeLanguage = DEFAULT_LANGUAGE;

@Override
Expand All @@ -67,9 +69,16 @@ public void onEnable() {
velocityProxyChatService = new VelocityProxyChatService(this);

ChatListener chatListener = new ChatListener(this);
modernChatBridgeEnabled = new ModernChatBridge(this, chatListener).register();
if (!modernChatBridgeEnabled) {
cardboardCompatibilityMode = isCardboardServer();
if (cardboardCompatibilityMode) {
modernChatBridgeEnabled = false;
getServer().getPluginManager().registerEvents(chatListener, this);
getServer().getPluginManager().registerEvents(new CardboardChatBridge(chatListener), this);
} else {
modernChatBridgeEnabled = new ModernChatBridge(this, chatListener).register();
if (!modernChatBridgeEnabled) {
getServer().getPluginManager().registerEvents(chatListener, this);
}
}
getServer().getPluginManager().registerEvents(new JoinQuitListener(this), this);
getServer().getPluginManager().registerEvents(new CommandCooldownListener(this), this);
Expand Down Expand Up @@ -277,6 +286,18 @@ private String normalizeLanguage(String input) {
return normalized;
}

private boolean isCardboardServer() {
String serverName = getServer().getName();
String serverVersion = getServer().getVersion();
String bukkitVersion = getServer().getBukkitVersion();
String fingerprint = String.join(" ",
serverName == null ? "" : serverName,
serverVersion == null ? "" : serverVersion,
bukkitVersion == null ? "" : bukkitVersion
).toLowerCase(Locale.ROOT);
return fingerprint.contains("cardboard");
}

private void logStartupBanner() {
String version = getDescription().getVersion();
String placeholderApiStatus = placeholderApiHooked ? "Подключен" : "Не найден";
Expand All @@ -286,6 +307,9 @@ private void logStartupBanner() {
String messageInspectorStatus = messageAuditService != null && messageAuditService.isEnabled() ? "Включен" : "Выключен";
String messageInspectorProfile = messageAuditService == null ? "-" : messageAuditService.activeProfileName();
String schedulerMode = compatScheduler != null && compatScheduler.isFolia() ? "Folia" : "Paper/Spigot";
String chatMode = cardboardCompatibilityMode
? "AsyncPlayerChatEvent + PlayerChatEvent fallback"
: (modernChatBridgeEnabled ? "AsyncChatEvent (1.19+)" : "AsyncPlayerChatEvent");

getLogger().info("");
getLogger().info(LOG_TOP);
Expand All @@ -294,7 +318,7 @@ private void logStartupBanner() {
getLogger().info(LOG_SEPARATOR);
getLogger().info(boxLine("Версия: " + version));
getLogger().info(boxLine("Язык: " + activeLanguage));
getLogger().info(boxLine("Чат режим: " + (modernChatBridgeEnabled ? "AsyncChatEvent (1.19+)" : "AsyncPlayerChatEvent")));
getLogger().info(boxLine("Чат режим: " + chatMode));
getLogger().info(boxLine("PlaceholderAPI: " + placeholderApiStatus));
getLogger().info(boxLine("Проверка обновлений: " + updateCheckerStatus));
getLogger().info(boxLine("Автосообщения: " + autoMessagesStatus));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.slyph.cloverchat.listener;

import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChatEvent;

/**
* Cardboard compatibility fallback.
*
* Cardboard's player-chat pipeline first fires AsyncPlayerChatEvent and then,
* when at least one legacy PlayerChatEvent listener is registered, forwards the
* message through PlayerChatEvent before final delivery. Registering this bridge
* gives CloverChat a second interception point on Cardboard builds where the
* AsyncPlayerChatEvent listener is not reached correctly.
*/
@SuppressWarnings("deprecation")
public final class CardboardChatBridge implements Listener {

private final ChatListener chatListener;

public CardboardChatBridge(ChatListener chatListener) {
this.chatListener = chatListener;
}

@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerChat(PlayerChatEvent event) {
event.setCancelled(true);
chatListener.handleIncomingChat(event.getPlayer().getUniqueId(), event.getMessage());
}
}
Loading