diff --git a/api/pom.xml b/api/pom.xml index deef1af..114ac6e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -13,33 +13,12 @@ com.alttd.chat Chat 1.0 + ../pom.xml chat-api jar - - clean package - ${project.name} - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 11 - 11 - - - - - - src/main - true - - - - net.luckperms @@ -52,6 +31,11 @@ configurate-yaml 3.7.1 + + net.kyori + adventure-text-minimessage + 4.1.0-SNAPSHOT + \ No newline at end of file diff --git a/api/src/main/java/com/alttd/chat/ChatAPI.java b/api/src/main/java/com/alttd/chat/ChatAPI.java index 487f9e7..254e8ea 100644 --- a/api/src/main/java/com/alttd/chat/ChatAPI.java +++ b/api/src/main/java/com/alttd/chat/ChatAPI.java @@ -1,6 +1,6 @@ -package com.alttd.velocitychat; +package com.alttd.chat; -import com.alttd.velocitychat.database.DatabaseConnection; +import com.alttd.chat.database.DatabaseConnection; import net.luckperms.api.LuckPerms; import java.util.UUID; diff --git a/api/src/main/java/com/alttd/chat/ChatImplementation.java b/api/src/main/java/com/alttd/chat/ChatImplementation.java index 413d675..b76a7e8 100644 --- a/api/src/main/java/com/alttd/chat/ChatImplementation.java +++ b/api/src/main/java/com/alttd/chat/ChatImplementation.java @@ -1,7 +1,7 @@ -package com.alttd.velocitychat; +package com.alttd.chat; -import com.alttd.velocitychat.config.Config; -import com.alttd.velocitychat.database.DatabaseConnection; +import com.alttd.chat.config.Config; +import com.alttd.chat.database.DatabaseConnection; import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.model.group.Group; 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 a0660e7..f7c82a5 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.velocitychat.config; +package com.alttd.chat.config; import com.google.common.base.Throwables; import com.google.common.collect.Lists; 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 48d5816..eb62ea8 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.velocitychat.database; +package com.alttd.chat.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 d695905..1a7bdad 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.velocitychat.database; +package com.alttd.chat.database; -import com.alttd.velocitychat.objects.Party; -import com.alttd.velocitychat.objects.PartyUser; +import com.alttd.chat.objects.Party; +import com.alttd.chat.objects.PartyUser; import java.sql.Connection; import java.sql.PreparedStatement; 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 8336085..450467a 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.velocitychat.objects; +package com.alttd.chat.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 ecb0338..ce29286 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.velocitychat.objects; +package com.alttd.chat.objects; -import com.alttd.velocitychat.database.Queries; +import com.alttd.chat.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 9fcf65b..b7a6bd8 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.velocitychat.objects; +package com.alttd.chat.objects; -import com.alttd.velocitychat.database.Queries; +import com.alttd.chat.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 7c6d824..e968c8d 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.velocitychat.objects; +package com.alttd.chat.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 5d76032..1d163dd 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.velocitychat.objects; +package com.alttd.chat.objects; public enum RegexType { REPLACE("replace"), diff --git a/pom.xml b/pom.xml index a66456c..f98c358 100644 --- a/pom.xml +++ b/pom.xml @@ -17,37 +17,33 @@ 11 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - false - - - - - - - + + + Alttd-Nexus + http://leo:8081/snapshots/ + + + + api diff --git a/velocity/dependency-reduced-pom.xml b/velocity/dependency-reduced-pom.xml new file mode 100644 index 0000000..79da356 --- /dev/null +++ b/velocity/dependency-reduced-pom.xml @@ -0,0 +1,79 @@ + + + + Chat + com.alttd.chat + 1.0 + + 4.0.0 + velocity-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 + + + META-INF/*.MF + + + + + + + + + com.velocitypowered + velocity-api + 1.1.5 + provided + + + net.luckperms + api + 5.3 + provided + + + com.google.inject + guice + 4.1.0 + provided + + + mysql + mysql-connector-java + 5.1.49 + runtime + + + + 11 + 11 + + diff --git a/velocity/pom.xml b/velocity/pom.xml index 2789fd5..5c45cc4 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -13,6 +13,7 @@ com.alttd.chat Chat 1.0 + ../pom.xml velocity-chat @@ -25,47 +26,36 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 - - 11 - 11 - + 3.8.1 org.apache.maven.plugins maven-shade-plugin 3.2.4 + + + + net.kyori:adventure-text-minimessage + com.alttd.chat:chat-api + + + META-INF/*.MF + + + package shade - - - - net.kyori:* - - META-INF/*.MF - - - - - - net.kyori:adventure-text-minimessage - - - META-INF/*.MF - - - - src/main + src/main/resources true @@ -84,11 +74,6 @@ 5.3 provided - - net.kyori - adventure-text-minimessage - 4.1.0-SNAPSHOT - com.alttd.chat chat-api @@ -101,6 +86,12 @@ 4.1.0 provided + + mysql + mysql-connector-java + 5.1.49 + runtime + diff --git a/velocity/src/main/java/com/alttd/chat/VelocityChat.java b/velocity/src/main/java/com/alttd/chat/VelocityChat.java index 93beb5f..2d31960 100644 --- a/velocity/src/main/java/com/alttd/chat/VelocityChat.java +++ b/velocity/src/main/java/com/alttd/chat/VelocityChat.java @@ -1,14 +1,12 @@ -package com.alttd.velocitychat; +package com.alttd.chat; -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.commands.GlobalAdminChat; +import com.alttd.chat.commands.GlobalChat; +import com.alttd.chat.commands.GlobalChatToggle; import com.alttd.chat.database.DatabaseConnection; -import com.alttd.velocitychat.handlers.ChatHandler; -import com.alttd.velocitychat.listeners.ChatListener; -import com.alttd.velocitychat.listeners.PluginMessageListener; +import com.alttd.chat.handlers.ChatHandler; +import com.alttd.chat.listeners.ChatListener; +import com.alttd.chat.listeners.PluginMessageListener; import com.google.inject.Inject; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; @@ -28,9 +26,9 @@ import java.nio.file.Path; authors = {"destro174", "teri"}, dependencies = {@Dependency(id = "luckperms")} ) -public class ChatPlugin { +public class VelocityChat { - private static ChatPlugin plugin; + private static VelocityChat plugin; private final ProxyServer server; private final Logger logger; private final Path dataDirectory; @@ -43,7 +41,7 @@ public class ChatPlugin { MinecraftChannelIdentifier.from("customplugin:mychannel"); @Inject - public ChatPlugin(ProxyServer proxyServer, Logger proxyLogger, @DataDirectory Path proxydataDirectory) { + public VelocityChat(ProxyServer proxyServer, Logger proxyLogger, @DataDirectory Path proxydataDirectory) { plugin = this; server = proxyServer; logger = proxyLogger; @@ -71,7 +69,7 @@ public class ChatPlugin { return dataDirectory.toFile(); } - public static ChatPlugin getPlugin() { + public static VelocityChat getPlugin() { return plugin; } 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 bf377f1..b93e82c 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.velocitychat.api; +package com.alttd.chat.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 0a25c2b..8421403 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.velocitychat.api; +package com.alttd.chat.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 d7d4a03..eda966f 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.velocitychat.commands; +package com.alttd.chat.commands; -import com.alttd.velocitychat.api.GlobalAdminChatEvent; +import com.alttd.chat.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 b1a40d7..a268c9f 100644 --- a/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java +++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java @@ -1,4 +1,4 @@ -package com.alttd.velocitychat.commands; +package com.alttd.chat.commands; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; 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 cdf7a21..0635389 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.velocitychat.commands; +package com.alttd.chat.commands; -import com.alttd.velocitychat.ChatPlugin; +import com.alttd.chat.VelocityChat; import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; @@ -24,7 +24,7 @@ public class GlobalChatToggle { .then(RequiredArgumentBuilder .argument("message", StringArgumentType.greedyString()) .executes(context -> { - LuckPerms luckPerms = ChatPlugin.getPlugin().API().getLuckPerms(); + LuckPerms luckPerms = VelocityChat.getPlugin().API().getLuckPerms(); Player player = (Player) context; luckPerms.getUserManager().modifyUser(player.getUniqueId(), user -> { if(player.hasPermission(Config.GCPERMISSION)) { //TODO THIS MUST BE A CONSTANT FROM CONFIG? 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 3139923..2ab051b 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.velocitychat.commands; +package com.alttd.chat.commands; -import com.alttd.velocitychat.ChatPlugin; -import com.alttd.velocitychat.api.PrivateMessageEvent; +import com.alttd.chat.VelocityChat; +import com.alttd.chat.api.PrivateMessageEvent; import com.alttd.chat.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; @@ -39,7 +39,7 @@ public class Message { Player receiver = playerOptional.get(); proxyServer.getEventManager().fire(new PrivateMessageEvent(context.getSource(), receiver, context.getArgument("message", String.class))).thenAccept((event) -> { if(event.getResult() == ResultedEvent.GenericResult.allowed()) { - ChatPlugin.getPlugin().getChatHandler().privateMessage(event); + VelocityChat.getPlugin().getChatHandler().privateMessage(event); } // event has finished firing // do some logic dependent on the result 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 11b1089..c6eaad4 100644 --- a/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java +++ b/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java @@ -1,6 +1,5 @@ -package com.alttd.velocitychat.config; +package com.alttd.chat.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 b5aaaae..0594dc7 100644 --- a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java +++ b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java @@ -1,7 +1,7 @@ -package com.alttd.velocitychat.handlers; +package com.alttd.chat.handlers; -import com.alttd.velocitychat.ChatPlugin; -import com.alttd.velocitychat.api.PrivateMessageEvent; +import com.alttd.chat.VelocityChat; +import com.alttd.chat.api.PrivateMessageEvent; import com.alttd.chat.config.Config; import com.alttd.chat.objects.ChatPlayer; import com.velocitypowered.api.command.CommandSource; @@ -101,7 +101,7 @@ public class ChatHandler { Component component = miniMessage.parse(Config.GCFORMAT, map); - for(Player p: ChatPlugin.getPlugin().getProxy().getAllPlayers()) { + for(Player p: VelocityChat.getPlugin().getProxy().getAllPlayers()) { if(p.hasPermission(Config.GCPERMISSION)); p.sendMessage(component); //TODO send global chat with format from config @@ -129,7 +129,7 @@ public class ChatHandler { public String getPrefix(Player player, boolean highest) { // TODO cache these components on load, and return them here? StringBuilder prefix = new StringBuilder(); - LuckPerms luckPerms = ChatPlugin.getPlugin().API().getLuckPerms(); + LuckPerms luckPerms = VelocityChat.getPlugin().API().getLuckPerms(); User user = luckPerms.getUserManager().getUser(player.getUniqueId()); if(user == null) return ""; if(!highest) { 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 177284a..872646a 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.velocitychat.listeners; +package com.alttd.chat.listeners; -import com.alttd.velocitychat.ChatPlugin; -import com.alttd.velocitychat.api.GlobalAdminChatEvent; -import com.alttd.velocitychat.api.PrivateMessageEvent; +import com.alttd.chat.VelocityChat; +import com.alttd.chat.api.GlobalAdminChatEvent; +import com.alttd.chat.api.PrivateMessageEvent; import com.alttd.chat.config.Config; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.PostOrder; @@ -17,10 +17,10 @@ import java.util.Map; // TODO code CLEANUP public class ChatListener { - private ChatPlugin plugin; + private VelocityChat plugin; public ChatListener() { - plugin = ChatPlugin.getPlugin(); + plugin = VelocityChat.getPlugin(); } @Subscribe(order = PostOrder.FIRST) 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 65a008c..6d85767 100644 --- a/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java +++ b/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java @@ -1,6 +1,6 @@ -package com.alttd.velocitychat.listeners; +package com.alttd.chat.listeners; -import com.alttd.velocitychat.ChatPlugin; +import com.alttd.chat.VelocityChat; import com.alttd.chat.objects.ChatPlayer; import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.Subscribe; @@ -11,11 +11,11 @@ public class PlayerListener { @Subscribe(order = PostOrder.FIRST) public void onPlayerLogin(LoginEvent event) { - ChatPlugin.getPlugin().getChatHandler().addPlayer(new ChatPlayer(event.getPlayer().getUniqueId())); + VelocityChat.getPlugin().getChatHandler().addPlayer(new ChatPlayer(event.getPlayer().getUniqueId())); } @Subscribe public void quitEvent(DisconnectEvent event) { - ChatPlugin.getPlugin().getChatHandler().removePlayer(event.getPlayer().getUniqueId()); + VelocityChat.getPlugin().getChatHandler().removePlayer(event.getPlayer().getUniqueId()); } } diff --git a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java b/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java new file mode 100644 index 0000000..d51d170 --- /dev/null +++ b/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java @@ -0,0 +1,36 @@ +package com.alttd.chat.listeners; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteStreams; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.connection.PluginMessageEvent; +import com.velocitypowered.api.proxy.Player; +import com.velocitypowered.api.proxy.ServerConnection; +import com.velocitypowered.api.proxy.messages.ChannelIdentifier; + +public class PluginMessageListener { + + private final ChannelIdentifier identifier; + + public PluginMessageListener(ChannelIdentifier identifier){ + this.identifier = identifier; + } + + @Subscribe + public void onPluginMessageEvent(PluginMessageEvent event){ + if(event.getIdentifier().equals(identifier)){ + event.setResult(PluginMessageEvent.ForwardResult.handled()); + + if(event.getSource() instanceof Player){ + + } + if(event.getSource() instanceof ServerConnection){ + // Read the data written to the message + ByteArrayDataInput in = ByteStreams.newDataInput(event.getData()); + String message = in.readUTF(); + + } + } + } + +} 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 aa93979..ed10e00 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.velocitychat.util; +package com.alttd.chat.util; import java.util.ArrayList; import java.util.HashMap;