diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..054c627 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ + * text=auto eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/api/pom.xml b/api/pom.xml old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/ChatAPI.java b/api/src/main/java/com/alttd/chat/ChatAPI.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/ChatImplementation.java b/api/src/main/java/com/alttd/chat/ChatImplementation.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/config/RegexConfig.java b/api/src/main/java/com/alttd/chat/config/RegexConfig.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/database/Queries.java b/api/src/main/java/com/alttd/chat/database/Queries.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java old mode 100644 new mode 100755 index 3587b80..02bceea --- a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java +++ b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java @@ -1,13 +1,11 @@ package com.alttd.chat.managers; -import com.alttd.chat.database.Queries; import com.alttd.chat.objects.ChatUser; import com.alttd.chat.objects.Mail; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; public final class ChatUserManager { diff --git a/api/src/main/java/com/alttd/chat/managers/RegexManager.java b/api/src/main/java/com/alttd/chat/managers/RegexManager.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/objects/ChatFilter.java b/api/src/main/java/com/alttd/chat/objects/ChatFilter.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/objects/ChatUser.java b/api/src/main/java/com/alttd/chat/objects/ChatUser.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/objects/FilterType.java b/api/src/main/java/com/alttd/chat/objects/FilterType.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/objects/Mail.java b/api/src/main/java/com/alttd/chat/objects/Mail.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/objects/Party.java b/api/src/main/java/com/alttd/chat/objects/Party.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/util/ALogger.java b/api/src/main/java/com/alttd/chat/util/ALogger.java old mode 100644 new mode 100755 diff --git a/api/src/main/java/com/alttd/chat/util/Utility.java b/api/src/main/java/com/alttd/chat/util/Utility.java old mode 100644 new mode 100755 diff --git a/galaxy/pom.xml b/galaxy/pom.xml old mode 100644 new mode 100755 diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java old mode 100644 new mode 100755 diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java old mode 100644 new mode 100755 diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java old mode 100644 new mode 100755 index 6867d60..9df0f45 --- a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java @@ -1,11 +1,16 @@ package com.alttd.chat.listeners; import com.alttd.chat.managers.ChatUserManager; +import com.alttd.chat.managers.RegexManager; import com.alttd.chat.objects.ChatUser; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.player.PlayerJoinEvent; +import java.util.List; import java.util.UUID; public class PlayerListener implements Listener { @@ -21,5 +26,20 @@ public class PlayerListener implements Listener { } + @EventHandler(ignoreCancelled = true) // untested + public void onSignChangeE(SignChangeEvent event) { + for (int i = 0; i < 4; i++) { + Component component = event.line(i); + if (component != null) { + String message = PlainComponentSerializer.plain().serialize(component); + + message = RegexManager.replaceText(message); // todo a better way for this + + component = message == null ? Component.empty() : Component.text(message); + + event.line(i, component); + } + } + } } diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java b/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java old mode 100644 new mode 100755 diff --git a/galaxy/src/main/resources/plugin.yml b/galaxy/src/main/resources/plugin.yml old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 diff --git a/velocity/pom.xml b/velocity/pom.xml old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/VelocityChat.java b/velocity/src/main/java/com/alttd/chat/VelocityChat.java old mode 100644 new mode 100755 index 741c8a1..9a0e684 --- a/velocity/src/main/java/com/alttd/chat/VelocityChat.java +++ b/velocity/src/main/java/com/alttd/chat/VelocityChat.java @@ -1,7 +1,6 @@ package com.alttd.chat; import com.alttd.chat.commands.GlobalAdminChat; -import com.alttd.chat.commands.GlobalChat; import com.alttd.chat.config.Config; import com.alttd.chat.handlers.ChatHandler; import com.alttd.chat.handlers.ServerHandler; @@ -84,7 +83,6 @@ public class VelocityChat { public void loadCommands() { new GlobalAdminChat(server); - new GlobalChat(server); // all (proxy)commands go here } diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java old mode 100644 new mode 100755 index f234d7a..544cbbe --- a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java +++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java @@ -1,7 +1,6 @@ package com.alttd.chat.commands; import com.alttd.chat.VelocityChat; -import com.alttd.chat.events.GlobalAdminChatEvent; import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; @@ -10,7 +9,6 @@ import com.mojang.brigadier.tree.LiteralCommandNode; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; public class GlobalAdminChat { diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java deleted file mode 100644 index 45c6963..0000000 --- a/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.alttd.chat.commands; - -import com.alttd.chat.VelocityChat; -import com.alttd.chat.config.Config; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.builder.RequiredArgumentBuilder; -import com.mojang.brigadier.tree.LiteralCommandNode; -import com.velocitypowered.api.command.BrigadierCommand; -import com.velocitypowered.api.command.CommandMeta; -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.proxy.Player; -import com.velocitypowered.api.proxy.ProxyServer; - -public class GlobalChat { - - public GlobalChat(ProxyServer proxyServer) { -// LiteralCommandNode command = LiteralArgumentBuilder -// .literal("globalchat") -// .requires(ctx -> ctx.hasPermission("command.proxy.globalchat"))// TODO permission system? load permissions from config? -// .requires(ctx -> ctx instanceof Player) // players only can use this -// .then(RequiredArgumentBuilder -// .argument("message", StringArgumentType.greedyString()) -// .executes(context -> { -// VelocityChat.getPlugin().getChatHandler().globalChat((Player) context.getSource(), context.getArgument("message", String.class)); -// return 1; -// }) -// ) -// .executes(context -> 0) // todo info message /usage -// .build(); -// -// BrigadierCommand brigadierCommand = new BrigadierCommand(command); -// -// CommandMeta.Builder metaBuilder = proxyServer.getCommandManager().metaBuilder(brigadierCommand); -// -// for (String alias : Config.GCALIAS) { -// metaBuilder.aliases(alias); -// } -// CommandMeta meta = metaBuilder.build(); -// -// proxyServer.getCommandManager().register(meta, brigadierCommand); - } -} diff --git a/velocity/src/main/java/com/alttd/chat/commands/Message.java b/velocity/src/main/java/com/alttd/chat/commands/Message.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/commands/SendMail.java b/velocity/src/main/java/com/alttd/chat/commands/SendMail.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java b/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java b/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java b/velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/events/PrivateMessageEvent.java b/velocity/src/main/java/com/alttd/chat/events/PrivateMessageEvent.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java b/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java old mode 100644 new mode 100755 diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java old mode 100644 new mode 100755