api/build.gradle.kts

@@ -3,20 +3,12 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":web-api")) // Web-API
-    compileOnly("org.projectlombok:lombok:1.18.46")
-    annotationProcessor("org.projectlombok:lombok:1.18.46")
     // Cosmos
     compileOnly("com.alttd.cosmos:cosmos-api:1.21.8-R0.1-SNAPSHOT") {
         isChanging = true
     }
     compileOnly("org.spongepowered:configurate-yaml:4.2.0") // Configurate
     compileOnly("net.luckperms:api:5.5") // Luckperms
-
-    //API validation
-    implementation("org.hibernate.validator:hibernate-validator:9.0.1.Final")
-    implementation("org.glassfish:jakarta.el:5.0.0-M1")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1")
 }
 
 publishing {

api/src/main/java/com/alttd/chat/config/Config.java

@@ -38,9 +38,9 @@ public final class Config {
         CONFIGPATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "ChatPlugin");
         CONFIG_FILE = new File(CONFIGPATH, "config.yml");
         configLoader = YamlConfigurationLoader.builder()
-                .file(CONFIG_FILE)
+                                              .file(CONFIG_FILE)
-                .nodeStyle(NodeStyle.BLOCK)
+                                              .nodeStyle(NodeStyle.BLOCK)
-                .build();
+                                              .build();
         if (!CONFIG_FILE.getParentFile().exists()) {
             if (!CONFIG_FILE.getParentFile().mkdirs()) {
                 return;
@@ -183,15 +183,11 @@ public final class Config {
     private static void settings() {
         PREFIXGROUPS = getList("settings.prefix-groups",
                 Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch",
-                        "developer"
+                        "developer"));
-                )
-        );
         CONFLICTINGPREFIXGROUPS = getList("settings.prefix-conflicts-groups",
-                Lists.newArrayList("eventteam", "eventleader")
+                Lists.newArrayList("eventteam", "eventleader"));
-        );
         STAFFGROUPS = getList("settings.staff-groups",
-                Lists.newArrayList("trainee", "moderator", "headmod", "admin", "manager", "owner")
+                Lists.newArrayList("trainee", "moderator", "headmod", "admin", "manager", "owner"));
-        );
         CONSOLENAME = getString("settings.console-name", CONSOLENAME);
         CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString()));
         MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK);
