From 4124315bd78a67901a437d74639ea5d064defd24 Mon Sep 17 00:00:00 2001 From: len <40720638+destro174@users.noreply.github.com> Date: Thu, 20 May 2021 18:45:26 +0200 Subject: [PATCH] move regexmanager to api --- api/src/main/java/com/alttd/chat/ChatImplementation.java | 2 ++ .../src/main/java/com/alttd/chat/managers/RegexManager.java | 5 ++--- .../com/alttd/chat/objects/{Regex.java => ChatFilter.java} | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) rename velocity/src/main/java/com/alttd/chat/util/Regex.java => api/src/main/java/com/alttd/chat/managers/RegexManager.java (96%) rename api/src/main/java/com/alttd/chat/objects/{Regex.java => ChatFilter.java} (76%) diff --git a/api/src/main/java/com/alttd/chat/ChatImplementation.java b/api/src/main/java/com/alttd/chat/ChatImplementation.java index 9cd371d..af4afe8 100644 --- a/api/src/main/java/com/alttd/chat/ChatImplementation.java +++ b/api/src/main/java/com/alttd/chat/ChatImplementation.java @@ -3,6 +3,7 @@ package com.alttd.chat; import com.alttd.chat.config.Config; import com.alttd.chat.database.DatabaseConnection; import com.alttd.chat.managers.ChatUserManager; +import com.alttd.chat.managers.RegexManager; import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.model.group.Group; @@ -27,6 +28,7 @@ public class ChatImplementation implements ChatAPI{ databaseConnection = getDataBase(); ChatUserManager.initialize(); // loads all the users from the db and adds them. + RegexManager.initRegex(); // load the filters and regexes from config } public static ChatAPI get() { diff --git a/velocity/src/main/java/com/alttd/chat/util/Regex.java b/api/src/main/java/com/alttd/chat/managers/RegexManager.java similarity index 96% rename from velocity/src/main/java/com/alttd/chat/util/Regex.java rename to api/src/main/java/com/alttd/chat/managers/RegexManager.java index 7115b16..9132b0f 100644 --- a/velocity/src/main/java/com/alttd/chat/util/Regex.java +++ b/api/src/main/java/com/alttd/chat/managers/RegexManager.java @@ -1,8 +1,7 @@ -package com.alttd.chat.util; +package com.alttd.chat.managers; import com.alttd.chat.config.Config; import com.alttd.chat.config.RegexConfig; -import com.alttd.chat.config.ServerConfig; import com.alttd.chat.objects.RegexType; import com.google.common.collect.Lists; import ninja.leaping.configurate.ConfigurationNode; @@ -13,7 +12,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class Regex { +public class RegexManager { // todo move this to API! private static final HashMap> cancelRegex = new HashMap<>(); diff --git a/api/src/main/java/com/alttd/chat/objects/Regex.java b/api/src/main/java/com/alttd/chat/objects/ChatFilter.java similarity index 76% rename from api/src/main/java/com/alttd/chat/objects/Regex.java rename to api/src/main/java/com/alttd/chat/objects/ChatFilter.java index e968c8d..7f1c4a6 100644 --- a/api/src/main/java/com/alttd/chat/objects/Regex.java +++ b/api/src/main/java/com/alttd/chat/objects/ChatFilter.java @@ -1,17 +1,17 @@ package com.alttd.chat.objects; -public class Regex { +public class ChatFilter { private final String regex; private final RegexType type; private String replacement = ""; - public Regex(String regex, RegexType type) { + public ChatFilter(String regex, RegexType type) { this.regex = regex; this.type = type; } - public Regex(String regex, RegexType type, String replacement) { + public ChatFilter(String regex, RegexType type, String replacement) { this.regex = regex; this.type = type; this.replacement = replacement;