Command handling improvement, PLW work

More correct fallback for command handling
Getting closer to finish PlayerListWatcher

src/main/java/buttondevteam/discordplugin/broadcaster/GeneralEventBroadcasterModule.java

@@ -12,7 +12,7 @@ public class GeneralEventBroadcasterModule extends Component<DiscordPlugin> {
 	@Override
 	protected void enable() {
 		try {
-			PlayerListWatcher.hookUp();
+			PlayerListWatcher.hookUpDown(true);
 			DPUtils.getLogger().info("Finished hooking into the player list");
 			hooked = true;
 		} catch (Exception e) {
@@ -27,7 +27,7 @@ public class GeneralEventBroadcasterModule extends Component<DiscordPlugin> {
 	protected void disable() {
 		try {
 			if (!hooked) return;
-			if (PlayerListWatcher.hookDown())
+			if (PlayerListWatcher.hookUpDown(false))
 				DPUtils.getLogger().info("Finished unhooking the player list!");
 			else
 				DPUtils.getLogger().info("Didn't have the player list hooked.");

src/main/java/buttondevteam/discordplugin/broadcaster/PlayerListWatcher.java

@@ -1,8 +1,8 @@
 package buttondevteam.discordplugin.broadcaster;
 
+import buttondevteam.lib.TBMCCoreAPI;
 import lombok.val;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -53,20 +53,46 @@ public class PlayerListWatcher {
 		}
 	}*/
 
-	static void hookUp() throws Exception {
+	static boolean hookUpDown(boolean up) throws Exception {
 		val csc = Bukkit.getServer().getClass();
 		Field conf = csc.getDeclaredField("console");
 		conf.setAccessible(true);
 		val server = conf.get(Bukkit.getServer());
 		val nms = server.getClass().getPackage().getName();
 		val dplc = Class.forName(nms + ".DedicatedPlayerList");
+		val currentPL = server.getClass().getMethod("getPlayerList").invoke(server);
+		if (up) {
 			mock = Mockito.mock(dplc, new Answer() { // Cannot call super constructor
 				@Override
 				public Object answer(InvocationOnMock invocation) throws Throwable {
+					if (!invocation.getMethod().getName().equals("sendMessage"))
 						return invocation.getMethod().invoke(plist, invocation.getArguments());
+					val args = invocation.getArguments();
+					val params = invocation.getMethod().getParameterTypes();
+					if (params.length == 0) {
+						TBMCCoreAPI.SendException("Found a strange method",
+							new Exception("Found a sendMessage() method without arguments."));
+						return null;
+					}
+					if (params[0].getSimpleName().equals("IChatBaseComponent[]"))
+						for (val arg : (Object[]) args[0])
+							sendMessage(arg, true);
+					else if (params[0].getSimpleName().equals("IChatBaseComponent"))
+						if (params.length > 1 && params[1].getSimpleName().equalsIgnoreCase("boolean"))
+							sendMessage(args[0], (Boolean) args[1]);
+						else
+							sendMessage(args[0], true);
+					else
+						TBMCCoreAPI.SendException("Found a method with interesting params",
+							new Exception("Found a sendMessage(" + params[0].getSimpleName() + ") method"));
+					return null;
+				}
+
+				private void sendMessage(Object chatComponent, boolean system) {
+					//TODO
 				}
 			});
-		plist = server.getClass().getMethod("getPlayerList").invoke(server);
+			plist = currentPL;
 			try {
 				Field mpf = mock.getClass().getField("maxPlayers");
 				mpf.setAccessible(true);
@@ -83,27 +109,19 @@ public class PlayerListWatcher {
 			modf.setAccessible(true);
 			modf.set(plf, plf.getModifiers() & ~Modifier.FINAL);
 			plf.set(mock, plf.get(plist));
-		try {
+		} else {
-			server.getClass().getMethod("a", dplc).invoke(server, mock);
+			if (!(mock instanceof PlayerListWatcher))
-		} catch (NoSuchMethodException e) {
-			server.getClass().getMethod("a", Class.forName(server.getClass().getPackage().getName() + ".PlayerList")).invoke(server, mock);
-		}
-		Field pllf = CraftServer.class.getDeclaredField("playerList");
-		pllf.setAccessible(true);
-		pllf.set(Bukkit.getServer(), mock);
-	}
-
-	static boolean hookDown() throws Exception {
-		/*Field conf = CraftServer.class.getDeclaredField("console");
-		conf.setAccessible(true);
-		val server = (MinecraftServer) conf.get(Bukkit.getServer());
-		val plist = (DedicatedPlayerList) server.getPlayerList();
-		if (!(plist instanceof PlayerListWatcher))
 				return false;
-		server.a(((PlayerListWatcher) plist).plist);
+		}
-		Field pllf = CraftServer.class.getDeclaredField("playerList");
+		try {
+			server.getClass().getMethod("a", dplc).invoke(server, up ? mock : plist);
+		} catch (NoSuchMethodException e) {
+			server.getClass().getMethod("a", Class.forName(server.getClass().getPackage().getName() + ".PlayerList"))
+				.invoke(server, up ? mock : plist);
+		}
+		Field pllf = csc.getDeclaredField("playerList");
 		pllf.setAccessible(true);
-		pllf.set(Bukkit.getServer(), ((PlayerListWatcher) plist).plist);*/
+		pllf.set(Bukkit.getServer(), up ? mock : plist);
 		return true;
 	}
 }

src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java

@@ -347,10 +347,12 @@ public class MCChatListener implements Listener {
 									VanillaCommandListener.runBukkitOrVanillaCommand(dsender, cmd);
 								else if (mcpackage.contains("1_14"))
 									VanillaCommandListener14.runBukkitOrVanillaCommand(dsender, cmd);
-							} catch (NoClassDefFoundError e) {
+								else
 									Bukkit.dispatchCommand(dsender, cmd);
+							} catch (NoClassDefFoundError e) {
+								TBMCCoreAPI.SendException("A class is not found when trying to run command " + cmd + "!", e);
 							}
-							Bukkit.getLogger().info(dsender.getName() + " issued command from Discord: /" + cmdlowercased);
+							Bukkit.getLogger().info(dsender.getName() + " issued command from Discord: /" + cmd);
 							if (clmd != null)
 								channel.set(chtmp);
 						});