From 4aa4726a4ec09febc17bad4475deec4c5fc112ff Mon Sep 17 00:00:00 2001 From: len <40720638+destro174@users.noreply.github.com> Date: Thu, 13 May 2021 14:11:29 +0200 Subject: [PATCH] Add plugin --- api/src/main/java/com/alttd/chat/ChatAPI.java | 13 +++- .../com/alttd/chat/ChatImplementation.java | 47 +++++++++++-- .../java/com/alttd/chat/config/Config.java | 10 +-- .../chat/database/DatabaseConnection.java | 2 +- .../java/com/alttd/chat/database/Queries.java | 10 +-- .../com/alttd/chat/objects/ChatPlayer.java | 2 +- .../java/com/alttd/chat/objects/Party.java | 4 +- .../com/alttd/chat/objects/PartyUser.java | 4 +- .../java/com/alttd/chat/objects/Regex.java | 2 +- .../com/alttd/chat/objects/RegexType.java | 2 +- galaxy/dependency-reduced-pom.xml | 69 +++++++++++++++++++ galaxy/pom.xml | 31 +++++++++ .../main/java/com/alttd/chat/ChatPlugin.java | 52 ++++++++++++++ .../com/alttd/chat/commands/GlobalChat.java | 18 +++++ .../com/alttd/chat/handler/ChatHandler.java | 49 +++++++++++++ .../alttd/chat/listeners/PlayerListener.java | 15 ++++ galaxy/src/main/resources/plugin.yml | 11 +++ .../{ChatPlugin.java => VelocityChat.java} | 31 ++++++--- .../alttd/chat/api/GlobalAdminChatEvent.java | 2 +- .../alttd/chat/api/PrivateMessageEvent.java | 2 +- .../alttd/chat/commands/GlobalAdminChat.java | 4 +- .../com/alttd/chat/commands/GlobalChat.java | 11 +-- .../alttd/chat/commands/GlobalChatToggle.java | 4 +- .../java/com/alttd/chat/commands/Message.java | 6 +- .../com/alttd/chat/config/ServerConfig.java | 3 +- .../com/alttd/chat/handlers/ChatHandler.java | 7 +- .../alttd/chat/listeners/ChatListener.java | 8 +-- .../alttd/chat/listeners/PlayerListener.java | 8 +-- .../main/java/com/alttd/chat/util/Regex.java | 2 +- 29 files changed, 363 insertions(+), 66 deletions(-) create mode 100644 galaxy/dependency-reduced-pom.xml create mode 100644 galaxy/src/main/java/com/alttd/chat/ChatPlugin.java create mode 100644 galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java create mode 100644 galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java create mode 100644 galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java create mode 100644 galaxy/src/main/resources/plugin.yml rename velocity/src/main/java/com/alttd/chat/{ChatPlugin.java => VelocityChat.java} (71%) diff --git a/api/src/main/java/com/alttd/chat/ChatAPI.java b/api/src/main/java/com/alttd/chat/ChatAPI.java index 35d3eca..487f9e7 100644 --- a/api/src/main/java/com/alttd/chat/ChatAPI.java +++ b/api/src/main/java/com/alttd/chat/ChatAPI.java @@ -1,8 +1,10 @@ -package com.alttd.chat; +package com.alttd.velocitychat; -import com.alttd.chat.database.DatabaseConnection; +import com.alttd.velocitychat.database.DatabaseConnection; import net.luckperms.api.LuckPerms; +import java.util.UUID; + public interface ChatAPI { ChatAPI get(); @@ -10,4 +12,11 @@ public interface ChatAPI { LuckPerms getLuckPerms(); DatabaseConnection getDataBase(); + + String getPrefix(UUID uuid); + + String getPrefix(UUID uuid, boolean all); + + String getStaffPrefix(UUID uuid); + } diff --git a/api/src/main/java/com/alttd/chat/ChatImplementation.java b/api/src/main/java/com/alttd/chat/ChatImplementation.java index fbadcb3..413d675 100644 --- a/api/src/main/java/com/alttd/chat/ChatImplementation.java +++ b/api/src/main/java/com/alttd/chat/ChatImplementation.java @@ -1,11 +1,15 @@ -package com.alttd.chat; +package com.alttd.velocitychat; -import com.alttd.chat.config.Config; -import com.alttd.chat.database.DatabaseConnection; +import com.alttd.velocitychat.config.Config; +import com.alttd.velocitychat.database.DatabaseConnection; import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.model.user.User; -import java.io.File; +import java.util.Collection; +import java.util.Comparator; +import java.util.UUID; public class ChatImplementation implements ChatAPI{ @@ -14,9 +18,9 @@ public class ChatImplementation implements ChatAPI{ private LuckPerms luckPerms; private DatabaseConnection databaseConnection; - ChatImplementation() { + public ChatImplementation() { instance = this; - Config.init(new File(System.getProperty("user.home"))); + Config.init(); // init database // init depends//or set them the first time they are called? } @@ -42,5 +46,36 @@ public class ChatImplementation implements ChatAPI{ return databaseConnection; } + @Override + public String getPrefix(UUID uuid) { + return getPrefix(uuid, false); + } + + @Override + public String getPrefix(UUID uuid, boolean all) { + // TODO cache these components on load, and return them here? + StringBuilder prefix = new StringBuilder(); + LuckPerms luckPerms = getLuckPerms(); + User user = luckPerms.getUserManager().getUser(uuid); + if(user == null) return ""; + if(all) { + Collection inheritedGroups = user.getInheritedGroups(user.getQueryOptions()); + inheritedGroups.stream() + .sorted(Comparator.comparingInt(o -> o.getWeight().orElse(0))) + .forEach(group -> { + if (Config.PREFIXGROUPS.contains(group.getName())) { + prefix.append("[").append(group.getCachedData().getMetaData().getPrefix()).append("]"); + } + }); + } + prefix.append("[").append(user.getCachedData().getMetaData().getPrefix()).append("]"); + return prefix.toString(); + } + + @Override + public String getStaffPrefix(UUID uuid) { + return ""; + } + } diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java index 7e23121..a0660e7 100644 --- a/api/src/main/java/com/alttd/chat/config/Config.java +++ b/api/src/main/java/com/alttd/chat/config/Config.java @@ -1,4 +1,4 @@ -package com.alttd.chat.config; +package com.alttd.velocitychat.config; import com.google.common.base.Throwables; import com.google.common.collect.Lists; @@ -28,8 +28,8 @@ public final class Config { static int version; static boolean verbose; - public static void init(File path) { - CONFIG_FILE = new File(path, "config.yml");; + public static void init() { + CONFIG_FILE = new File(new File(System.getProperty("user.home")), "config.yml");; configLoader = YAMLConfigurationLoader.builder() .setFile(CONFIG_FILE) .setFlowStyle(DumperOptions.FlowStyle.BLOCK) @@ -150,9 +150,11 @@ public final class Config { /** ONLY EDIT ANYTHING BELOW THIS LINE **/ public static List PREFIXGROUPS = new ArrayList<>(); + public static String CONSOLENAME = "Console"; private static void settings() { PREFIXGROUPS = getList("settings.prefix-groups", Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch", "developer")); + CONSOLENAME = getString("settings.console-name", CONSOLENAME); } public static List MESSAGECOMMANDALIASES = new ArrayList<>(); @@ -168,13 +170,11 @@ public final class Config { MESSAGERECIEVER = getString("commands.message.reciever-message", MESSAGERECIEVER); } - public static List GCCOMMANDALIASES = new ArrayList<>(); public static String GCFORMAT = " >to Global: "; public static String GCPERMISSION = "proxy.globalchat"; private static void globalChat() { MESSAGERECIEVER = getString("commands.globalchat.format", MESSAGERECIEVER); GCPERMISSION = getString("commands.globalchat.view-chat-permission", GCPERMISSION); - GCCOMMANDALIASES = getList("commands.globalchat.aliases", Lists.newArrayList("gc")); } public static List GACECOMMANDALIASES = new ArrayList<>(); diff --git a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java index eb62ea8..48d5816 100644 --- a/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java +++ b/api/src/main/java/com/alttd/chat/database/DatabaseConnection.java @@ -1,4 +1,4 @@ -package com.alttd.chat.database; +package com.alttd.velocitychat.database; import java.sql.Connection; diff --git a/api/src/main/java/com/alttd/chat/database/Queries.java b/api/src/main/java/com/alttd/chat/database/Queries.java index 50d16a5..d695905 100644 --- a/api/src/main/java/com/alttd/chat/database/Queries.java +++ b/api/src/main/java/com/alttd/chat/database/Queries.java @@ -1,7 +1,7 @@ -package com.alttd.chat.database; +package com.alttd.velocitychat.database; -import com.alttd.chat.objects.Party; -import com.alttd.chat.objects.PartyUser; +import com.alttd.velocitychat.objects.Party; +import com.alttd.velocitychat.objects.PartyUser; import java.sql.Connection; import java.sql.PreparedStatement; @@ -64,8 +64,8 @@ public class Queries { //Ignore - public static void getIgnoredUsers() { //TODO store this in a user object or something? - HashMap> ignoredUsers = new HashMap<>(); //TODO Replace with a proper way/location to store this in + public static void getIgnoredUsers() { //TODO store this in a user object or something? -> ChatPlayer + HashMap> ignoredUsers = new HashMap<>(); //TODO Replace with a proper way/location to store this in -> a list in ChatPlayer? String query = "SELECT * FROM ignored_users"; try { diff --git a/api/src/main/java/com/alttd/chat/objects/ChatPlayer.java b/api/src/main/java/com/alttd/chat/objects/ChatPlayer.java index 450467a..8336085 100644 --- a/api/src/main/java/com/alttd/chat/objects/ChatPlayer.java +++ b/api/src/main/java/com/alttd/chat/objects/ChatPlayer.java @@ -1,4 +1,4 @@ -package com.alttd.chat.objects; +package com.alttd.velocitychat.objects; import java.util.UUID; diff --git a/api/src/main/java/com/alttd/chat/objects/Party.java b/api/src/main/java/com/alttd/chat/objects/Party.java index ce29286..ecb0338 100644 --- a/api/src/main/java/com/alttd/chat/objects/Party.java +++ b/api/src/main/java/com/alttd/chat/objects/Party.java @@ -1,6 +1,6 @@ -package com.alttd.chat.objects; +package com.alttd.velocitychat.objects; -import com.alttd.chat.database.Queries; +import com.alttd.velocitychat.database.Queries; import java.util.ArrayList; import java.util.UUID; diff --git a/api/src/main/java/com/alttd/chat/objects/PartyUser.java b/api/src/main/java/com/alttd/chat/objects/PartyUser.java index b7a6bd8..9fcf65b 100644 --- a/api/src/main/java/com/alttd/chat/objects/PartyUser.java +++ b/api/src/main/java/com/alttd/chat/objects/PartyUser.java @@ -1,6 +1,6 @@ -package com.alttd.chat.objects; +package com.alttd.velocitychat.objects; -import com.alttd.chat.database.Queries; +import com.alttd.velocitychat.database.Queries; import java.util.UUID; diff --git a/api/src/main/java/com/alttd/chat/objects/Regex.java b/api/src/main/java/com/alttd/chat/objects/Regex.java index e968c8d..7c6d824 100644 --- a/api/src/main/java/com/alttd/chat/objects/Regex.java +++ b/api/src/main/java/com/alttd/chat/objects/Regex.java @@ -1,4 +1,4 @@ -package com.alttd.chat.objects; +package com.alttd.velocitychat.objects; public class Regex { diff --git a/api/src/main/java/com/alttd/chat/objects/RegexType.java b/api/src/main/java/com/alttd/chat/objects/RegexType.java index 1d163dd..5d76032 100644 --- a/api/src/main/java/com/alttd/chat/objects/RegexType.java +++ b/api/src/main/java/com/alttd/chat/objects/RegexType.java @@ -1,4 +1,4 @@ -package com.alttd.chat.objects; +package com.alttd.velocitychat.objects; public enum RegexType { REPLACE("replace"), diff --git a/galaxy/dependency-reduced-pom.xml b/galaxy/dependency-reduced-pom.xml new file mode 100644 index 0000000..e8d6a64 --- /dev/null +++ b/galaxy/dependency-reduced-pom.xml @@ -0,0 +1,69 @@ + + + + Chat + com.alttd.chat + 1.0 + + 4.0.0 + galaxy-chat + + clean package + + + true + src/main/resources + + + ${project.name} + + + maven-compiler-plugin + 3.8.1 + + + maven-shade-plugin + 3.2.4 + + + package + + shade + + + + + + + net.kyori:adventure-text-minimessage + com.alttd.chat:chat-api + org.spongepowered:configurate-yaml + org.spongepowered:configurate-core + + + META-INF/*.MF + + + + + + + + + Alttd-Nexus + http://leo:8081/snapshots/ + + + + + com.alttd.galaxy + galaxy-api + 1.16.5-R0.1-SNAPSHOT + compile + + + + 11 + 11 + + diff --git a/galaxy/pom.xml b/galaxy/pom.xml index da639cd..e182c6b 100644 --- a/galaxy/pom.xml +++ b/galaxy/pom.xml @@ -13,20 +13,46 @@ com.alttd.chat Chat 1.0 + ../pom.xml galaxy-chat jar + clean package + ${project.name} org.apache.maven.plugins maven-compiler-plugin + 3.8.1 org.apache.maven.plugins maven-shade-plugin + 3.2.4 + + + + net.kyori:adventure-text-minimessage + com.alttd.chat:chat-api + org.spongepowered:configurate-yaml + org.spongepowered:configurate-core + + + META-INF/*.MF + + + + + + package + + shade + + + @@ -56,5 +82,10 @@ ${project.version} compile + + org.spongepowered + configurate-yaml + 3.7.1 + \ No newline at end of file diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java new file mode 100644 index 0000000..79b6c7c --- /dev/null +++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java @@ -0,0 +1,52 @@ +package com.alttd.chat; + +import com.alttd.chat.commands.GlobalChat; +import com.alttd.chat.handler.ChatHandler; +import com.alttd.chat.listeners.PlayerListener; +import org.bukkit.command.CommandExecutor; +import org.bukkit.event.Listener; +import org.bukkit.plugin.java.JavaPlugin; + +public class ChatPlugin extends JavaPlugin { + + private static ChatPlugin instance; + + private ChatAPI chatAPI; + private ChatHandler chatHandler; + + @Override + public void onEnable() { + instance = this; + chatAPI = new ChatImplementation(); + chatHandler = new ChatHandler(); + registerListener(new PlayerListener()); + registerCommand("globalchat", new GlobalChat()); + } + + @Override + public void onDisable() { + instance = null; + } + + public void registerListener(Listener... listeners) { + for (Listener listener : listeners) { + getServer().getPluginManager().registerEvents(listener, this); + } + } + + public void registerCommand(String commandName, CommandExecutor CommandExecutor) { + getCommand(commandName).setExecutor(CommandExecutor); + } + + public static ChatPlugin getInstance() { + return instance; + } + + public ChatAPI getChatAPI() { + return chatAPI; + } + + public ChatHandler getChatHandler() { + return chatHandler; + } +} diff --git a/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java b/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java new file mode 100644 index 0000000..d34b9d5 --- /dev/null +++ b/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java @@ -0,0 +1,18 @@ +package com.alttd.chat.commands; + +import com.alttd.chat.ChatPlugin; +import org.apache.commons.lang.StringUtils; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; + +public class GlobalChat implements CommandExecutor { + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + String message = StringUtils.join(args, " ", 0, args.length); + ChatPlugin.getInstance().getChatHandler().globalChat(sender, message); + return false; + } + +} diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java new file mode 100644 index 0000000..a4d12b0 --- /dev/null +++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java @@ -0,0 +1,49 @@ +package com.alttd.chat.handler; + +import com.alttd.chat.ChatPlugin; +import com.alttd.chat.config.Config; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import java.util.HashMap; +import java.util.Map; + +public class ChatHandler { + + private ChatPlugin plugin; + + public ChatHandler() { + plugin = ChatPlugin.getInstance(); + } + + public void globalChat(CommandSender source, String message) { + String senderName, prefix = ""; + Map map = new HashMap<>(); + + if (source instanceof Player) { + Player sender = (Player) source; + senderName = sender.getDisplayName(); + prefix = plugin.getChatAPI().getPrefix(sender.getUniqueId()); + } else { + senderName = Config.CONSOLENAME; + } + + MiniMessage miniMessage = MiniMessage.get(); + if(!source.hasPermission("chat.format")) + message = miniMessage.stripTokens(message); + + map.put("sender", senderName); + map.put("message", message); + map.put("server", Bukkit.getServerName()); + map.put("prefix", prefix); + + Component component = miniMessage.parse(Config.GCFORMAT, map); + + Bukkit.broadcast(component, Config.GCPERMISSION); + // TODO this should be a plugin message, so proxy can handle the forwarding, we only do this on server level for [i] support + + } +} diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java new file mode 100644 index 0000000..12c68cc --- /dev/null +++ b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java @@ -0,0 +1,15 @@ +package com.alttd.chat.listeners; + +import io.papermc.paper.event.player.AsyncChatEvent; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +public class PlayerListener implements Listener { + + @EventHandler(ignoreCancelled = true) + public void onPlayerChat(AsyncChatEvent event) { + Player player = event.getPlayer(); + // TODO + } +} diff --git a/galaxy/src/main/resources/plugin.yml b/galaxy/src/main/resources/plugin.yml new file mode 100644 index 0000000..f7aeeca --- /dev/null +++ b/galaxy/src/main/resources/plugin.yml @@ -0,0 +1,11 @@ +name: ChatPlugin +version: ${project.version} +main: com.alttd.chat.ChatPlugin +api-version: 1.16 +authors: [Destro, Teriuihi] +depend: [LuckPerms] +commands: + globalchat: + permission: command.globalchat + permission-message: You do not have permission! + aliases: gc \ No newline at end of file diff --git a/velocity/src/main/java/com/alttd/chat/ChatPlugin.java b/velocity/src/main/java/com/alttd/chat/VelocityChat.java similarity index 71% rename from velocity/src/main/java/com/alttd/chat/ChatPlugin.java rename to velocity/src/main/java/com/alttd/chat/VelocityChat.java index 10f563d..93beb5f 100644 --- a/velocity/src/main/java/com/alttd/chat/ChatPlugin.java +++ b/velocity/src/main/java/com/alttd/chat/VelocityChat.java @@ -1,12 +1,14 @@ -package com.alttd.chat; +package com.alttd.velocitychat; -import com.alttd.chat.commands.GlobalAdminChat; -import com.alttd.chat.commands.GlobalChat; -import com.alttd.chat.commands.GlobalChatToggle; -import com.alttd.chat.config.Config; +import com.alttd.chat.ChatAPI; +import com.alttd.chat.ChatImplementation; +import com.alttd.velocitychat.commands.GlobalAdminChat; +import com.alttd.velocitychat.commands.GlobalChat; +import com.alttd.velocitychat.commands.GlobalChatToggle; import com.alttd.chat.database.DatabaseConnection; -import com.alttd.chat.handlers.ChatHandler; -import com.alttd.chat.listeners.ChatListener; +import com.alttd.velocitychat.handlers.ChatHandler; +import com.alttd.velocitychat.listeners.ChatListener; +import com.alttd.velocitychat.listeners.PluginMessageListener; import com.google.inject.Inject; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; @@ -14,6 +16,8 @@ import com.velocitypowered.api.plugin.Dependency; import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; +import com.velocitypowered.api.proxy.messages.ChannelIdentifier; +import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import org.slf4j.Logger; import java.io.File; @@ -35,6 +39,9 @@ public class ChatPlugin { private DatabaseConnection databaseConnection; private ChatHandler chatHandler; + private final ChannelIdentifier channelIdentifier = + MinecraftChannelIdentifier.from("customplugin:mychannel"); + @Inject public ChatPlugin(ProxyServer proxyServer, Logger proxyLogger, @DataDirectory Path proxydataDirectory) { plugin = this; @@ -45,8 +52,7 @@ public class ChatPlugin { @Subscribe public void onProxyInitialization(ProxyInitializeEvent event) { - Config.init(getDataDirectory()); - loadCommands(); + //Config.init(getDataDirectory()); chatAPI = new ChatImplementation(); databaseConnection = chatAPI.getDataBase(); if (!databaseConnection.initialize()) { @@ -55,6 +61,10 @@ public class ChatPlugin { } chatHandler = new ChatHandler(); server.getEventManager().register(this, new ChatListener()); + + server.getEventManager().register(this, new PluginMessageListener(channelIdentifier)); + + loadCommands(); } public File getDataDirectory() { @@ -65,6 +75,9 @@ public class ChatPlugin { return plugin; } + public DatabaseConnection getDatabaseConnection() { + return databaseConnection; + } public Logger getLogger() { return logger; diff --git a/velocity/src/main/java/com/alttd/chat/api/GlobalAdminChatEvent.java b/velocity/src/main/java/com/alttd/chat/api/GlobalAdminChatEvent.java index b93e82c..bf377f1 100644 --- a/velocity/src/main/java/com/alttd/chat/api/GlobalAdminChatEvent.java +++ b/velocity/src/main/java/com/alttd/chat/api/GlobalAdminChatEvent.java @@ -1,4 +1,4 @@ -package com.alttd.chat.api; +package com.alttd.velocitychat.api; import com.velocitypowered.api.command.CommandSource; diff --git a/velocity/src/main/java/com/alttd/chat/api/PrivateMessageEvent.java b/velocity/src/main/java/com/alttd/chat/api/PrivateMessageEvent.java index 8421403..0a25c2b 100644 --- a/velocity/src/main/java/com/alttd/chat/api/PrivateMessageEvent.java +++ b/velocity/src/main/java/com/alttd/chat/api/PrivateMessageEvent.java @@ -1,4 +1,4 @@ -package com.alttd.chat.api; +package com.alttd.velocitychat.api; import com.velocitypowered.api.command.CommandSource; diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java index eda966f..d7d4a03 100644 --- a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java +++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java @@ -1,6 +1,6 @@ -package com.alttd.chat.commands; +package com.alttd.velocitychat.commands; -import com.alttd.chat.api.GlobalAdminChatEvent; +import com.alttd.velocitychat.api.GlobalAdminChatEvent; import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java index 6f3d170..b1a40d7 100644 --- a/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java +++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java @@ -1,7 +1,5 @@ -package com.alttd.chat.commands; +package com.alttd.velocitychat.commands; -import com.alttd.chat.ChatPlugin; -import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; @@ -17,12 +15,11 @@ public class GlobalChat { public GlobalChat(ProxyServer proxyServer) { LiteralCommandNode command = LiteralArgumentBuilder .literal("globalchat") - .requires(ctx -> ctx.hasPermission(Config.GCPERMISSION)) .requires(ctx -> ctx.hasPermission("command.proxy.globalchat"))// TODO permission system? load permissions from config? .then(RequiredArgumentBuilder .argument("message", StringArgumentType.greedyString()) .executes(context -> { - ChatPlugin.getPlugin().getChatHandler().globalChat(context.getSource(), context.getArgument("message", String.class)); + //ChatPlugin.getPlugin().getChatHandler().globalChat(context.getSource(), context.getArgument("message", String.class)); return 1; }) ) @@ -33,10 +30,6 @@ public class GlobalChat { CommandMeta.Builder metaBuilder = proxyServer.getCommandManager().metaBuilder(brigadierCommand); - for (String alias : Config.GCCOMMANDALIASES) { - metaBuilder.aliases(alias); - } - CommandMeta meta = metaBuilder.build(); proxyServer.getCommandManager().register(meta, brigadierCommand); diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java index a408b36..cdf7a21 100644 --- a/velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java +++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java @@ -1,6 +1,6 @@ -package com.alttd.chat.commands; +package com.alttd.velocitychat.commands; -import com.alttd.chat.ChatPlugin; +import com.alttd.velocitychat.ChatPlugin; import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; diff --git a/velocity/src/main/java/com/alttd/chat/commands/Message.java b/velocity/src/main/java/com/alttd/chat/commands/Message.java index 7a88657..3139923 100644 --- a/velocity/src/main/java/com/alttd/chat/commands/Message.java +++ b/velocity/src/main/java/com/alttd/chat/commands/Message.java @@ -1,7 +1,7 @@ -package com.alttd.chat.commands; +package com.alttd.velocitychat.commands; -import com.alttd.chat.ChatPlugin; -import com.alttd.chat.api.PrivateMessageEvent; +import com.alttd.velocitychat.ChatPlugin; +import com.alttd.velocitychat.api.PrivateMessageEvent; import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; diff --git a/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java b/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java index c6eaad4..11b1089 100644 --- a/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java +++ b/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java @@ -1,5 +1,6 @@ -package com.alttd.chat.config; +package com.alttd.velocitychat.config; +import com.alttd.chat.config.Config; import com.google.common.reflect.TypeToken; import ninja.leaping.configurate.objectmapping.ObjectMappingException; diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java index 68d137a..b5aaaae 100644 --- a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java +++ b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java @@ -1,8 +1,9 @@ -package com.alttd.chat.handlers; +package com.alttd.velocitychat.handlers; -import com.alttd.chat.ChatPlugin; -import com.alttd.chat.api.PrivateMessageEvent; +import com.alttd.velocitychat.ChatPlugin; +import com.alttd.velocitychat.api.PrivateMessageEvent; import com.alttd.chat.config.Config; +import com.alttd.chat.objects.ChatPlayer; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.Component; diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java index 147c4ba..177284a 100644 --- a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -1,8 +1,8 @@ -package com.alttd.chat.listeners; +package com.alttd.velocitychat.listeners; -import com.alttd.chat.ChatPlugin; -import com.alttd.chat.api.GlobalAdminChatEvent; -import com.alttd.chat.api.PrivateMessageEvent; +import com.alttd.velocitychat.ChatPlugin; +import com.alttd.velocitychat.api.GlobalAdminChatEvent; +import com.alttd.velocitychat.api.PrivateMessageEvent; import com.alttd.chat.config.Config; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.PostOrder; diff --git a/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java index 4a29237..65a008c 100644 --- a/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java +++ b/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java @@ -1,7 +1,7 @@ -package com.alttd.chat.listeners; +package com.alttd.velocitychat.listeners; -import com.alttd.chat.ChatPlugin; -import com.alttd.chat.handlers.ChatPlayer; +import com.alttd.velocitychat.ChatPlugin; +import com.alttd.chat.objects.ChatPlayer; import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; @@ -11,7 +11,7 @@ public class PlayerListener { @Subscribe(order = PostOrder.FIRST) public void onPlayerLogin(LoginEvent event) { - ChatPlugin.getPlugin().getChatHandler().addPlayer(new ChatPlayer(event.getPlayer())); + ChatPlugin.getPlugin().getChatHandler().addPlayer(new ChatPlayer(event.getPlayer().getUniqueId())); } @Subscribe diff --git a/velocity/src/main/java/com/alttd/chat/util/Regex.java b/velocity/src/main/java/com/alttd/chat/util/Regex.java index ed10e00..aa93979 100644 --- a/velocity/src/main/java/com/alttd/chat/util/Regex.java +++ b/velocity/src/main/java/com/alttd/chat/util/Regex.java @@ -1,4 +1,4 @@ -package com.alttd.chat.util; +package com.alttd.velocitychat.util; import java.util.ArrayList; import java.util.HashMap;