From c1db6c1e39d3cc262424e2b44b4b4ff9808f5af6 Mon Sep 17 00:00:00 2001 From: len <40720638+destro174@users.noreply.github.com> Date: Sat, 15 May 2021 13:26:31 +0200 Subject: [PATCH] Finalize join and leave messages --- .../java/com/alttd/chat/config/Config.java | 12 +++++----- .../com/alttd/chat/config/RegexConfig.java | 2 +- galaxy/dependency-reduced-pom.xml | 6 ----- galaxy/pom.xml | 1 - velocity/dependency-reduced-pom.xml | 6 ----- velocity/pom.xml | 1 - .../java/com/alttd/chat/VelocityChat.java | 2 ++ .../alttd/chat/handlers/ServerHandler.java | 2 +- ...Listener.java => ProxyPlayerListener.java} | 24 ++++++++----------- 9 files changed, 20 insertions(+), 36 deletions(-) rename velocity/src/main/java/com/alttd/chat/listeners/{PlayerListener.java => ProxyPlayerListener.java} (87%) 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 0a1b9ca..b610063 100644 --- a/api/src/main/java/com/alttd/chat/config/Config.java +++ b/api/src/main/java/com/alttd/chat/config/Config.java @@ -28,7 +28,7 @@ public final class Config { static int version; static boolean verbose; - public static void init() { + public static void init() { // todo setup share for the config CONFIG_FILE = new File(new File(System.getProperty("user.home")), "config.yml");; configLoader = YAMLConfigurationLoader.builder() .setFile(CONFIG_FILE) @@ -204,10 +204,10 @@ public final class Config { REGEXNODE = getNode("regex-settings"); } - public static String SERVERSWTICHMESSAGEFROM = "&7* {player} comes from {from_server}..."; // TODO CONVERT THESE TO MINIMESSAGE - public static String SERVERSWTICHMESSAGETO = "&7* {player} leaves to {to_server}..."; - public static String SERVERJOINMESSAGE = "&a* {player} appears from thin air..."; - public static String SERVERLEAVEMESSAGE = "&c* {player} vanishes in the mist..."; + public static String SERVERSWTICHMESSAGEFROM = "* comes from ..."; // Confirm these are the correct ones @destro + public static String SERVERSWTICHMESSAGETO = "* leaves to ..."; + public static String SERVERJOINMESSAGE = "* appears from thin air..."; + public static String SERVERLEAVEMESSAGE = "* vanishes in the mist..."; private static void JoinLeaveMessages() { SERVERSWTICHMESSAGEFROM = getString("messages.switch-server-from", SERVERSWTICHMESSAGEFROM); SERVERSWTICHMESSAGETO = getString("messages.switch-server-to", SERVERSWTICHMESSAGETO); @@ -216,7 +216,7 @@ public final class Config { } - public static String DRIVER = "databasedriver"; + public static String DRIVER = "mysql"; public static String IP = "0.0.0.0"; public static String PORT = "3306"; public static String DATABASE = "database"; diff --git a/api/src/main/java/com/alttd/chat/config/RegexConfig.java b/api/src/main/java/com/alttd/chat/config/RegexConfig.java index 3a1e57d..45b853c 100644 --- a/api/src/main/java/com/alttd/chat/config/RegexConfig.java +++ b/api/src/main/java/com/alttd/chat/config/RegexConfig.java @@ -10,7 +10,7 @@ public final class RegexConfig { private final String regexName; private final String configPath; - + // TODO move this into regex.yml? public RegexConfig(String regexName) { this.regexName = regexName; this.configPath = "regex-settings." + this.regexName + "."; diff --git a/galaxy/dependency-reduced-pom.xml b/galaxy/dependency-reduced-pom.xml index 76463a9..e8d6a64 100644 --- a/galaxy/dependency-reduced-pom.xml +++ b/galaxy/dependency-reduced-pom.xml @@ -61,12 +61,6 @@ 1.16.5-R0.1-SNAPSHOT compile - - net.kyori - adventure-text-minimessage - 4.1.0-SNAPSHOT - provided - 11 diff --git a/galaxy/pom.xml b/galaxy/pom.xml index 27ecb5a..915e129 100644 --- a/galaxy/pom.xml +++ b/galaxy/pom.xml @@ -91,7 +91,6 @@ net.kyori adventure-text-minimessage 4.1.0-SNAPSHOT - provided \ No newline at end of file diff --git a/velocity/dependency-reduced-pom.xml b/velocity/dependency-reduced-pom.xml index 92d7f5f..775683b 100644 --- a/velocity/dependency-reduced-pom.xml +++ b/velocity/dependency-reduced-pom.xml @@ -71,12 +71,6 @@ 4.1.0 provided - - net.kyori - adventure-text-minimessage - 4.1.0-SNAPSHOT - provided - 11 diff --git a/velocity/pom.xml b/velocity/pom.xml index 70990df..0d32bd6 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -102,7 +102,6 @@ net.kyori adventure-text-minimessage 4.1.0-SNAPSHOT - provided diff --git a/velocity/src/main/java/com/alttd/chat/VelocityChat.java b/velocity/src/main/java/com/alttd/chat/VelocityChat.java index 54b8928..49c793b 100644 --- a/velocity/src/main/java/com/alttd/chat/VelocityChat.java +++ b/velocity/src/main/java/com/alttd/chat/VelocityChat.java @@ -6,6 +6,7 @@ import com.alttd.chat.config.Config; import com.alttd.chat.handlers.ChatHandler; import com.alttd.chat.handlers.ServerHandler; import com.alttd.chat.listeners.ChatListener; +import com.alttd.chat.listeners.ProxyPlayerListener; import com.alttd.chat.listeners.PluginMessageListener; import com.google.inject.Inject; import com.velocitypowered.api.event.Subscribe; @@ -54,6 +55,7 @@ public class VelocityChat { serverHandler = new ServerHandler(); chatHandler = new ChatHandler(); server.getEventManager().register(this, new ChatListener()); + server.getEventManager().register(this, new ProxyPlayerListener()); String[] channels = Config.MESSAGECHANNEL.split(":");// todo add a check for this? channelIdentifier = MinecraftChannelIdentifier.create(channels[0], channels[1]); server.getChannelRegistrar().register(channelIdentifier); diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java index 06a3395..66c0389 100644 --- a/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java +++ b/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java @@ -46,7 +46,7 @@ public class ServerHandler { } public ServerWrapper getWrapper(String serverName) { - for(ServerWrapper wrapper : getServers()) { + for(ServerWrapper wrapper : servers) { if(wrapper.serverName().equalsIgnoreCase(serverName)) { return wrapper; } diff --git a/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java similarity index 87% rename from velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java rename to velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java index 0ca26ef..157a6c5 100644 --- a/velocity/src/main/java/com/alttd/chat/listeners/PlayerListener.java +++ b/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java @@ -18,15 +18,7 @@ import net.kyori.adventure.text.minimessage.Template; import java.util.ArrayList; import java.util.List; -public class PlayerListener { - - private final ServerHandler serverHandler; - private final MiniMessage miniMessage; - - public PlayerListener() { - serverHandler = VelocityChat.getPlugin().getServerHandler(); - miniMessage = MiniMessage.get(); - } +public class ProxyPlayerListener { @Subscribe(order = PostOrder.FIRST) public void onPlayerLogin(LoginEvent event) { @@ -41,6 +33,8 @@ public class PlayerListener { // Server Join and Leave messages @Subscribe public void serverConnected(ServerConnectedEvent event) { + ServerHandler serverHandler = VelocityChat.getPlugin().getServerHandler(); + MiniMessage miniMessage = MiniMessage.get(); if (event.getPreviousServer().isPresent()) { RegisteredServer previousServer = event.getPreviousServer().get(); @@ -51,11 +45,11 @@ public class PlayerListener { Template.of("from_server", previousServer.getServerInfo().getName()), Template.of("to_server", event.getServer().getServerInfo().getName()))); // todo Code clean up @Destro - ServerWrapper wrapper = serverHandler.getWrapper(previousServer.getServerInfo().toString()); + ServerWrapper wrapper = serverHandler.getWrapper(previousServer.getServerInfo().getName()); if(wrapper != null) { wrapper.sendJoinLeaveMessage(miniMessage.parse(Config.SERVERSWTICHMESSAGETO, templates)); } - wrapper = serverHandler.getWrapper(event.getServer().getServerInfo().toString()); + wrapper = serverHandler.getWrapper(event.getServer().getServerInfo().getName()); if(wrapper != null) { wrapper.sendJoinLeaveMessage(miniMessage.parse(Config.SERVERSWTICHMESSAGEFROM, templates)); } @@ -63,7 +57,7 @@ public class PlayerListener { List