From 9c79065e042811ac2f9c834cd388ec50c5d056e7 Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Sat, 20 Jul 2019 18:41:49 -0400
Subject: [PATCH] Updated plugin to 1.14.4

---
 .classpath                                    |  1 +
 MineverseChat/bungee.yml                      |  2 +-
 .../Aust1n46/chat/MineverseChat.java          | 33 +++++++++++++++----
 .../Aust1n46/chat/listeners/ChatListener.java |  4 +--
 .../chat/versions/VersionHandler.java         |  4 +++
 MineverseChat/plugin.yml                      |  2 +-
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.classpath b/.classpath
index a30c161..1ad331c 100644
--- a/.classpath
+++ b/.classpath
@@ -19,5 +19,6 @@
 	<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.11.2-R0.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.12.2.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.13.2.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.14.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/MineverseChat/bungee.yml b/MineverseChat/bungee.yml
index 8ed64f0..512d680 100644
--- a/MineverseChat/bungee.yml
+++ b/MineverseChat/bungee.yml
@@ -1,4 +1,4 @@
 name: VentureChat
 main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
-version: 2.15.1
+version: 2.16.0
 author: Aust1n46
\ No newline at end of file
diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
index 328fbea..b47d57b 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
@@ -582,14 +582,33 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 	}
 	
 	private static void splitComponents(List<Object> finalList, Object o, Class<?> c) throws Exception {
-		ArrayList<?> list = (ArrayList<?>) c.getMethod("a").invoke(o, new Object[0]);
-		for(Object component : list) {
-			ArrayList<?> innerList = (ArrayList<?>) c.getMethod("a").invoke(component, new Object[0]);
-			if(innerList.size() > 0) {
-				splitComponents(finalList, component, c);
+		if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
+			for(Method m : c.getMethods()) {
+				System.out.println(m.getName());
 			}
-			else {
-				finalList.add(component);
+		}
+		if(VersionHandler.is1_14_4()) {
+			ArrayList<?> list = (ArrayList<?>) c.getMethod("getSiblings").invoke(o, new Object[0]);
+			for(Object component : list) {
+				ArrayList<?> innerList = (ArrayList<?>) c.getMethod("getSiblings").invoke(component, new Object[0]);
+				if(innerList.size() > 0) {
+					splitComponents(finalList, component, c);
+				}
+				else {
+					finalList.add(component);
+				}
+			}
+		}
+		else {
+			ArrayList<?> list = (ArrayList<?>) c.getMethod("a").invoke(o, new Object[0]);
+			for(Object component : list) {
+				ArrayList<?> innerList = (ArrayList<?>) c.getMethod("a").invoke(component, new Object[0]);
+				if(innerList.size() > 0) {
+					splitComponents(finalList, component, c);
+				}
+				else {
+					finalList.add(component);
+				}
 			}
 		}
 	}
diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
index d107d9a..919d225 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
@@ -144,10 +144,10 @@ public class ChatListener implements Listener {
 					filtered = cc.FilterChat(event.getMessage());
 				}
 				if(mcp.getPlayer().hasPermission("venturechat.color")) {
-					filtered = Format.FormatStringColor(filtered);
+					//filtered = Format.FormatStringColor(filtered);
 				}
 				if(mcp.getPlayer().hasPermission("venturechat.format")) {
-					filtered = Format.FormatString(filtered);
+					//filtered = Format.FormatString(filtered);
 				}
 				filtered = " " + filtered;
 				if(plugin.getConfig().getString("tellformatto").equalsIgnoreCase("Default")) {
diff --git a/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java b/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java
index 55ecaf9..6b65f57 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java
@@ -73,6 +73,10 @@ public class VersionHandler {
 		return Bukkit.getVersion().contains("1.14");
 	}
 	
+	public static boolean is1_14_4() {
+		return Bukkit.getVersion().contains("1.14.4");
+	}
+	
 	public static boolean isCauldron() {
 		return false;
 	}
diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml
index 7141163..b26ab77 100644
--- a/MineverseChat/plugin.yml
+++ b/MineverseChat/plugin.yml
@@ -1,5 +1,5 @@
 name: VentureChat
-version: 2.15.1
+version: 2.16.0
 api-version: 1.13
 main: mineverse.Aust1n46.chat.MineverseChat
 depend: [Vault, ProtocolLib, PlaceholderAPI]