Cancel/handle plugin message events to/from client (#133)

* Cancel/handle plugin message events to/from client

* spacing

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>mineverse.Aust1n46.chat</groupId>
     <artifactId>VentureChat</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.2</version>
     <url>https://bitbucket.org/Aust1n46/venturechat/src/master</url>
     <scm>
         <url>https://bitbucket.org/Aust1n46/venturechat/src/master</url>

src/main/java/mineverse/Aust1n46/chat/MineverseChat.java

@@ -79,6 +79,17 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 	private static Permission permission = null;
 	private static Chat chat = null;
 
+	// TODO: This won't be so poorly done in the 4.0.0 branch I promise...
+	public static boolean isConnectedToProxy() {
+		try {
+			final MineverseChat plugin = MineverseChat.getInstance();
+			return (plugin.getServer().spigot().getConfig().getBoolean("settings.bungeecord")
+					|| plugin.getServer().spigot().getPaperConfig().getBoolean("settings.velocity-support.enabled")
+					|| plugin.getServer().spigot().getPaperConfig().getBoolean("proxies.velocity.enabled"));
+		} catch (final NoSuchMethodError ignored) {} // Thrown if server isn't Paper.
+		return false;
+	}
+	
 	@Override
 	public void onEnable() {
 		ccInfo = new ChatChannelInfo();
@@ -126,9 +137,11 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 		Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Registering Listeners"));
 		Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Attaching to Executors"));
 
-		Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord"));
-		Bukkit.getMessenger().registerOutgoingPluginChannel(this, PLUGIN_MESSAGING_CHANNEL);
-		Bukkit.getMessenger().registerIncomingPluginChannel(this, PLUGIN_MESSAGING_CHANNEL, this);
+		if (MineverseChat.isConnectedToProxy()) {
+			Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord"));
+			Bukkit.getMessenger().registerOutgoingPluginChannel(this, PLUGIN_MESSAGING_CHANNEL);
+			Bukkit.getMessenger().registerIncomingPluginChannel(this, PLUGIN_MESSAGING_CHANNEL, this);
+		}
 		
 		PluginManager pluginManager = getServer().getPluginManager();
 		if(pluginManager.isPluginEnabled("Towny")) {
@@ -363,6 +376,9 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 
 	@Override
 	public void onPluginMessageReceived(String channel, Player player, byte[] inputStream) {
+		if (!MineverseChat.isConnectedToProxy()) {
+			return;
+		}
 		if(!channel.equals(PLUGIN_MESSAGING_CHANNEL)) {
 			return;
 		}

src/main/java/mineverse/Aust1n46/chat/listeners/LoginListener.java

@@ -73,21 +73,14 @@ public class LoginListener implements Listener {
 			}
 		}
 
-		try {
-			if(plugin.getServer().spigot().getConfig().getBoolean("settings.bungeecord") 
-					|| plugin.getServer().spigot().getPaperConfig().getBoolean("settings.velocity-support.enabled") 
-					|| plugin.getServer().spigot().getPaperConfig().getBoolean("proxies.velocity.enabled")) {
-				long delayInTicks = 20L;
-				final MineverseChatPlayer sync = mcp;
-				plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-					public void run() {
-						MineverseChat.synchronize(sync, false);
-					}
-				}, delayInTicks);
-			}
-		}
-		catch(NoSuchMethodError exception) { // Thrown if server isn't Paper.
-			// Do nothing
+		if (MineverseChat.isConnectedToProxy()) {
+			long delayInTicks = 20L;
+			final MineverseChatPlayer sync = mcp;
+			plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+				public void run() {
+					MineverseChat.synchronize(sync, false);
+				}
+			}, delayInTicks);
 		}
 	}
 }

src/main/java/mineverse/Aust1n46/chat/proxy/VentureChatBungee.java

@@ -105,6 +105,9 @@ public class VentureChatBungee extends Plugin implements Listener, VentureChatPr
 		if(!event.getTag().equals(VentureChatProxy.PLUGIN_MESSAGING_CHANNEL_STRING) && !event.getTag().contains("viaversion:")) {
 			return;
 		}
+		// Critical to prevent client from sending or receiving messages
+		event.setCancelled(true);
+
 		if(!(event.getSender() instanceof Server)) {
 			return;
 		}

src/main/java/mineverse/Aust1n46/chat/proxy/VentureChatVelocity.java

@@ -134,12 +134,14 @@ public class VentureChatVelocity implements VentureChatProxySource {
 		if(!channelIdentifierId.equals(VentureChatProxy.PLUGIN_MESSAGING_CHANNEL_STRING) && !channelIdentifierId.contains("viaversion:")) {
 			return;
 		}
+		// Critical to prevent client from sending or receiving messages
+		event.setResult(ForwardResult.handled());
+
 		if(!(event.getSource() instanceof ServerConnection)) {
 			return;
 		}
 		String serverName = ((ServerConnection) event.getSource()).getServerInfo().getName();
 		VentureChatProxy.onPluginMessage(event.getData(), serverName, this);
-		event.setResult(ForwardResult.handled());
 	}
 
 	@Override

src/main/java/mineverse/Aust1n46/chat/utilities/Format.java

@@ -190,8 +190,8 @@ public class Format {
 				if (ChatColor.stripColor(link).contains("https://"))
 					https = "s";
 				temp += convertToJsonColors(lastCode + link,
-						",\"underlined\":\"" + underlineURLs()
-								+ "\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"http" + https + "://"
+						",\"underlined\":" + underlineURLs()
+								+ ",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"http" + https + "://"
 								+ ChatColor.stripColor(link.replace("http://", "").replace("https://", ""))
 								+ "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":["
 								+ convertToJsonColors(lastCode + link) + "]}}")
@@ -811,8 +811,13 @@ public class Format {
 				.replace(")", "\\)").replace("|", "\\|").replace("+", "\\+").replace("*", "\\*");
 	}
 
-	public static boolean underlineURLs() {
-		return getInstance().getConfig().getBoolean("underlineurls", true);
+	public static String underlineURLs() {
+		final boolean configValue = getInstance().getConfig().getBoolean("underlineurls", true);
+		if (VersionHandler.isAtLeast_1_20_4()) {
+			return String.valueOf(configValue);
+		} else {
+			return "\"" + configValue + "\"";
+		}
 	}
 	
 	public static String parseTimeStringFromMillis(long millis) {