@@ -286,7 +282,7 @@ public final class Config {
     public static String NO_PERMISSION = "<red>You don't have permission to use this command.</red>";
     public static String NO_CONSOLE = "<red>This command can not be used by console</red>";
     public static String CREATED_PARTY = "<green>You created a chat party called: " +
-                                         "'<gold><party_name></gold>' with the password: '<gold><party_password></gold>'</green>";
+            "'<gold><party_name></gold>' with the password: '<gold><party_password></gold>'</green>";
     public static String NOT_IN_A_PARTY = "<red>You're not in a chat party.</red>";
     public static String NOT_YOUR_PARTY = "<red>You don't own this chat party.</red>";
     public static String NOT_A_PARTY = "<red>This chat party does not exist.</red>";
@@ -311,14 +307,14 @@ public final class Config {
     public static String ALREADY_IN_THIS_PARTY = "<red>You're already in <party>!</red>";
     public static String SENT_PARTY_INV = "<green>You send a chat party invite to <player>!</green>";
     public static String JOIN_PARTY_CLICK_MESSAGE = "<click:run_command:'/party join <party> <party_password>'>" +
-                                                    "<dark_aqua>You received an invite to join <party>, click this message to accept.</dark_aqua></click>";
+            "<dark_aqua>You received an invite to join <party>, click this message to accept.</dark_aqua></click>";
     public static String PARTY_MEMBER_LOGGED_ON = "<dark_aqua>[ChatParty] <player> joined Altitude...</dark_aqua>";
     public static String PARTY_MEMBER_LOGGED_OFF = "<dark_aqua>[ChatParty] <player> left Altitude...</dark_aqua>";
     public static String RENAMED_PARTY =
             "<dark_aqua>[ChatParty] <owner> changed the party name from <old_name> to <new_name>!</dark_aqua>";
     public static String CHANGED_PASSWORD = "<green>Password was set to <password></green>";
     public static String DISBAND_PARTY_CONFIRM = "<green><bold>Are you sure you want to disband your party?</bold> " +
-                                                 "Type <gold>/party disband confirm <party></gold> to confirm.";
+            "Type <gold>/party disband confirm <party></gold> to confirm.";
     public static String DISBANDED_PARTY =
             "<dark_aqua>[ChatParty] <owner> has disbanded <party>, everyone has been removed.</dark_aqua>";
     public static String PARTY_INFO = """
@@ -417,8 +413,7 @@ public final class Config {
         ConfigurationNode node = getNode("chat-channels");
         if (node.empty()) {
             getString("chat-channels.ac.format",
-                    "<white><gray><sender></gray> <hover:show_text:on <server>><yellow>to <channel></yellow></hover><gray>: <message>"
+                    "<white><gray><sender></gray> <hover:show_text:on <server>><yellow>to <channel></yellow></hover><gray>: <message>");
-            );
             getList("chat-channels.ac.servers", List.of("lobby"));
             getBoolean("chat-channels.ac.proxy", false);
             node = getNode("chat-channels");
@@ -622,15 +617,11 @@ public final class Config {
         NICK_WAIT_TIME = getLong("nicknames.wait-time", NICK_WAIT_TIME);
         NICK_ITEM_LORE = getList("nicknames.item-lore",
                 List.of("<aqua>New nick: <newnick>", "<aqua>Old nick: <oldnick>", "<aqua>Last changed: <lastchanged>",
-                        "<green>Left click to Accept <light_purple>| <red>Right click to Deny"
+                        "<green>Left click to Accept <light_purple>| <red>Right click to Deny"));
-                )
-        );
         NICK_BLOCKED_COLOR_CODESLIST = getList("nicknames.blocked-color-codes", List.of("&k", "&l", "&n", "&m", "&o"));
         NICK_ALLOWED_COLOR_CODESLIST = getList("nicknames.allowed-color-codes",
                 List.of("&0", "&1", "&2", "&3", "&4", "&5", "&6", "&7", "&8", "&9", "&a", "&b", "&c", "&d", "&e", "&f",
-                        "&r"
+                        "&r"));
-                )
-        );
         NICK_CURRENT = getString("nicknames.messages.nick-current", NICK_CURRENT);
     }
 
@@ -650,14 +641,4 @@ public final class Config {
         CHAT_LOG_DELETE_OLDER_THAN_DAYS = getLong("chat-log.delete-older-than-days", CHAT_LOG_DELETE_OLDER_THAN_DAYS);
         CHAT_LOG_SAVE_DELAY_MINUTES = getLong("chat-log.save-delay-minutes", CHAT_LOG_SAVE_DELAY_MINUTES);
     }
-
-    public static String CHAT_WEB_SERVER_BASE_URL = "http://10.0.0.121:8080";
-    public static String CHAT_WEB_REGISTER_TO_BASE_URL = "https://alttd.com";
-    public static String CHAT_WEB_TOKEN = "invalid-token";
-
-    private static void webServerSettings() {
-        CHAT_WEB_SERVER_BASE_URL = getString("web-server.base-url", CHAT_WEB_SERVER_BASE_URL);
-        CHAT_WEB_REGISTER_TO_BASE_URL = getString("web-server.register-to-base-url", CHAT_WEB_REGISTER_TO_BASE_URL);
-        CHAT_WEB_TOKEN = getString("web-server.token", CHAT_WEB_TOKEN);
-    }
 }

api/src/main/java/com/alttd/chat/database/ChatLogQueries.java

@@ -15,25 +15,15 @@ import java.util.concurrent.CompletionException;
 public class ChatLogQueries {
 
     protected static void createChatLogTable() {
-        String nicknamesTableQuery = """
+        String nicknamesTableQuery = "CREATE TABLE IF NOT EXISTS chat_log("
-                CREATE TABLE IF NOT EXISTS chat_log (
+                + "uuid CHAR(48) NOT NULL,"
-                    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+                + "time_stamp TIMESTAMP(6) NOT NULL, "
-                    uuid CHAR(36) NOT NULL,
+                + "server VARCHAR(50) NOT NULL, "
-                    time_stamp TIMESTAMP(6) NOT NULL,
+                + "chat_message VARCHAR(300) NOT NULL, "
-                    server VARCHAR(50) NOT NULL,
+                + "blocked BIT(1) NOT NULL DEFAULT 0"
-                    type VARCHAR(16) NOT NULL DEFAULT 'public',
+                + ")";
-                    channel VARCHAR(36) DEFAULT NULL,
-                    receiver CHAR(36) DEFAULT NULL,
-                    chat_message VARCHAR(300) NOT NULL,
-                    mini_message JSON,
-                    blocked BOOLEAN NOT NULL DEFAULT FALSE,
-                
-                    INDEX idx_time_stamp (time_stamp)
-                )
-                """;
 
-        try (PreparedStatement preparedStatement = DatabaseConnection.getConnection().prepareStatement(
+        try (PreparedStatement preparedStatement = DatabaseConnection.getConnection().prepareStatement(nicknamesTableQuery)) {
-                nicknamesTableQuery)) {
             preparedStatement.executeUpdate();
         } catch (Throwable throwable) {
             ALogger.error("Failed to create chat log table", throwable);
@@ -41,7 +31,7 @@ public class ChatLogQueries {
     }
 
     public static @NotNull CompletableFuture<Boolean> storeMessages(HashMap<UUID, List<ChatLog>> chatMessages) {
-        String insertQuery = "INSERT INTO chat_log (uuid, time_stamp, server, type, channel, receiver, chat_message, mini_message, blocked) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        String insertQuery = "INSERT INTO chat_log (uuid, time_stamp, server, chat_message, blocked) VALUES (?, ?, ?, ?, ?)";
         return CompletableFuture.supplyAsync(() -> {
             try (Connection connection = DatabaseConnection.createTransactionConnection()) {
                 PreparedStatement preparedStatement = connection.prepareStatement(insertQuery);
@@ -70,7 +60,7 @@ public class ChatLogQueries {
     }
 
     public static @NotNull CompletableFuture<List<ChatLog>> retrieveMessages(ChatLogHandler chatLogHandler, UUID uuid, Duration duration, String server) {
-        String query = "SELECT * FROM chat_log WHERE uuid = ? AND time_stamp > ? AND server = ? AND type = 'public'";
+        String query = "SELECT * FROM chat_log WHERE uuid = ? AND time_stamp > ? AND server = ?";
         return CompletableFuture.supplyAsync(() -> {
             try (Connection connection = DatabaseConnection.getConnection()) {
                 PreparedStatement preparedStatement = connection.prepareStatement(query);
@@ -80,14 +70,13 @@ public class ChatLogQueries {
                 ResultSet resultSet = preparedStatement.executeQuery();
                 List<ChatLog> chatLogs = new ArrayList<>();
                 while (resultSet.next()) {
-                    chatLogHandler.loadFromResultSet(resultSet).ifPresent(chatLogs::add);
+                    ChatLog chatLog = chatLogHandler.loadFromResultSet(resultSet);
+                    chatLogs.add(chatLog);
                 }
                 return chatLogs;
             } catch (SQLException sqlException) {
                 ALogger.error(String.format("Failed to retrieve messages for user %s", uuid), sqlException);
-                throw new CompletionException(String.format("Failed to retrieve messages for user %s", uuid),
+                throw new CompletionException(String.format("Failed to retrieve messages for user %s", uuid), sqlException);
-                        sqlException
-                );
             }
         });
     }
@@ -101,13 +90,8 @@ public class ChatLogQueries {
                 preparedStatement.setTimestamp(1, Timestamp.from(Instant.now().minus(duration)));
                 return preparedStatement.execute();
             } catch (SQLException sqlException) {
-                ALogger.error(String.format("Failed to delete messages older than %s days", duration.toDays()),
+                ALogger.error(String.format("Failed to delete messages older than %s days", duration.toDays()), sqlException);
-                        sqlException
+                throw new CompletionException(String.format("Failed to delete messages older than %s days", duration.toDays()), sqlException);
-                );
-                throw new CompletionException(String.format("Failed to delete messages older than %s days",
-                        duration.toDays()
-                ), sqlException
-                );
             }
         });
     }

api/src/main/java/com/alttd/chat/database/DatabaseConnection.java

@@ -1,5 +1,6 @@
 package com.alttd.chat.database;
 
+
 import com.alttd.chat.config.Config;
 
 import java.sql.Connection;
@@ -26,7 +27,6 @@ public class DatabaseConnection {
 
     /**
      * Opens the connection if it's not already open.
-     *
      * @throws SQLException If it can't create the connection.
      */
     public void openConnection() throws SQLException {
@@ -45,16 +45,14 @@ public class DatabaseConnection {
             }
 
             connection = DriverManager.getConnection(
-                    "jdbc:mysql://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true" +
+                    "jdbc:mysql://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true"+
-                    "&useSSL=false&preserveInstants=true",
+                    "&useSSL=false",
-                    Config.USERNAME, Config.PASSWORD
+                    Config.USERNAME, Config.PASSWORD);
-            );
         }
     }
 
     /**
      * Returns the connection for the database
-     *
      * @return Returns the connection.
      */
     public static Connection getConnection() {
@@ -71,15 +69,13 @@ public class DatabaseConnection {
      * Creates a transactional database connection.
      *
      * @return A {@code Connection} object representing the transactional database connection.
-     *
      * @throws SQLException If there is an error creating the database connection.
      */
     public static Connection createTransactionConnection() throws SQLException {
         connection = DriverManager.getConnection(
-                "jdbc:mysql://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true" +
+                "jdbc:mysql://" + Config.IP + ":" + Config.PORT + "/" + Config.DATABASE + "?autoReconnect=true"+
-                "&useSSL=false&preserveInstants=true",
+                        "&useSSL=false",
-                Config.USERNAME, Config.PASSWORD
+                Config.USERNAME, Config.PASSWORD);
-        );
         connection.setAutoCommit(false);
         return connection;
     }
@@ -92,4 +88,4 @@ public class DatabaseConnection {
         return connection != null;
     }
 
-}
+}

api/src/main/java/com/alttd/chat/objects/Toggleable.java

@@ -18,9 +18,8 @@ public abstract class Toggleable {
 
     public static Toggleable getToggleable(UUID uuid) {
         for (Toggleable toggleableClass : togglableClasses) {
-            if (toggleableClass.isToggled(uuid)) {
+            if (toggleableClass.isToggled(uuid))
                 return toggleableClass;
-            }
         }
         return null;
     }

api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java

@@ -1,10 +1,6 @@
 package com.alttd.chat.objects.chat_log;
 
 import com.alttd.chat.objects.BatchInsertable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.PreparedStatement;
@@ -13,32 +9,44 @@ import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.UUID;
 
-@AllArgsConstructor
-@Getter
 public class ChatLog implements BatchInsertable {
 
     private final UUID uuid;
     private final Instant timestamp;
     private final String server;
-    private final ChatLogType type;
-    private final String channel;
-    private final String receiver;
     private final String message;
-    private final Component miniMessage;
     private final boolean blocked;
 
+    protected ChatLog(UUID uuid, Instant timestamp, String server, String message, boolean blocked) {
+        this.uuid = uuid;
+        this.timestamp = timestamp;
+        this.server = server;
+        this.message = message;
+        this.blocked = blocked;
+    }
+
     @Override
     public void prepareStatement(@NotNull PreparedStatement preparedStatement) throws SQLException {
         preparedStatement.setString(1, uuid.toString());
         preparedStatement.setTimestamp(2, Timestamp.from(timestamp));
         preparedStatement.setString(3, server);
-        preparedStatement.setString(4, ChatLogTypeMapper.toDb(type));
+        preparedStatement.setString(4, message);
-        preparedStatement.setString(5, channel);
+        preparedStatement.setInt(5, blocked ? 1 : 0);
-        preparedStatement.setString(6, receiver);
+    }
-        preparedStatement.setString(7, message);
+
-        preparedStatement.setString(8,
+    public UUID getUuid() {
-                miniMessage == null ? null : GsonComponentSerializer.gson().serialize(miniMessage)
+        return uuid;
-        );
+    }
-        preparedStatement.setInt(9, blocked ? 1 : 0);
+
+    public Instant getTimestamp() {
+        return timestamp;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public boolean isBlocked() {
+        return blocked;
     }
 }

api/src/main/java/com/alttd/chat/objects/chat_log/ChatLogHandler.java

@@ -3,9 +3,6 @@ package com.alttd.chat.objects.chat_log;
 import com.alttd.chat.config.Config;
 import com.alttd.chat.database.ChatLogQueries;
 import com.alttd.chat.util.ALogger;
-import lombok.extern.slf4j.Slf4j;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.ResultSet;
@@ -15,17 +12,14 @@ import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.*;
 
-@Slf4j
 public class ChatLogHandler {
 
-    private final ChatLogWebHandler chatLogWebHandler = new ChatLogWebHandler();
     private static ChatLogHandler instance = null;
     private ScheduledExecutorService executorService = null;
 
     public static ChatLogHandler getInstance(boolean enableLogging) {
-        if (instance == null) {
+        if (instance == null)
             instance = new ChatLogHandler(enableLogging);
-        }
         return instance;
     }
 
@@ -41,30 +35,23 @@ public class ChatLogHandler {
         Duration deleteThreshold = Duration.ofDays(Config.CHAT_LOG_DELETE_OLDER_THAN_DAYS);
         ChatLogQueries.deleteOldMessages(deleteThreshold).thenAccept(success -> {
             if (success) {
-                ALogger.info(String.format("Deleted all messages older than %s days from chat log database.",
+                ALogger.info(String.format("Deleted all messages older than %s days from chat log database.", deleteThreshold.toDays()));
-                        deleteThreshold.toDays()
-                ));
             } else {
-                ALogger.warn(String.format("Failed to delete all messages older than %s days from chat log database.",
+                ALogger.warn(String.format("Failed to delete all messages older than %s days from chat log database.", deleteThreshold.toDays()));
-                        deleteThreshold.toDays()
-                ));
             }
         });
         executorService = Executors.newSingleThreadScheduledExecutor();
         executorService.scheduleAtFixedRate(() -> {
                     saveToDatabase(false);
-                    ALogger.info(String.format("Running scheduler to save messages with a %d delay",
+                    ALogger.info(String.format("Running scheduler to save messages with a %d delay", Config.CHAT_LOG_SAVE_DELAY_MINUTES));
-                            Config.CHAT_LOG_SAVE_DELAY_MINUTES
-                    ));
                 },
-                Config.CHAT_LOG_SAVE_DELAY_MINUTES, Config.CHAT_LOG_SAVE_DELAY_MINUTES, TimeUnit.MINUTES
+                Config.CHAT_LOG_SAVE_DELAY_MINUTES, Config.CHAT_LOG_SAVE_DELAY_MINUTES, TimeUnit.MINUTES);
-        );
         ALogger.info("Logging has started!");
     }
 
     /**
-     * Shuts down the executor service and saves the chat logs to the database. Will throw an error if called on a
+     * Shuts down the executor service and saves the chat logs to the database.
-     * ChatLogHandler that was started without logging
+     * Will throw an error if called on a ChatLogHandler that was started without logging
      */
     public void shutDown() {
         executorService.shutdown();
@@ -79,7 +66,7 @@ public class ChatLogHandler {
         return isSaving;
     }
 
-    private synchronized void addLog(ChatLog chatLog) {
+    public synchronized void addLog(ChatLog chatLog) {
         if (isBlocked()) {
             chatLogQueue.add(chatLog);
         } else {
@@ -113,50 +100,17 @@ public class ChatLogHandler {
         });
     }
 
-    public Optional<ChatLog> loadFromResultSet(@NotNull ResultSet resultSet) throws SQLException {
+    public ChatLog loadFromResultSet(@NotNull ResultSet resultSet) throws SQLException {
         UUID chatLogUUID = UUID.fromString(resultSet.getString("uuid"));
         Instant chatTimestamp = resultSet.getTimestamp("time_stamp").toInstant();
         String server = resultSet.getString("server");
-        String stringType = resultSet.getString("type");
-        ChatLogType type;
-        try {
-            type = ChatLogTypeMapper.fromDb(stringType);
-        } catch (Exception e) {
-            log.error("Failed to load chat log from result set: {}", e.getMessage());
-            return Optional.empty();
-        }
-        String channel = resultSet.getString("channel");
-        String receiver = resultSet.getString("receiver");
         String chatMessage = resultSet.getString("chat_message");
-        String stringMiniMessage = resultSet.getString("mini_message");
-        Component miniMessage = stringMiniMessage == null ? null : GsonComponentSerializer.gson().deserialize(
-                stringMiniMessage);
         boolean chatMessageBlocked = resultSet.getInt("blocked") == 1;
-        return Optional.of(new ChatLog(chatLogUUID,
+        return new ChatLog(chatLogUUID, chatTimestamp, server, chatMessage, chatMessageBlocked);
-                chatTimestamp,
-                server,
-                type,
-                channel,
-                receiver,
-                chatMessage,
-                miniMessage,
-                chatMessageBlocked
-        ));
     }
 
-    public void addChatLog(UUID uuid, String server, String message, ChatLogType chatLogType, String channel, String receiver, Component miniMessage, boolean blocked) {
+    public void addChatLog(UUID uuid, String server, String message, boolean blocked) {
-        ChatLog chatLog = new ChatLog(uuid,
+        addLog(new ChatLog(uuid, Instant.now(), server, message, blocked));
-                Instant.now(),
-                server,
-                chatLogType,
-                channel,
-                receiver,
-                message,
-                miniMessage,
-                blocked
-        );
-        addLog(chatLog);
-        chatLogWebHandler.forwardChatLogToWeb(chatLog);
     }
 
     public CompletableFuture<List<ChatLog>> retrieveChatLogs(UUID uuid, Duration duration, String server) {

api/src/main/java/com/alttd/chat/objects/chat_log/ChatLogMapper.java

@@ -1,50 +0,0 @@
-package com.alttd.chat.objects.chat_log;
-
-import com.alttd.altitudeweb.model.ChatMessageDto;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.Validation;
-import jakarta.validation.Validator;
-import jakarta.validation.ValidatorFactory;
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-
-import java.time.ZoneOffset;
-import java.util.Optional;
-import java.util.Set;
-
-@Slf4j
-@UtilityClass
-public class ChatLogMapper {
-
-    ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-    Validator validator = factory.getValidator();
-
-    public Optional<ChatMessageDto> toDto(ChatLog chatLog) {
-        ChatMessageDto chatMessageDto = new ChatMessageDto();
-        if (chatLog.getMiniMessage() == null) {
-            throw new IllegalArgumentException("MiniMessage cannot be null");
-        }
-        chatMessageDto.setUuid(chatLog.getUuid());
-        chatMessageDto.setTimestamp(chatLog.getTimestamp().atOffset(ZoneOffset.UTC));
-        chatMessageDto.setServer(chatLog.getServer());
-        chatMessageDto.setType(ChatLogTypeMapper.toDto(chatLog.getType()));
-        chatMessageDto.setChannel(chatLog.getChannel());
-        chatMessageDto.setReceiver(chatLog.getReceiver());
-        chatMessageDto.setMessage(GsonComponentSerializer.gson().serialize(chatLog.getMiniMessage()));
-        chatMessageDto.setBlocked(chatLog.isBlocked());
-        if (checkIsInvalid(chatMessageDto)) {
-            return Optional.empty();
-        }
-        return Optional.of(chatMessageDto);
-    }
-
-    private boolean checkIsInvalid(ChatMessageDto chatMessageDto) {
-        Set<ConstraintViolation<ChatMessageDto>> violations = validator.validate(chatMessageDto);
-        if (violations.isEmpty()) {
-            return false;
-        }
-        log.error("Validation failed for chat message: {}, {}", chatMessageDto, violations);
-        return true;
-    }
-}

api/src/main/java/com/alttd/chat/objects/chat_log/ChatLogType.java

@@ -1,10 +0,0 @@
-package com.alttd.chat.objects.chat_log;
-
-public enum ChatLogType {
-    PUBLIC,
-    GLOBAL,
-    PARTY,
-    GAC,
-    MSG,
-    CUSTOM;
-}

api/src/main/java/com/alttd/chat/objects/chat_log/ChatLogTypeMapper.java

@@ -1,43 +0,0 @@
-package com.alttd.chat.objects.chat_log;
-
-import com.alttd.altitudeweb.model.ChatMessageDto;
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class ChatLogTypeMapper {
-
-    public static String toDb(ChatLogType chatLogType) {
-        return switch (chatLogType) {
-            case PUBLIC -> "public";
-            case GLOBAL -> "global";
-            case PARTY -> "party";
-            case GAC -> "gac";
-            case MSG -> "msg";
-            case CUSTOM -> "custom";
-        };
-    }
-
-    public ChatMessageDto.TypeEnum toDto(ChatLogType chatLogType) {
-        return switch (chatLogType) {
-            case PUBLIC -> ChatMessageDto.TypeEnum.PUBLIC;
-            case GLOBAL -> ChatMessageDto.TypeEnum.GLOBAL;
-            case PARTY -> ChatMessageDto.TypeEnum.PARTY;
-            case GAC -> ChatMessageDto.TypeEnum.GAC;
-            case MSG -> ChatMessageDto.TypeEnum.MSG;
-            case CUSTOM -> ChatMessageDto.TypeEnum.CUSTOM;
-        };
-    }
-
-    public ChatLogType fromDb(String dbType) {
-        return switch (dbType) {
-            case "public" -> ChatLogType.PUBLIC;
-            case "global" -> ChatLogType.GLOBAL;
-            case "party" -> ChatLogType.PARTY;
-            case "gac" -> ChatLogType.GAC;
-            case "msg" -> ChatLogType.MSG;
-            case "custom" -> ChatLogType.CUSTOM;
-            default -> throw new IllegalArgumentException("Invalid chat log type: " + dbType);
-        };
-    }
-
-}

api/src/main/java/com/alttd/chat/objects/chat_log/ChatLogWebHandler.java

@@ -1,102 +0,0 @@
-package com.alttd.chat.objects.chat_log;
-
-import com.alttd.altitudeweb.api.ChatApi;
-import com.alttd.altitudeweb.invoker.ApiClient;
-import com.alttd.altitudeweb.invoker.ApiException;
-import com.alttd.altitudeweb.model.ChatMessageDto;
-import com.alttd.chat.config.Config;
-import com.alttd.chat.util.ALogger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class ChatLogWebHandler {
-
-    private static final int MAX_QUEUE_SIZE = 100;
-    private static final Logger log = LoggerFactory.getLogger(ChatLogWebHandler.class);
-
-    private final Queue<ChatLog> queue = new ConcurrentLinkedQueue<>();
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
-
-    private final ChatApi chatApi;
-
-    public ChatLogWebHandler() {
-        ApiClient apiClient = new ApiClient();
-        apiClient.setBasePath(Config.CHAT_WEB_SERVER_BASE_URL);
-
-        chatApi = new ChatApi(apiClient);
-    }
-
-    private volatile boolean sending;
-
-    public void forwardChatLogToWeb(ChatLog chatLog) {
-        if (queue.size() >= MAX_QUEUE_SIZE) {
-            queue.clear();
-            log.error("Chat log queue overflow, is the web backend still running?");
-        }
-
-        queue.add(chatLog);
-        triggerSend();
-    }
-
-    private void triggerSend() {
-        if (sending) {
-            return;
-        }
-
-        synchronized (this) {
-            if (sending || queue.isEmpty()) {
-                return;
-            }
-
-            sending = true;
-        }
-
-        executor.execute(this::sendBatch);
-    }
-
-    private void sendBatch() {
-        try {
-            ArrayList<ChatLog> chatLogList = new ArrayList<>();
-
-            ChatLog log;
-            while ((log = queue.poll()) != null) {
-                if (log.getMiniMessage() == null) {
-                    ALogger.warn("No mini message for message, skipping");
-                    continue;
-                }
-                chatLogList.add(log);
-            }
-
-            List<ChatMessageDto> batch = chatLogList.stream()
-                    .map(ChatLogMapper::toDto)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .toList();
-
-            if (!chatLogList.isEmpty()) {
-                try {
-                    chatApi.sendChatMessages(batch);
-                } catch (ApiException e) {
-                    ALogger.error("Failed to send chat messages to web backend, " +
-                                  "adding messages back to queue for another try", e
-                    );
-                    queue.addAll(chatLogList);
-                }
-            }
-        } finally {
-            synchronized (this) {
-                sending = false;
-            }
-
-            triggerSend();
-        }
-    }
-}

api/src/main/java/com/alttd/chat/web/SseSubscribeClient.java

@@ -1,194 +0,0 @@
-package com.alttd.chat.web;
-
-import com.alttd.chat.config.Config;
-import com.alttd.chat.util.ALogger;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Client for subscribing to: GET /api/chat/send/subscribe/{server} served as text/event-stream (SseEmitter) by
- * CommandsToServerController.
- * <p>
- * Handlers for individual SSE event types can be registered up front via {@link #register(String, WebHandler)}. Each
- * handler says "when an event named X arrives, deserialize its JSON payload as type T and pass it to this handler."
- * Unregistered event names are logged and skipped, not thrown.
- * <p>
- * If the connection fails or drops for any reason, the client logs it and retries once a minute, indefinitely, until
- * stop() is called or the thread is interrupted.
- * <p>
- * Server-side auth: the controller checks @AuthenticationPrincipal Token token, then token.getKey().equals(validToken).
- * That principal is populated from the "Authorization: Bearer <token>" header. validToken is currently hardcoded
- * server-side; swap TOKEN below for a config value once that TODO is resolved.
- */
-public class SseSubscribeClient implements Runnable {
-
-    private static final Logger log = Logger.getLogger(SseSubscribeClient.class.getName());
-    private static final Duration RETRY_DELAY = Duration.ofMinutes(1);
-
-    private final String baseUrl;
-    private final String server;
-    private final HttpClient httpClient;
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    private final Map<String, WebHandler<?>> handlers = new ConcurrentHashMap<>();
-
-    private volatile boolean running = false;
-
-    public SseSubscribeClient(String baseUrl, String server, String token) {
-        this.baseUrl = baseUrl;
-        this.server = server;
-        this.httpClient = HttpClient.newBuilder()
-                .connectTimeout(Duration.ofSeconds(10))
-                .build();
-    }
-
-    /**
-     * Register a handler for a given SSE event name. When an event with this name arrives, its data payload is
-     * deserialized using the handler's type and passed to the handler.
-     */
-    public <T> void register(String eventName, WebHandler<T> handler) {
-        handlers.put(eventName, handler);
-    }
-
-    /**
-     * Runs the subscribe/retry loop on the calling thread. Blocks until stop() is called or the thread is interrupted.
-     */
-    @Override
-    public void run() {
-        running = true;
-        while (running && !Thread.currentThread().isInterrupted()) {
-            String token = Config.CHAT_WEB_TOKEN;
-            if (token.equals("invalid-token")) {
-                log.warning("Invalid token provided for SSE connection as '" + server + "'");
-                sleepBeforeRetry();
-                continue;
-            }
-            try {
-                connectAndListen(token);
-                log.warning("SSE stream as '" + server + "' ended; reconnecting in " + RETRY_DELAY.toMinutes() + " minute(s)");
-            } catch (Exception e) {
-                log.log(Level.WARNING, "SSE connection to '" + server + "' failed; retrying in "
-                                       + RETRY_DELAY.toMinutes() + " minute(s)", e
-                );
-            }
-
-            if (running) {
-                sleepBeforeRetry();
-            }
-        }
-    }
-
-    public void stop() {
-        running = false;
-    }
-
-    private void connectAndListen(String token) throws Exception {
-        HttpResponse<InputStream> response = openConnection(token);
-        checkStatus(response);
-        readEvents(response.body());
-    }
-
-    private HttpResponse<InputStream> openConnection(String token) throws Exception {
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/api/chat/server/send/subscribe/" + server))
-                .header("X-Altitude-Token", token)
-                .header("Accept", "text/event-stream")
-                .GET()
-                .build();
-
-        return httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
-    }
-
-    private void checkStatus(HttpResponse<InputStream> response) {
-        int status = response.statusCode();
-        if (status == 401) {
-            throw new RuntimeException("Unauthorized - missing/invalid token");
-        }
-        if (status == 403) {
-            throw new RuntimeException("Forbidden - token did not match server's validToken");
-        }
-        if (status != 200) {
-            throw new RuntimeException("Unexpected status: " + status);
-        }
-        ALogger.info("SSE connection as '" + server + "' established");
-    }
-
-    /**
-     * Reads the SSE stream line by line, accumulating one event at a time, and dispatches each complete event as it's
-     * parsed.
-     */
-    private void readEvents(InputStream body) throws Exception {
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(body, StandardCharsets.UTF_8))) {
-            String eventName = null;
-            StringBuilder dataBuffer = new StringBuilder();
-            String line;
-
-            while ((line = reader.readLine()) != null) {
-                if (line.isEmpty()) {
-                    if (!dataBuffer.isEmpty()) {
-                        dispatch(eventName, dataBuffer.toString());
-                    }
-                    eventName = null;
-                    dataBuffer.setLength(0);
-                    continue;
-                }
-
-                if (line.startsWith("event:")) {
-                    eventName = line.substring(6).trim();
-                } else if (line.startsWith("data:")) {
-                    if (!dataBuffer.isEmpty()) {
-                        dataBuffer.append('\n');
-                    }
-                    dataBuffer.append(line.substring(5).trim());
-                }
-                // lines starting with ":" are comments/heartbeats - ignored
-            }
-        }
-    }
-
-    private void dispatch(String eventName, String data) {
-        if (eventName == null) {
-            log.warning("Received event with no 'event:' name, ignoring. Data: " + data);
-            return;
-        }
-
-        WebHandler<?> handler = handlers.get(eventName);
-        if (handler == null) {
-            log.warning("No handler registered for event type '" + eventName + "', ignoring");
-            return;
-        }
-
-        dispatchTyped(eventName, handler, data);
-    }
-
-    // Captures the wildcard type from the handler so parsing/casting is type-safe.
-    private <T> void dispatchTyped(String eventName, WebHandler<T> handler, String data) {
-        try {
-            T event = objectMapper.readValue(data, handler.type());
-            handler.handle(event);
-        } catch (Exception e) {
-            log.log(Level.WARNING, "Failed to parse/handle event '" + eventName + "'", e);
-        }
-    }
-
-    private void sleepBeforeRetry() {
-        try {
-            Thread.sleep(RETRY_DELAY.toMillis());
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            running = false;
-        }
-    }
-}

api/src/main/java/com/alttd/chat/web/WebHandler.java

@@ -1,9 +0,0 @@
-package com.alttd.chat.web;
-
-public interface WebHandler<T> {
-
-    Class<T> type();
-
-    void handle(T event);
-
-}

api/src/main/java/com/alttd/chat/web/handler_class/ChatFromWeb.java

@@ -1,15 +0,0 @@
-package com.alttd.chat.web.handler_class;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.UUID;
-
-@Data
-@NoArgsConstructor
-public class ChatFromWeb {
-
-    private UUID sender;
-    private String message;
-
-}

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     `java-library`
-    id("com.gradleup.shadow") version "9.6.1"
+    id("io.github.goooler.shadow") version "8.1.8"
     id("com.github.ben-manes.versions") version "0.52.0"
 }
 
@@ -15,7 +15,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(25))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
 

galaxy/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     `maven-publish`
-    id("com.gradleup.shadow")
+    id("io.github.goooler.shadow")
 }
 
 val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME")
@@ -8,9 +8,9 @@ val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: Syst
 
 dependencies {
     implementation(project(":api")) // API
-    compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
+    compileOnly("com.alttd.cosmos:cosmos-api:1.21.8-R0.1-SNAPSHOT") {
-    compileOnly("org.projectlombok:lombok:1.18.46")
+        isChanging = true
-    annotationProcessor("org.projectlombok:lombok:1.18.46")
+    }
     compileOnly("com.gitlab.ruany:LiteBansAPI:0.6.1") // move to proxy
     compileOnly("org.apache.commons:commons-lang3:3.17.0") // needs an alternative, already removed from upstream api and will be removed in server
     compileOnly("net.luckperms:api:5.5") // Luckperms

galaxy/src/main/java/com/alttd/chat/ChatPlugin.java

@@ -1,7 +1,5 @@
 package com.alttd.chat;
 
-import com.alttd.chat.chat_web.ChatMessageSender;
-import com.alttd.chat.chat_web.handlers.WebChatHandler;
 import com.alttd.chat.commands.*;
 import com.alttd.chat.config.Config;
 import com.alttd.chat.config.ServerConfig;
@@ -16,8 +14,6 @@ import com.alttd.chat.objects.chat_log.ChatLogHandler;
 import com.alttd.chat.util.ALogger;
 import com.alttd.chat.util.ServerName;
 import com.alttd.chat.util.Utility;
-import com.alttd.chat.web.SseSubscribeClient;
-import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.event.Listener;
@@ -27,31 +23,23 @@ import java.util.Objects;
 
 public class ChatPlugin extends JavaPlugin {
 
-    @Getter
     private static ChatPlugin instance;
 
     private ChatAPI chatAPI;
-    @Getter
     private ChatHandler chatHandler;
 
     private ServerConfig serverConfig;
-    private SseSubscribeClient sseSubscribeClient;
 
     @Override
     public void onEnable() {
         instance = this;
         ALogger.init(getSLF4JLogger());
         chatAPI = new ChatImplementation();
-        ChatLogHandler chatLogHandler = ChatLogHandler.getInstance(true);
+        chatHandler = new ChatHandler();
-        chatHandler = new ChatHandler(chatLogHandler);
         DatabaseConnection.initialize();
         serverConfig = new ServerConfig(ServerName.getServerName());
-        ChatMessageSender chatMessageSender = new ChatMessageSender(chatLogHandler, chatAPI.getLuckPerms());
+        ChatLogHandler chatLogHandler = ChatLogHandler.getInstance(true);
-        registerListener(new PlayerListener(serverConfig),
+        registerListener(new PlayerListener(serverConfig), new ChatListener(chatLogHandler), new BookListener(), new ShutdownListener(chatLogHandler, this));
-                new ChatListener(chatMessageSender),
-                new BookListener(),
-                new ShutdownListener(chatLogHandler, this)
-        );
         if (serverConfig.GLOBALCHAT) {
             registerCommand("globalchat", new GlobalChat());
             registerCommand("toggleglobalchat", new ToggleGlobalChat());
@@ -70,37 +58,21 @@ public class ChatPlugin extends JavaPlugin {
             if (!(channel instanceof CustomChannel customChannel)) {
                 continue;
             }
-            this.getServer()
+            this.getServer().getCommandMap().register(channel.getChannelName().toLowerCase(), new ChatChannel(customChannel));
-                    .getCommandMap()
-                    .register(channel.getChannelName().toLowerCase(), new ChatChannel(customChannel));
         }
 
         String messageChannel = Config.MESSAGECHANNEL;
         getServer().getMessenger().registerOutgoingPluginChannel(this, messageChannel);
-        getServer().getMessenger()
+        getServer().getMessenger().registerIncomingPluginChannel(this, messageChannel, new PluginMessage());
-                .registerIncomingPluginChannel(this, messageChannel, new PluginMessage(chatLogHandler));
 
         NicknamesEvents nicknamesEvents = new NicknamesEvents();
         getServer().getMessenger().registerIncomingPluginChannel(this, messageChannel, nicknamesEvents);
         getServer().getPluginManager().registerEvents(nicknamesEvents, this);
         registerCommand("nick", new Nicknames());
-
-        sseSubscribeClient = new SseSubscribeClient(
-                Config.CHAT_WEB_REGISTER_TO_BASE_URL,
-                getServer().getServerName(),
-                Config.CHAT_WEB_TOKEN
-        );
-        new Thread(sseSubscribeClient).start();
-        registerWebHandlers(chatMessageSender, sseSubscribeClient);
-    }
-
-    private void registerWebHandlers(ChatMessageSender chatMessageSender, SseSubscribeClient sseSubscribeClient) {
-        sseSubscribeClient.register("web_chat", new WebChatHandler(chatMessageSender));
     }
 
     @Override
     public void onDisable() {
-        sseSubscribeClient.stop();
         instance = null;
     }
 
@@ -114,6 +86,14 @@ public class ChatPlugin extends JavaPlugin {
         Objects.requireNonNull(getCommand(commandName)).setExecutor(commandExecutor);
     }
 
+    public static ChatPlugin getInstance() {
+        return instance;
+    }
+
+    public ChatHandler getChatHandler() {
+        return chatHandler;
+    }
+
     public boolean serverGlobalChatEnabled() {
         return serverConfig.GLOBALCHAT;
     }
@@ -130,9 +110,7 @@ public class ChatPlugin extends JavaPlugin {
         chatAPI.reloadConfig();
         chatAPI.reloadChatFilters();
         serverConfig = new ServerConfig(ServerName.getServerName());
-        Bukkit.broadcast(Utility.parseMiniMessage("Reloaded ChatPlugin Config.").asComponent(),
+        Bukkit.broadcast(Utility.parseMiniMessage("Reloaded ChatPlugin Config.").asComponent(), "command.chat.reloadchat");
-                "command.chat.reloadchat"
-        );
         ALogger.info("Reloaded ChatPlugin config.");
     }
 }

galaxy/src/main/java/com/alttd/chat/chat_web/ChatMessageSender.java

@@ -1,278 +0,0 @@
-package com.alttd.chat.chat_web;
-
-import com.alttd.chat.ChatPlugin;
-import com.alttd.chat.config.Config;
-import com.alttd.chat.managers.ChatUserManager;
-import com.alttd.chat.managers.RegexManager;
-import com.alttd.chat.objects.ChatUser;
-import com.alttd.chat.objects.FilterType;
-import com.alttd.chat.objects.ModifiableString;
-import com.alttd.chat.objects.chat_log.ChatLogHandler;
-import com.alttd.chat.objects.chat_log.ChatLogType;
-import com.alttd.chat.util.ALogger;
-import com.alttd.chat.util.GalaxyUtility;
-import com.alttd.chat.util.ServerName;
-import com.alttd.chat.util.Utility;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-import lombok.RequiredArgsConstructor;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.TextReplacementConfig;
-import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import net.luckperms.api.LuckPerms;
-import net.luckperms.api.context.ImmutableContextSet;
-import net.luckperms.api.model.user.User;
-import net.luckperms.api.query.QueryOptions;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@RequiredArgsConstructor
-public class ChatMessageSender {
-
-    private final ChatLogHandler chatLogHandler;
-    private final LuckPerms luckPerms;
-    private final MiniMessage miniMessage = MiniMessage.miniMessage();
-
-    public void sendMessage(UUID sender, String message) {
-        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(sender);
-        Component component = miniMessage.deserialize(message);
-        sendMessage(offlinePlayer, component);
-    }
-
-    public void sendMessage(@NotNull OfflinePlayer offlinePlayer, Component message) {
-        UUID uuid = offlinePlayer.getUniqueId();
-        if (luckPerms.getUserManager().isLoaded(uuid)) {
-            User user = luckPerms.getUserManager().getUser(uuid);
-            sendMessage(user, offlinePlayer, message);
-        } else {
-            luckPerms.getUserManager().loadUser(uuid).whenComplete((user, throwable) -> {
-                if (throwable != null) {
-                    ALogger.error("Failed to load user: " + uuid, throwable);
-                }
-                sendMessage(user, offlinePlayer, message);
-            });
-        }
-    }
-
-    private void sendMessage(User user, OfflinePlayer offlinePlayer, Component message) {
-        if (offlinePlayer == null) {
-            ALogger.error("OfflinePlayer is null");
-            return;
-        }
-        if (ChatPlugin.getInstance().serverMuted() && !hasPermission(user, "chat.bypass-server-muted")) {
-            sendBlockNotifIfOnline(offlinePlayer, message);
-            return;
-        }
-
-        UUID uuid = offlinePlayer.getUniqueId();
-
-        ComponentLike input = message.colorIfAbsent(NamedTextColor.WHITE);
-        Component inputComponent = input.asComponent();
-
-        ModifiableString modifiableString = new ModifiableString(inputComponent);
-
-        if (parseMessage(offlinePlayer, uuid, modifiableString, inputComponent)) {
-            //Parse message failed likely due to something the player said, already logged
-            return;
-        }
-
-        if (sendMessageAndPing(user, offlinePlayer, uuid, modifiableString)) {
-            //Send message and ping failed, likely due to the offlinePlayer not being valid, already logged
-            return;
-        }
-        ALogger.info(PlainTextComponentSerializer.plainText().serialize(inputComponent));
-    }
-
-    private boolean sendMessageAndPing(User user, OfflinePlayer offlinePlayer, UUID uuid, ModifiableString modifiableString) {
-        ComponentLike input;
-        Stream<Player> stream = Bukkit.getOnlinePlayers().stream()
-                .map(audience -> (Player) audience);
-
-        if (!hasPermission(user, "chat.ignorebypass")) {
-            stream = stream.filter(receiver -> {
-                boolean isPlayerIgnored = ChatUserManager
-                        .getChatUser(receiver.getUniqueId())
-                        .getIgnoredPlayers()
-                        .contains(uuid);
-                return !isPlayerIgnored || receiver.hasPermission("chat.ignorebypass");
-            });
-        }
-        Set<Player> receivers = stream.collect(Collectors.toSet());
-
-        Set<Player> playersToPing = new HashSet<>();
-        pingPlayers(playersToPing, modifiableString, offlinePlayer, user);
-
-        Optional<ComponentLike> render = render(offlinePlayer, modifiableString.component());
-        if (render.isEmpty()) {
-            //Already logged
-            return true;
-        }
-        input = render.get();
-        for (Player receiver : receivers) {
-            receiver.sendMessage(input);
-        }
-        for (Player pingPlayer : playersToPing) {
-            pingPlayer.playSound(pingPlayer.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1, 1);
-        }
-        chatLogHandler.addChatLog(uuid,
-                ServerName.getServerName(),
-                modifiableString.string(),
-                ChatLogType.PUBLIC,
-                null,
-                null,
-                input.asComponent(),
-                false
-        );
-        return false;
-    }
-
-    private boolean parseMessage(OfflinePlayer offlinePlayer, UUID uuid, ModifiableString modifiableString, Component inputComponent) {
-        // todo a better way for this
-        if (!RegexManager.filterText(offlinePlayer.getName(), uuid, modifiableString, true, "chat",
-                filterType -> punishOnlinePlayer(filterType, uuid, modifiableString)
-        )) {
-            GalaxyUtility.sendBlockedNotification("Language", offlinePlayer,
-                    modifiableString.component(),
-                    ""
-            );
-            String originalMessage = PlainTextComponentSerializer.plainText().serialize(inputComponent);
-            Optional<Component> component = render(offlinePlayer, inputComponent).map(ComponentLike::asComponent);
-            if (component.isEmpty()) {
-                //Already logged
-                return true;
-            }
-            chatLogHandler.addChatLog(uuid,
-                    ServerName.getServerName(),
-                    originalMessage,
-                    ChatLogType.PUBLIC,
-                    null,
-                    null,
-                    component.get(),
-                    true
-            );
-            return true;
-        }
-        return false;
-    }
-
-    private void pingPlayers(Set<Player> playersToPing, ModifiableString modifiableString, OfflinePlayer offlinePlayer, User user) {
-        Component mention = MiniMessage.miniMessage().deserialize(Config.MENTIONPLAYERTAG);
-        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            String name = onlinePlayer.getName();
-            String nickName = PlainTextComponentSerializer.plainText().serialize(onlinePlayer.displayName());
-
-            Pattern namePattern = Pattern.compile("\\b(?<!\\\\)" + name + "\\b", Pattern.CASE_INSENSITIVE);
-            //            Pattern escapedNamePattern = Pattern.compile("\\b\\\\" + name + "\\b", Pattern.CASE_INSENSITIVE);
-            Pattern nickPattern = Pattern.compile("\\b(?<!\\\\)" + nickName + "\\b", Pattern.CASE_INSENSITIVE);
-            //            Pattern escapedNickPattern = Pattern.compile("\\b\\\\" + nickName + "\\b", Pattern.CASE_INSENSITIVE);
-
-            ChatUser onlinePlayerUser = ChatUserManager.getChatUser(onlinePlayer.getUniqueId());
-            if (namePattern.matcher(modifiableString.string()).find()) {
-                modifiableString.replace(TextReplacementConfig.builder()
-                        .once()
-                        .match(namePattern)
-                        .replacement(mention.append(onlinePlayerUser.getDisplayName()))
-                        .build());
-                //TODO replace all instances of \name with just name but using the match result so the capitalization doesn't change
-                //                modifiableString.replace(TextReplacementConfig.builder()
-                //                        .once()
-                //                        .match(escapedNamePattern)
-                //                        .replacement((a, b) -> {
-                //                            String substring = a.group().substring(1);
-                //                            return ;
-                //                        });
-
-                if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId())
-                        .getIgnoredPlayers()
-                        .contains(offlinePlayer.getUniqueId())
-                    || hasPermission(user, "chat.ignorebypass")) {
-                    playersToPing.add(onlinePlayer);
-                }
-            } else if (nickPattern.matcher(modifiableString.string()).find()) {
-                modifiableString.replace(TextReplacementConfig.builder()
-                        .once()
-                        .match(nickPattern)
-                        .replacement(mention.append(onlinePlayerUser.getDisplayName()))
-                        .build());
-                if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId())
-                        .getIgnoredPlayers()
-                        .contains(offlinePlayer.getUniqueId())
-                    || hasPermission(user, "chat.ignorebypass")) {
-                    playersToPing.add(onlinePlayer);
-                }
-            }
-        }
-    }
-
-    private Optional<ComponentLike> render(@NotNull OfflinePlayer offlinePlayer, @NotNull Component message) {
-        if (offlinePlayer.getName() == null) {
-            ALogger.error("Invalid offline player");
-            return Optional.empty();
-        }
-
-        ChatUser user = ChatUserManager.getChatUser(offlinePlayer.getUniqueId());
-        TagResolver placeholders = TagResolver.resolver(
-                Placeholder.component("sender", user.getDisplayName()),
-                Placeholder.parsed("sendername", offlinePlayer.getName()),
-                Placeholder.component("prefix", user.getPrefix()),
-                Placeholder.component("prefixall", user.getPrefixAll()),
-                Placeholder.component("staffprefix", user.getStaffPrefix()),
-                Placeholder.component("message", message)
-        );
-
-        return Optional.of(Utility.parseMiniMessage(Config.CHATFORMAT, placeholders));
-    }
-
-    private static void punishOnlinePlayer(FilterType filterType, UUID uuid, ModifiableString modifiableString) {
-        Player player = Bukkit.getPlayer(uuid);
-        if (player == null) {
-            return;
-        }
-        if (!filterType.equals(FilterType.PUNISH)) {
-            ALogger.warn("Received another FilterType than punish when filtering chat and executing a filter action");
-            return;
-        }
-        ByteArrayDataOutput out = ByteStreams.newDataOutput();
-        out.writeUTF("punish");
-        out.writeUTF(player.getName());
-        out.writeUTF(uuid.toString());
-        out.writeUTF(modifiableString.string());
-        player.sendPluginMessage(ChatPlugin.getInstance(), Config.MESSAGECHANNEL, out.toByteArray());
-    }
-
-    private static void sendBlockNotifIfOnline(OfflinePlayer offlinePlayer, Component message) {
-        if (!offlinePlayer.isOnline()) {
-            return;
-        }
-        Player player = offlinePlayer.getPlayer();
-        if (player == null) {
-            ALogger.error("Failed to load player: " + offlinePlayer.getName());
-            return;
-        }
-        GalaxyUtility.sendBlockedNotification("Chat Muted", player, message, "");
-    }
-
-    private boolean hasPermission(User user, String permission) {
-        return user.getCachedData()
-                .getPermissionData(QueryOptions.contextual(ImmutableContextSet.of("server", luckPerms.getServerName())))
-                .checkPermission(permission)
-                .asBoolean();
-    }
-
-}

galaxy/src/main/java/com/alttd/chat/chat_web/handlers/WebChatHandler.java

@@ -1,24 +0,0 @@
-package com.alttd.chat.chat_web.handlers;
-
-import com.alttd.chat.chat_web.ChatMessageSender;
-import com.alttd.chat.web.WebHandler;
-import com.alttd.chat.web.handler_class.ChatFromWeb;
-
-public class WebChatHandler implements WebHandler<ChatFromWeb> {
-
-    private final ChatMessageSender chatMessageSender;
-
-    public WebChatHandler(ChatMessageSender chatMessageSender) {
-        this.chatMessageSender = chatMessageSender;
-    }
-
-    @Override
-    public Class<ChatFromWeb> type() {
-        return ChatFromWeb.class;
-    }
-
-    @Override
-    public void handle(ChatFromWeb chatFromWeb) {
-        this.chatMessageSender.sendMessage(chatFromWeb.getSender(), chatFromWeb.getMessage());
-    }
-}

galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java

@@ -8,8 +8,6 @@ import com.alttd.chat.objects.ChatFilter;
 import com.alttd.chat.objects.ChatUser;
 import com.alttd.chat.objects.ModifiableString;
 import com.alttd.chat.objects.channels.CustomChannel;
-import com.alttd.chat.objects.chat_log.ChatLogHandler;
-import com.alttd.chat.objects.chat_log.ChatLogType;
 import com.alttd.chat.util.ALogger;
 import com.alttd.chat.util.GalaxyUtility;
 import com.alttd.chat.util.ServerName;
@@ -30,7 +28,6 @@ import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Objects;
@@ -43,10 +40,8 @@ public class ChatHandler {
     private final ChatPlugin plugin;
 
     private final ComponentLike GCNOTENABLED;
-    private final ChatLogHandler chatLogHandler;
 
-    public ChatHandler(ChatLogHandler chatLogHandler) {
+    public ChatHandler() {
-        this.chatLogHandler = chatLogHandler;
         plugin = ChatPlugin.getInstance();
         GCNOTENABLED = Utility.parseMiniMessage(Config.GCNOTENABLED);
     }
@@ -59,7 +54,7 @@ public class ChatHandler {
                 Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.component("sendername", player.name()),
                 Placeholder.parsed("receivername", target)
-        );
+                                                       );
 
         ComponentLike component = Utility.parseMiniMessage("<message>", placeholders);
 
@@ -67,10 +62,9 @@ public class ChatHandler {
         // todo a better way for this
         if (!RegexManager.filterText(player.getName(), player.getUniqueId(), modifiableString, "privatemessage")) {
             GalaxyUtility.sendBlockedNotification("DM Language",
-                    player,
+                                                  player,
-                    Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
+                                                  Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
-                    target
+                                                  target);
-            );
             return; // the message was blocked
         }
 
@@ -79,8 +73,7 @@ public class ChatHandler {
         sendPrivateMessage(player, target, "privatemessage", component.asComponent());
         ComponentLike spymessage = Utility.parseMiniMessage(Config.MESSAGESPY, placeholders);
         for (Player pl : Bukkit.getOnlinePlayers()) {
-            if (pl.hasPermission(Config.SPYPERMISSION) && ChatUserManager.getChatUser(pl.getUniqueId())
+            if (pl.hasPermission(Config.SPYPERMISSION) && ChatUserManager.getChatUser(pl.getUniqueId()).isSpy() && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) {
-                    .isSpy() && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) {
                 pl.sendMessage(spymessage);
             }
         }
@@ -95,16 +88,15 @@ public class ChatHandler {
                 Placeholder.component("message", messageComponent),
                 Placeholder.component("sendername", player.name()),
                 Placeholder.parsed("receivername", target)
-        );
+                                                       );
 
         ModifiableString modifiableString = new ModifiableString(messageComponent);
         // todo a better way for this
         if (!RegexManager.filterText(player.getName(), player.getUniqueId(), modifiableString, "privatemessage")) {
             GalaxyUtility.sendBlockedNotification("DM Language",
-                    player,
+                                                  player,
-                    Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
+                                                  Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
-                    target
+                                                  target);
-            );
             return; // the message was blocked
         }
 
@@ -116,8 +108,7 @@ public class ChatHandler {
         sendPrivateMessage(player, target, "privatemessage", messageComponent);
         ComponentLike spymessage = Utility.parseMiniMessage(Config.MESSAGESPY, placeholders);
         for (Player pl : Bukkit.getOnlinePlayers()) {
-            if (pl.hasPermission(Config.SPYPERMISSION) && ChatUserManager.getChatUser(pl.getUniqueId())
+            if (pl.hasPermission(Config.SPYPERMISSION) && ChatUserManager.getChatUser(pl.getUniqueId()).isSpy() && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) {
-                    .isSpy() && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) {
                 pl.sendMessage(spymessage);
             }
         }
@@ -136,9 +127,7 @@ public class ChatHandler {
 
         long timeLeft = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - user.getGcCooldown());
         if (timeLeft <= Config.GCCOOLDOWN && !player.hasPermission("chat.globalchat.cooldownbypass")) { // player is on cooldown and should wait x seconds
-            player.sendRichMessage(Config.GCONCOOLDOWN,
+            player.sendRichMessage(Config.GCONCOOLDOWN, Placeholder.parsed("cooldown", Config.GCCOOLDOWN - timeLeft + ""));
-                    Placeholder.parsed("cooldown", Config.GCCOOLDOWN - timeLeft + "")
-            );
             return;
         }
 
@@ -149,7 +138,7 @@ public class ChatHandler {
                 Placeholder.component("prefix", prefix),
                 Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.parsed("server", ServerName.getServerName())
-        );
+                                                       );
 
         Component component = Utility.parseMiniMessage(Config.GCFORMAT, placeholders).asComponent();
 
@@ -157,24 +146,13 @@ public class ChatHandler {
         // todo a better way for this
         if (!RegexManager.filterText(player.getName(), player.getUniqueId(), modifiableString, "globalchat")) {
             GalaxyUtility.sendBlockedNotification("GC Language",
-                    player,
+                                                  player,
-                    Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
+                                                  Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
-                    ""
+                                                  "");
-            );
             return; // the message was blocked
         }
         component = modifiableString.component();
 
-        chatLogHandler.addChatLog(player.getUniqueId(),
-                Bukkit.getServerName(),
-                message,
-                ChatLogType.GLOBAL,
-                null,
-                null,
-                component,
-                false
-        );
-
         user.setGcCooldown(System.currentTimeMillis());
         sendPluginMessage(player, "globalchat", component);
     }
@@ -198,20 +176,15 @@ public class ChatHandler {
                 Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.parsed("server", ServerName.getServerName()),
                 Placeholder.parsed("channel", channel.getChannelName())
-        );
+                                                       );
         Component component = Utility.parseMiniMessage(channel.getFormat(), placeholders).asComponent();
 
         ModifiableString modifiableString = new ModifiableString(component);
-        if (!RegexManager.filterText(player.getName(),
+        if (!RegexManager.filterText(player.getName(), player.getUniqueId(), modifiableString, channel.getChannelName())) {
-                player.getUniqueId(),
-                modifiableString,
-                channel.getChannelName()
-        )) {
             GalaxyUtility.sendBlockedNotification(channel.getChannelName() + " Language",
-                    player,
+                                                  player,
-                    Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
+                                                  Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
-                    ""
+                                                  "");
-            );
             ALogger.info("Refusing to send blocked chat message");
             return;
         }
@@ -232,7 +205,7 @@ public class ChatHandler {
         out.writeUTF(message);
         out.writeUTF(GsonComponentSerializer.gson().serialize(
                 itemComponent(player.getInventory().getItemInMainHand())
-        ));
+                                                             ));
         player.sendPluginMessage(plugin, Config.MESSAGECHANNEL, out.toByteArray());
 
         //        if (isMuted(player, message, "[" + party.getPartyName() + " Muted] ")) return;
@@ -282,20 +255,16 @@ public class ChatHandler {
 
         if (!chatChannel.getServers().contains(ServerName.getServerName())) {
             player.sendRichMessage("<red>Unable to send messages to <channel> in this server.</red>",
-                    Placeholder.parsed("channel", chatChannel.getChannelName())
+                                   Placeholder.parsed("channel", chatChannel.getChannelName()));
-            );
             ALogger.info(String.format("Not sending chat message due to [%s] not being in this channels config",
-                    ServerName.getServerName()
+                                       ServerName.getServerName()));
-            ));
             return;
         }
 
         Stream<? extends Player> stream = Bukkit.getServer().getOnlinePlayers().stream()
                 .filter(p -> p.hasPermission(chatChannel.getPermission()));
         if (!player.hasPermission("chat.ignorebypass")) {
-            stream = stream.filter(receiver -> !ChatUserManager.getChatUser(receiver.getUniqueId())
+            stream = stream.filter(receiver -> !ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(uuid)
-                    .getIgnoredPlayers()
-                    .contains(uuid)
                                                || receiver.hasPermission("chat.ignorebypass"));
         }
         if (chatChannel.isLocal()) {
@@ -314,39 +283,14 @@ public class ChatHandler {
         List<? extends Player> recipientPlayers = stream.toList();
         recipientPlayers.forEach(p -> p.sendMessage(component));
 
-        chatLogHandler.addChatLog(player.getUniqueId(),
-                Bukkit.getServerName(),
-                message,
-                ChatLogType.CUSTOM,
-                chatChannel.getChannelName(),
-                getLocationIfLocal(chatChannel, player),
-                component.asComponent(),
-                false
-        );
-
         List<UUID> recipientUUIDs = recipientPlayers.stream().map(Entity::getUniqueId).toList();
         Bukkit.getServer().getOnlinePlayers().stream()
                 .filter(onlinePlayer -> onlinePlayer.hasPermission(Config.SPYPERMISSION))
                 .filter(onlinePlayer -> !recipientUUIDs.contains(onlinePlayer.getUniqueId()))
                 .forEach(onlinePlayer -> onlinePlayer.sendRichMessage(Config.CHANNEL_SPY,
-                        Placeholder.component("sender", player.name()),
+                                                                      Placeholder.component("sender", player.name()),
-                        Placeholder.parsed("channel", chatChannel.getChannelName()),
+                                                                      Placeholder.parsed("channel", chatChannel.getChannelName()),
-                        Placeholder.parsed("message", message)
+                                                                      Placeholder.parsed("message", message)));
-                ));
-    }
-
-    private static @Nullable String getLocationIfLocal(CustomChannel chatChannel, Player player) {
-        if (!chatChannel.isLocal()) {
-            return null;
-        }
-        String format = String.format("%s;%s",
-                player.getLocation().getBlockX(),
-                player.getLocation().getBlockZ()
-        );
-        if (format.length() > 36) {
-            return null;
-        }
-        return format;
     }
 
     private void sendPluginMessage(Player player, String channel, Component component) {
@@ -382,14 +326,9 @@ public class ChatHandler {
         if (user == null) {
             return false;
         }
-        if (user.isMuted() || (ChatPlugin.getInstance().serverMuted() && !player.hasPermission(
+        if (user.isMuted() || (ChatPlugin.getInstance().serverMuted() && !player.hasPermission("chat.bypass-server-muted"))) {
-                "chat.bypass-server-muted"))) {
             //        if (Database.get().isPlayerMuted(player.getUniqueId(), null) || (ChatPlugin.getInstance().serverMuted() && !player.hasPermission("chat.bypass-server-muted"))) {
-            GalaxyUtility.sendBlockedNotification(prefix,
+            GalaxyUtility.sendBlockedNotification(prefix, player, Utility.parseMiniMessage(Utility.stripTokens(message)), "");
-                    player,
-                    Utility.parseMiniMessage(Utility.stripTokens(message)),
-                    ""
-            );
             return true;
         }
         return false;

galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java

@@ -1,32 +1,52 @@
 package com.alttd.chat.listeners;
 
-import com.alttd.chat.chat_web.ChatMessageSender;
+import com.alttd.chat.ChatPlugin;
 import com.alttd.chat.config.Config;
 import com.alttd.chat.handler.ChatHandler;
+import com.alttd.chat.managers.ChatUserManager;
 import com.alttd.chat.managers.RegexManager;
-import com.alttd.chat.objects.ChatFilter;
+import com.alttd.chat.objects.*;
-import com.alttd.chat.objects.Toggleable;
+import com.alttd.chat.objects.chat_log.ChatLogHandler;
+import com.alttd.chat.util.ALogger;
+import com.alttd.chat.util.GalaxyUtility;
+import com.alttd.chat.util.ServerName;
 import com.alttd.chat.util.Utility;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
 import io.papermc.paper.event.player.AsyncChatCommandDecorateEvent;
 import io.papermc.paper.event.player.AsyncChatDecorateEvent;
 import io.papermc.paper.event.player.AsyncChatEvent;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.TextReplacementConfig;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.bukkit.Bukkit;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-@RequiredArgsConstructor
 public class ChatListener implements Listener {
 
     private final PlainTextComponentSerializer plainTextComponentSerializer = PlainTextComponentSerializer.plainText();
-    private final ChatMessageSender chatMessageSender;
+    private final ChatLogHandler chatLogHandler;
+
+    public ChatListener(ChatLogHandler chatLogHandler) {
+        this.chatLogHandler = chatLogHandler;
+    }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onChatCommandDecorate(AsyncChatCommandDecorateEvent event) {
@@ -35,14 +55,9 @@ public class ChatListener implements Listener {
         }
 
         Component formatComponent = Component.text("%message%");
-        ComponentLike message = parseMessageContent(event.player(),
+        ComponentLike message = parseMessageContent(event.player(), plainTextComponentSerializer.serialize(event.originalMessage()));
-                plainTextComponentSerializer.serialize(event.originalMessage())
-        );
 
-        event.result(formatComponent.replaceText(TextReplacementConfig.builder()
+        event.result(formatComponent.replaceText(TextReplacementConfig.builder().match("%message%").replacement(message).build()));
-                .match("%message%")
-                .replacement(message)
-                .build()));
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
@@ -52,16 +67,13 @@ public class ChatListener implements Listener {
         }
 
         Component formatComponent = Component.text("%message%");
-        ComponentLike message = parseMessageContent(event.player(),
+        ComponentLike message = parseMessageContent(event.player(), plainTextComponentSerializer.serialize(event.originalMessage()));
-                plainTextComponentSerializer.serialize(event.originalMessage())
-        );
 
-        event.result(formatComponent.replaceText(TextReplacementConfig.builder()
+        event.result(formatComponent.replaceText(TextReplacementConfig.builder().match("%message%").replacement(message).build()));
-                .match("%message%")
-                .replacement(message)
-                .build()));
     }
 
+    private final Component mention = MiniMessage.miniMessage().deserialize(Config.MENTIONPLAYERTAG);
+
     @EventHandler(ignoreCancelled = true)
     public void onPlayerChat(AsyncChatEvent event) {
         event.setCancelled(true); //Always cancel the event because we do not want to deal with Microsoft's stupid bans
@@ -70,7 +82,119 @@ public class ChatListener implements Listener {
             toggleable.sendMessage(event.getPlayer(), event.message());
             return;
         }
-        chatMessageSender.sendMessage(event.getPlayer(), event.message());
+        if (ChatPlugin.getInstance().serverMuted() && !event.getPlayer().hasPermission("chat.bypass-server-muted")) {
+            Player player = event.getPlayer();
+            GalaxyUtility.sendBlockedNotification("Chat Muted", player, event.message(), "");
+            return;
+        }
+
+        Player player = event.getPlayer();
+        UUID uuid = player.getUniqueId();
+
+        ComponentLike input = event.message().colorIfAbsent(NamedTextColor.WHITE);
+
+        ModifiableString modifiableString = new ModifiableString(input.asComponent());
+
+        // todo a better way for this
+        if (!RegexManager.filterText(player.getName(), uuid, modifiableString, true, "chat", filterType -> {
+            if (!filterType.equals(FilterType.PUNISH)) {
+                ALogger.warn("Received another FilterType than punish when filtering chat and executing a filter action");
+                return;
+            }
+            ByteArrayDataOutput out = ByteStreams.newDataOutput();
+            out.writeUTF("punish");
+            out.writeUTF(player.getName());
+            out.writeUTF(uuid.toString());
+            out.writeUTF(modifiableString.string());
+            player.sendPluginMessage(ChatPlugin.getInstance(), Config.MESSAGECHANNEL, out.toByteArray());
+        })) {
+            event.setCancelled(true);
+            GalaxyUtility.sendBlockedNotification("Language", player,
+                                                  modifiableString.component(),
+                                                  "");
+            chatLogHandler.addChatLog(uuid, ServerName.getServerName(), PlainTextComponentSerializer.plainText().serialize(input.asComponent()), true);
+            return; // the message was blocked
+        }
+
+        Stream<Player> stream = event.viewers().stream().filter(audience -> audience instanceof Player)
+                .map(audience -> (Player) audience);
+
+        if (!player.hasPermission("chat.ignorebypass")) {
+            stream = stream.filter(receiver -> !ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(uuid)
+                                               || receiver.hasPermission("chat.ignorebypass"));
+        }
+        Set<Player> receivers = stream.collect(Collectors.toSet());
+
+        Set<Player> playersToPing = new HashSet<>();
+        pingPlayers(playersToPing, modifiableString, player);
+
+        input = render(player, modifiableString.component());
+        for (Player receiver : receivers) {
+            receiver.sendMessage(input);
+        }
+        for (Player pingPlayer : playersToPing) {
+            pingPlayer.playSound(pingPlayer.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1, 1);
+        }
+        chatLogHandler.addChatLog(uuid, ServerName.getServerName(), modifiableString.string(), false);
+        ALogger.info(PlainTextComponentSerializer.plainText().serialize(input.asComponent()));
+    }
+
+    private void pingPlayers(Set<Player> playersToPing, ModifiableString modifiableString, Player player) {
+        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
+            String name = onlinePlayer.getName();
+            String nickName = PlainTextComponentSerializer.plainText().serialize(onlinePlayer.displayName());
+
+            Pattern namePattern = Pattern.compile("\\b(?<!\\\\)" + name + "\\b", Pattern.CASE_INSENSITIVE);
+            //            Pattern escapedNamePattern = Pattern.compile("\\b\\\\" + name + "\\b", Pattern.CASE_INSENSITIVE);
+            Pattern nickPattern = Pattern.compile("\\b(?<!\\\\)" + nickName + "\\b", Pattern.CASE_INSENSITIVE);
+            //            Pattern escapedNickPattern = Pattern.compile("\\b\\\\" + nickName + "\\b", Pattern.CASE_INSENSITIVE);
+
+            ChatUser onlinePlayerUser = ChatUserManager.getChatUser(onlinePlayer.getUniqueId());
+            if (namePattern.matcher(modifiableString.string()).find()) {
+                modifiableString.replace(TextReplacementConfig.builder()
+                                                 .once()
+                                                 .match(namePattern)
+                                                 .replacement(mention.append(onlinePlayerUser.getDisplayName()))
+                                                 .build());
+                //TODO replace all instances of \name with just name but using the match result so the capitalization doesn't change
+                //                modifiableString.replace(TextReplacementConfig.builder()
+                //                        .once()
+                //                        .match(escapedNamePattern)
+                //                        .replacement((a, b) -> {
+                //                            String substring = a.group().substring(1);
+                //                            return ;
+                //                        });
+
+                if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId())
+                    || player.hasPermission("chat.ignorebypass")) {
+                    playersToPing.add(onlinePlayer);
+                }
+            } else if (nickPattern.matcher(modifiableString.string()).find()) {
+                modifiableString.replace(TextReplacementConfig.builder()
+                                                 .once()
+                                                 .match(nickPattern)
+                                                 .replacement(mention.append(onlinePlayerUser.getDisplayName()))
+                                                 .build());
+                if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId())
+                    || player.hasPermission("chat.ignorebypass")) {
+                    playersToPing.add(onlinePlayer);
+                }
+            }
+        }
+    }
+
+    public @NotNull ComponentLike render(@NotNull Player player, @NotNull Component message) {
+        ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
+        TagResolver placeholders = TagResolver.resolver(
+                Placeholder.component("sender", user.getDisplayName()),
+                Placeholder.parsed("sendername", player.getName()),
+                Placeholder.component("prefix", user.getPrefix()),
+                Placeholder.component("prefixall", user.getPrefixAll()),
+                Placeholder.component("staffprefix", user.getStaffPrefix()),
+                Placeholder.component("message", message)
+                                                       );
+
+        return Utility.parseMiniMessage(Config.CHATFORMAT, placeholders);
     }
 
     private ComponentLike parseMessageContent(Player player, String rawMessage) {

galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java

@@ -10,8 +10,6 @@ import com.alttd.chat.objects.Party;
 import com.alttd.chat.objects.PartyUser;
 import com.alttd.chat.objects.channels.Channel;
 import com.alttd.chat.objects.channels.CustomChannel;
-import com.alttd.chat.objects.chat_log.ChatLogHandler;
-import com.alttd.chat.objects.chat_log.ChatLogType;
 import com.alttd.chat.util.ALogger;
 import com.alttd.chat.util.ServerName;
 import com.alttd.chat.util.Utility;
@@ -20,7 +18,6 @@ import com.google.common.io.ByteStreams;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -32,12 +29,6 @@ import java.util.UUID;
 
 public class PluginMessage implements PluginMessageListener {
 
-    private final ChatLogHandler chatLogHandler;
-
-    public PluginMessage(ChatLogHandler chatLogHandler) {
-        this.chatLogHandler = chatLogHandler;
-    }
-
     @Override
     public void onPluginMessageReceived(String channel, @NotNull Player ignored, byte[] bytes) {
         if (!channel.equals(Config.MESSAGECHANNEL)) {
@@ -57,25 +48,13 @@ public class PluginMessage implements PluginMessageListener {
                 }
                 ChatUser chatUser = ChatUserManager.getChatUser(uuid);
                 if (isTargetNotIgnored(chatUser, targetuuid)) {
-                    Component component = GsonComponentSerializer.gson().deserialize(message);
+                    player.sendMessage(GsonComponentSerializer.gson().deserialize(message));
-                    player.sendMessage(component);
                     player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1,
-                            1
+                                     1); // todo load this from config
-                    ); // todo load this from config
                     ChatUser user = ChatUserManager.getChatUser(uuid);
                     if (!user.getReplyContinueTarget().equalsIgnoreCase(target)) {
                         user.setReplyTarget(target);
                     }
-                    // Handled here since this is after the ignore check and is only send once
-                    chatLogHandler.addChatLog(uuid,
-                            ServerName.getServerName(),
-                            PlainTextComponentSerializer.plainText().serialize(component),
-                            ChatLogType.MSG,
-                            null,
-                            player.getUniqueId().toString(),
-                            component,
-                            false
-                    );
                 }
             }
             case "privatemessageout" -> {
@@ -90,18 +69,9 @@ public class PluginMessage implements PluginMessageListener {
                 ChatUser chatUser = ChatUserManager.getChatUser(uuid);
                 if (isTargetNotIgnored(chatUser, targetuuid)) {
                     chatUser.setReplyTarget(target);
-                    Component component = GsonComponentSerializer.gson().deserialize(message);
+                    player.sendMessage(GsonComponentSerializer.gson().deserialize(message));
-                    player.sendMessage(component);
+                    //                        ChatUser user = ChatUserManager.getChatUser(uuid);
-                    // Handled here since this is after the ignore check and is only send once
+                    //                        user.setReplyTarget(target);
-                    chatLogHandler.addChatLog(uuid,
-                            ServerName.getServerName(),
-                            PlainTextComponentSerializer.plainText().serialize(component),
-                            ChatLogType.MSG,
-                            null,
-                            player.getUniqueId().toString(),
-                            component,
-                            false
-                    );
                 }
             }
             case "globalchat" -> {
@@ -112,11 +82,10 @@ public class PluginMessage implements PluginMessageListener {
                 UUID uuid = UUID.fromString(in.readUTF());
                 String message = in.readUTF();
 
-                Component component = GsonComponentSerializer.gson().deserialize(message);
                 Bukkit.getOnlinePlayers().stream().filter(p -> p.hasPermission(Config.GCPERMISSION)).forEach(p -> {
                     ChatUser chatUser = ChatUserManager.getChatUser(p.getUniqueId());
                     if (isTargetNotIgnored(chatUser, uuid)) {
-                        p.sendMessage(component);
+                        p.sendMessage(GsonComponentSerializer.gson().deserialize(message));
                     }
                 });
             }
@@ -138,7 +107,6 @@ public class PluginMessage implements PluginMessageListener {
                 }
 
                 chatChannel(in);
-                //TODO [Stijn] [2026-07-19]: handle custom channels
             }
             case "tmppartyupdate" -> {
                 int id = Integer.parseInt(in.readUTF());

galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java

@@ -119,7 +119,8 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
         switch (subChannel) {
             case "NickNameRequest":
                 ComponentLike component = miniMessage.deserialize(Config.NICK_REQUEST_NEW, Placeholder.parsed("player", name))
-                        .clickEvent(ClickEvent.runCommand("/nick review"))
+                        .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND,
+                                                          "/nick review"))
                         .hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT,
                                                           miniMessage.deserialize("<gold>Click this text to review the request!")));
 

galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java

@@ -6,7 +6,6 @@ import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
@@ -14,14 +13,13 @@ import java.util.List;
 
 public class GalaxyUtility {
 
-    public static void sendBlockedNotification(String prefix, OfflinePlayer offlinePlayer, ComponentLike input, String target) {
+    public static void sendBlockedNotification(String prefix, Player player, ComponentLike input, String target) {
-        String playerName = offlinePlayer.getName() == null ? "unknown_player" : offlinePlayer.getName();
         TagResolver placeholders = TagResolver.resolver(
                 Placeholder.parsed("prefix", prefix),
-                Placeholder.parsed("displayname", Utility.getDisplayName(offlinePlayer.getUniqueId(), playerName)),
+                Placeholder.parsed("displayname", Utility.getDisplayName(player.getUniqueId(), player.getName())),
                 Placeholder.parsed("target", (target.isEmpty() ? "tried to say:" : "-> " + target + ":")),
                 Placeholder.component("input", input)
-        );
+                                                       );
         ComponentLike blockedNotification = Utility.parseMiniMessage(Config.NOTIFICATIONFORMAT, placeholders);
 
         Bukkit.getOnlinePlayers().forEach(a -> {
@@ -29,15 +27,8 @@ public class GalaxyUtility {
                 a.sendMessage(blockedNotification);
             }
         });
-        if (offlinePlayer.isOnline()) {
+        player.sendRichMessage("<red>The language you used in your message is not allowed, " +
-            Player player = offlinePlayer.getPlayer();
+                               "this constitutes as your only warning. Any further attempts at bypassing the filter will result in staff intervention.</red>");
-            if (player == null) {
-                ALogger.error("Player is offline but isOnline() returned true");
-                return;
-            }
-            player.sendRichMessage("<red>The language you used in your message is not allowed, " +
-                                   "this constitutes as your only warning. Any further attempts at bypassing the filter will result in staff intervention.</red>");
-        }
     }
 
     public static void addAdditionalChatCompletions(Player player) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +112,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +170,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,14 +203,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -59,21 +57,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

@@ -19,19 +19,13 @@ dependencyResolutionManagement {
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // Papi
         maven("https://jitpack.io")
         maven {
+            name = "nexus"
             url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
             credentials {
                 username = nexusUser
                 password = nexusPass
             }
         }
-        maven {
-            url = uri("https://repo.alttd.com/repository/alttd/")
-            credentials {
-                username = nexusUser
-                password = nexusPass
-            }
-        }
     }
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 }
@@ -41,5 +35,3 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-
-include("web-api")

velocity/build.gradle.kts

@@ -1,12 +1,10 @@
 plugins {
     `maven-publish`
-    id("com.gradleup.shadow")
+    id("io.github.goooler.shadow")
 }
 
 dependencies {
     implementation(project(":api")) // API
-    compileOnly("org.projectlombok:lombok:1.18.46")
-    annotationProcessor("org.projectlombok:lombok:1.18.46")
     compileOnly("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
     annotationProcessor("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
     implementation("mysql:mysql-connector-java:8.0.33") // mysql

velocity/src/main/java/com/alttd/velocitychat/VelocityChat.java

@@ -2,20 +2,20 @@ package com.alttd.velocitychat;
 
 import com.alttd.chat.ChatAPI;
 import com.alttd.chat.ChatImplementation;
-import com.alttd.chat.config.Config;
-import com.alttd.chat.database.DatabaseConnection;
 import com.alttd.chat.managers.ChatUserManager;
 import com.alttd.chat.managers.PartyManager;
 import com.alttd.chat.objects.ChatUser;
 import com.alttd.chat.objects.chat_log.ChatLogHandler;
-import com.alttd.chat.util.ALogger;
 import com.alttd.velocitychat.commands.*;
+import com.alttd.chat.config.Config;
+import com.alttd.chat.database.DatabaseConnection;
 import com.alttd.velocitychat.handlers.ChatHandler;
 import com.alttd.velocitychat.handlers.ServerHandler;
 import com.alttd.velocitychat.listeners.ChatListener;
 import com.alttd.velocitychat.listeners.LiteBansListener;
-import com.alttd.velocitychat.listeners.PluginMessageListener;
 import com.alttd.velocitychat.listeners.ProxyPlayerListener;
+import com.alttd.velocitychat.listeners.PluginMessageListener;
+import com.alttd.chat.util.ALogger;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import com.google.inject.Inject;
@@ -36,7 +36,7 @@ import java.nio.file.Path;
         description = "A chat plugin for Altitude Minecraft Server",
         authors = {"destro174", "teri"},
         dependencies = {@Dependency(id = "luckperms"), @Dependency(id = "litebans"), @Dependency(id = "proxydiscordlink")}
-)
+        )
 public class VelocityChat {
 
     private static VelocityChat plugin;
@@ -67,8 +67,7 @@ public class VelocityChat {
         PartyManager.initialize(); // load the parties from the db and add the previously loaded users to them
 
         serverHandler = new ServerHandler();
-        ChatLogHandler chatLogHandler = new ChatLogHandler(true);
+        chatHandler = new ChatHandler();
-        chatHandler = new ChatHandler(chatLogHandler);
         server.getEventManager().register(this, new ChatListener());
         server.getEventManager().register(this, new ProxyPlayerListener());
         new LiteBansListener().init(); // init the litebans api listeners
@@ -90,11 +89,7 @@ public class VelocityChat {
         ByteArrayDataOutput buf = ByteStreams.newDataOutput();
         buf.writeUTF("reloadconfig");
         ALogger.info("Reloaded ChatPlugin proxy config.");
-        getProxy().getAllServers()
+        getProxy().getAllServers().stream().forEach(registeredServer -> registeredServer.sendPluginMessage(getChannelIdentifier(), buf.toByteArray()));
-                .stream()
-                .forEach(registeredServer -> registeredServer.sendPluginMessage(getChannelIdentifier(),
-                        buf.toByteArray()
-                ));
     }
 
     public File getDataDirectory() {

velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java

@@ -6,8 +6,6 @@ import com.alttd.chat.managers.ChatUserManager;
 import com.alttd.chat.managers.PartyManager;
 import com.alttd.chat.managers.RegexManager;
 import com.alttd.chat.objects.*;
-import com.alttd.chat.objects.chat_log.ChatLogHandler;
-import com.alttd.chat.objects.chat_log.ChatLogType;
 import com.alttd.chat.util.ALogger;
 import com.alttd.chat.util.Utility;
 import com.alttd.velocitychat.VelocityChat;
@@ -34,12 +32,6 @@ import java.util.UUID;
 
 public class ChatHandler {
 
-    private final ChatLogHandler chatLogHandler;
-
-    public ChatHandler(ChatLogHandler chatLogHandler) {
-        this.chatLogHandler = chatLogHandler;
-    }
-
     public void privateMessage(String sender, String target, String message) {
         UUID uuid = UUID.fromString(sender);
         ChatUser senderUser = ChatUserManager.getChatUser(uuid);
@@ -62,23 +54,15 @@ public class ChatHandler {
                 Placeholder.component("receiver", targetUser.getDisplayName()),
                 Placeholder.unparsed("receivername", player2.getUsername()),
                 Placeholder.component("message", GsonComponentSerializer.gson().deserialize(message)),
-                Placeholder.unparsed("server",
+                Placeholder.unparsed("server", player.getCurrentServer().isPresent() ? player.getCurrentServer().get().getServerInfo().getName() : "Altitude"));
-                        player.getCurrentServer().isPresent() ? player.getCurrentServer()
-                                .get()
-                                .getServerInfo()
-                                .getName() : "Altitude"
-                )
-        );
 
         ServerConnection serverConnection;
-        //Log handled on receiving server since it is only received on one server and that's where the ignore check happens
         if (player.getCurrentServer().isPresent() && player2.getCurrentServer().isPresent()) {
             // redirect to the sender
             serverConnection = player.getCurrentServer().get();
             Component component = Utility.parseMiniMessage(Config.MESSAGESENDER
-                    .replaceAll("<sendername>", player.getUsername())
+                                                                   .replaceAll("<sendername>", player.getUsername())
-                    .replaceAll("<receivername>", player2.getUsername()), Placeholders
+                                                                   .replaceAll("<receivername>", player2.getUsername()), Placeholders).asComponent();
-            ).asComponent();
             ByteArrayDataOutput buf = ByteStreams.newDataOutput();
             buf.writeUTF("privatemessageout");
             buf.writeUTF(player.getUniqueId().toString());
@@ -90,9 +74,8 @@ public class ChatHandler {
             //redirect to the receiver
             serverConnection = player2.getCurrentServer().get();
             component = Utility.parseMiniMessage(Config.MESSAGERECIEVER
-                    .replaceAll("<sendername>", player.getUsername())
+                                                         .replaceAll("<sendername>", player.getUsername())
-                    .replaceAll("<receivername>", player2.getUsername()), Placeholders
+                                                         .replaceAll("<receivername>", player2.getUsername()), Placeholders).asComponent();
-            ).asComponent();
             buf = ByteStreams.newDataOutput();
             buf.writeUTF("privatemessagein");
             buf.writeUTF(player2.getUniqueId().toString());
@@ -110,7 +93,7 @@ public class ChatHandler {
                 Placeholder.parsed("displayname", Utility.getDisplayName(player.getUniqueId(), player.getUsername())),
                 Placeholder.unparsed("target", (target.isEmpty() ? " tried to say: " : " -> " + target + ": ")),
                 Placeholder.unparsed("input", input)
-        );
+                                                       );
         ComponentLike blockedNotification = Utility.parseMiniMessage(Config.NOTIFICATIONFORMAT, Placeholders);
 
         serverConnection.getServer().getPlayersConnected().forEach(pl -> {
@@ -151,15 +134,15 @@ public class ChatHandler {
         }
         ComponentLike senderName = user.getDisplayName();
 
-        TagResolver placeholders = TagResolver.resolver(
+        TagResolver Placeholders = TagResolver.resolver(
                 Placeholder.component("sender", senderName),
                 Placeholder.component("sendername", senderName),
                 Placeholder.unparsed("partyname", party.getPartyName()),
                 Placeholder.component("message", parseMessageContent(player, message)),
                 Placeholder.unparsed("server", serverConnection.getServer().getServerInfo().getName())
-        );
+                                                       );
 
-        Component partyMessage = Utility.parseMiniMessage(Config.PARTY_FORMAT, placeholders).asComponent()
+        Component partyMessage = Utility.parseMiniMessage(Config.PARTY_FORMAT, Placeholders).asComponent()
                 .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(item).build());
 
         ModifiableString modifiableString = new ModifiableString(partyMessage);
@@ -172,17 +155,7 @@ public class ChatHandler {
 
         sendPartyMessage(party, partyMessage, user.getIgnoredBy());
 
-        chatLogHandler.addChatLog(uuid,
+        ComponentLike spyMessage = Utility.parseMiniMessage(Config.PARTY_SPY, Placeholders);
-                serverConnection.getServer().getServerInfo().getName(),
-                PlainTextComponentSerializer.plainText().serialize(partyMessage),
-                ChatLogType.PARTY,
-                String.valueOf(party.getPartyId()),
-                null,
-                partyMessage,
-                false
-        );
-
-        ComponentLike spyMessage = Utility.parseMiniMessage(Config.PARTY_SPY, placeholders);
         for (Player pl : serverConnection.getServer().getPlayersConnected()) {
             if (pl.hasPermission(Config.SPYPERMISSION) && !party.getPartyUsersUuid().contains(pl.getUniqueId())) {
                 pl.sendMessage(spyMessage);
@@ -198,17 +171,6 @@ public class ChatHandler {
                 .stream()
                 .filter(target -> target.hasPermission("command.chat.globaladminchat"))
                 .forEach(target -> target.sendMessage(component));
-
-        chatLogHandler.addChatLog(
-                new UUID(0, 0), //No origin uuid for GAC
-                "GAC", //No server for GAC
-                PlainTextComponentSerializer.plainText().serialize(component),
-                ChatLogType.GAC,
-                null,
-                null,
-                component,
-                false
-        );
     }
 
     public void globalAdminChat(CommandSource commandSource, String message) {
@@ -220,17 +182,13 @@ public class ChatHandler {
                 return;
             }
             senderName = user.getDisplayName();
-            serverName = sender.getCurrentServer().isPresent() ? sender.getCurrentServer()
+            serverName = sender.getCurrentServer().isPresent() ? sender.getCurrentServer().get().getServerInfo().getName() : "Altitude";
-                    .get()
-                    .getServerInfo()
-                    .getName() : "Altitude";
         }
 
         TagResolver Placeholders = TagResolver.resolver(
                 Placeholder.component("message", parseMessageContent(commandSource, message)),
                 Placeholder.component("sender", senderName),
-                Placeholder.unparsed("server", serverName)
+                Placeholder.unparsed("server", serverName));
-        );
 
         ComponentLike component = Utility.parseMiniMessage(Config.GACFORMAT, Placeholders);
 
@@ -252,8 +210,7 @@ public class ChatHandler {
         if (optionalPlayer.isEmpty()) {
             targetUUID = ServerHandler.getPlayerUUID(recipient);
             if (targetUUID == null) {
-                commandSource.sendMessage(Utility.parseMiniMessage(
+                commandSource.sendMessage(Utility.parseMiniMessage("<red>A player with this name hasn't logged in recently.")); // TOOD load from config
-                        "<red>A player with this name hasn't logged in recently.")); // TOOD load from config
                 return;
             }
         } else {
@@ -317,10 +274,8 @@ public class ChatHandler {
                     Placeholder.component("sender", chatUser.getDisplayName()),
                     Placeholder.component("message", Utility.parseMiniMessage(mail.getMessage())),
                     Placeholder.unparsed("date", date.toString()),
-                    Placeholder.unparsed("time_ago",
+                    Placeholder.unparsed("time_ago", getTimeAgo(Duration.between(date.toInstant(), new Date().toInstant())))
-                            getTimeAgo(Duration.between(date.toInstant(), new Date().toInstant()))
+                                                           );
-                    )
-            );
             ComponentLike mailMessage = Utility.parseMiniMessage(Config.mailBody, Placeholders);
             component = component.append(Component.newline()).append(mailMessage);
         }

web-api/build.gradle.kts

@@ -1,66 +0,0 @@
-plugins {
-    java
-    id("org.openapi.generator") version "7.12.0"
-}
-
-group = "com.alttd.chat"
-version = "2.0.0-SNAPSHOT"
-
-dependencies {
-    implementation("io.swagger.core.v3:swagger-annotations:2.2.28")
-
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
-
-    implementation("com.google.code.gson:gson:2.12.1")
-    implementation("io.gsonfire:gson-fire:1.9.0")
-
-    implementation("javax.annotation:javax.annotation-api:1.3.2")
-    implementation("jakarta.annotation:jakarta.annotation-api:2.1.1")
-}
-
-sourceSets {
-    main {
-        java {
-            srcDir("${projectDir}/build/generated-sources/client/src/main/java")
-        }
-    }
-}
-
-tasks.named<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openApiGenerate") {
-    generatorName.set("java")
-    inputSpec.set("${projectDir}/src/main/resources/chat-api.yml")
-    configFile.set("${projectDir}/src/main/resources/config_backend.json")
-    outputDir.set("${projectDir}/build/generated-sources/client")
-
-    apiPackage.set("com.alttd.altitudeweb.api")
-    modelPackage.set("com.alttd.altitudeweb.model")
-
-    modelNameSuffix.set("Dto")
-
-    additionalProperties.set(
-        mapOf(
-            "dateLibrary" to "java8",
-            "library" to "okhttp-gson"
-        )
-    )
-
-    generateApiTests.set(false)
-    generateApiDocumentation.set(false)
-    generateModelTests.set(false)
-    generateModelDocumentation.set(false)
-
-    generateAliasAsModel.set(true)
-}
-
-sourceSets {
-    main {
-        java {
-            srcDir(layout.buildDirectory.dir("generated/openapi/src/main/java"))
-        }
-    }
-}
-
-tasks.compileJava {
-    dependsOn("openApiGenerate")
-}

web-api/src/main/resources/chat-api.yml

@@ -1,144 +0,0 @@
-openapi: 3.0.3
-
-info:
-  title: Minecraft Network API
-  version: 1.0.0
-
-servers:
-  - url: http://localhost:8080/api
-
-tags:
-  - name: chat
-    description: Data for displaying Chat messages to clients
-
-paths:
-  /chat/send/chat/message:
-    post:
-      tags:
-        - chat
-      summary: Sends one or more chat messages
-      operationId: sendChatMessages
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: array
-              items:
-                $ref: "#/components/schemas/ChatMessage"
-      responses:
-        "202":
-          description: Accepted
-
-  /chat/send/servers/state:
-    post:
-      tags:
-        - chat
-      summary: Update server states
-      operationId: updateServerStates
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/ServerState"
-      responses:
-        "202":
-          description: Accepted
-
-components:
-  schemas:
-    User:
-      type: object
-      required:
-        - uuid
-        - name
-        - styledName
-      # TODO [Stijn] [2026-07-19]: Add who they ignore and who they are ignored by
-
-      properties:
-        uuid:
-          type: string
-          format: uuid
-        name:
-          type: string
-        styledName:
-          type: string
-
-    ChatMessage:
-      type: object
-      required:
-        - uuid
-        - message
-        - server
-        - type
-        - timestamp
-        - blocked
-      properties:
-        uuid:
-          type: string
-          format: uuid
-        message:
-          type: string
-        server:
-          type: string
-        type:
-          type: string
-          enum:
-            - PUBLIC
-            - GLOBAL
-            - PARTY
-            - GAC
-            - MSG
-            - CUSTOM
-        channel:
-          type: string
-          maxLength: 36
-        receiver:
-          type: string
-          maxLength: 36
-        timestamp:
-          type: string
-          format: date-time
-        blocked:
-          type: boolean
-
-    PrivateMessage:
-      type: object
-      required:
-        - sender
-        - receiver
-        - message
-        - senderServer
-        - receiverServer
-      properties:
-        sender:
-          type: string
-          format: uuid
-        receiver:
-          type: string
-          format: uuid
-        message:
-          type: string
-        senderServer:
-          type: string
-        receiverServer:
-          type: string
-
-    Server:
-      type: object
-      properties:
-        name:
-          type: string
-        players:
-          type: array
-          items:
-            $ref: "#/components/schemas/User"
-
-    ServerState:
-      type: object
-      properties:
-        servers:
-          type: array
-          items:
-            $ref: "#/components/schemas/Server"

web-api/src/main/resources/config_backend.json

@@ -1,22 +0,0 @@
-{
-  "library": "okhttp-gson",
-  "hideGenerationTimestamp": true,
-  "modelPackage": "com.alttd.altitudeweb.model",
-  "apiPackage": "com.alttd.altitudeweb.api",
-  "invokerPackage": "com.alttd.altitudeweb.invoker",
-  "serializableModel": true,
-  "openApiNullable": false,
-  "useTags": true,
-  "generateApis": true,
-  "generateApiTests": false,
-  "generateApiDocumentation": false,
-  "generateModels": true,
-  "generateModelTests": false,
-  "generateSupportingFiles": true,
-  "modelNameSuffix": "Dto",
-  "generateTests": false,
-  "dateLibrary": "java8",
-  "enumUnknownDefaultCase": true,
-  "disallowAdditionalPropertiesIfNotPresent": false,
-  "useJakartaEe": true
-}