Fixes I thought were merged

ButtonCore/pom.xml

@@ -46,11 +46,6 @@
 						<configuration>
 							<artifactSet>
 							</artifactSet>
-							<pluginExecution>
-								<action>
-									<execute />
-								</action>
-							</pluginExecution>
 						</configuration>
 					</execution>
 				</executions>

ButtonCore/src/main/java/buttondevteam/core/CommandCaller.java

@@ -56,7 +56,7 @@ public class CommandCaller implements CommandExecutor {
 			cmd = TBMCChatAPI.GetCommands().get(path);
 		}
 		if (cmd == null) {
-			if (subcmds == null || subcmds.length > 0)
+			if (subcmds.length > 0) //Subcmds will always have value here (see assignment above)
 				sender.sendMessage(subcmds);
 			else {
 				final String errormsg = "§cYou don't have access to any of this command's subcommands or it doesn't have any.";

ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java

@@ -19,7 +19,6 @@ import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 public class MainPlugin extends JavaPlugin {
 	public static MainPlugin Instance;
@@ -42,19 +41,19 @@ public class MainPlugin extends JavaPlugin {
 		TBMCChatAPI.AddCommand(this, ScheduledRestartCommand.class);
 		TBMCCoreAPI.RegisterEventsForExceptions(new PlayerListener(), this);
 		TBMCCoreAPI.RegisterUserClass(TBMCPlayerBase.class);
-		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fOOC§f", Color.White, "ooc", null));
+        TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fOOC§f", Color.White, "ooc", null));
-		Channel.GlobalChat.IDs = new String[]{"g"}; //Support /g as well
+        Channel.GlobalChat.IDs = new String[]{"g"}; //Support /g as well
 		TBMCChatAPI.RegisterChatChannel(
 				Channel.AdminChat = new Channel("§cADMIN§f", Color.Red, "a", Channel.inGroupFilter(null)));
 		TBMCChatAPI.RegisterChatChannel(
 				Channel.ModChat = new Channel("§9MOD§f", Color.Blue, "mod", Channel.inGroupFilter("mod")));
 		TBMCChatAPI.RegisterChatChannel(new Channel("§6DEV§", Color.Gold, "dev", Channel.inGroupFilter("developer")));
 		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§cRED", Color.DarkRed, "red"));
-		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§6ORANGE", Color.Gold, "orange"));
+        TBMCChatAPI.RegisterChatChannel(new ChatRoom("§6ORANGE", Color.Gold, "orange"));
-		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§eYELLOW", Color.Yellow, "yellow"));
+        TBMCChatAPI.RegisterChatChannel(new ChatRoom("§eYELLOW", Color.Yellow, "yellow"));
-		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§aGREEN", Color.Green, "green"));
+        TBMCChatAPI.RegisterChatChannel(new ChatRoom("§aGREEN", Color.Green, "green"));
-		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§bBLUE", Color.Blue, "blue"));
+        TBMCChatAPI.RegisterChatChannel(new ChatRoom("§bBLUE", Color.Blue, "blue"));
-		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§5PURPLE", Color.DarkPurple, "purple"));
+        TBMCChatAPI.RegisterChatChannel(new ChatRoom("§5PURPLE", Color.DarkPurple, "purple"));
         try {
             Files.write(new File("plugins", "plugins.txt").toPath(), Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(p -> (CharSequence) p.getDataFolder().getName())::iterator);
         } catch (IOException e) {
@@ -68,20 +67,20 @@ public class MainPlugin extends JavaPlugin {
 		logger.info("Saving player data...");
 		TBMCPlayerBase.savePlayers();
 		logger.info("Player data saved.");
-		new Thread(() -> {
+        new Thread(() -> {
-			File[] files = PluginUpdater.updatedir.listFiles();
+            File[] files = PluginUpdater.updatedir.listFiles();
-			if (files == null)
+            if (files == null)
-				return;
+                return;
-			System.out.println("Updating " + files.length + " plugins...");
+            System.out.println("Updating " + files.length + " plugins...");
-			for (File file : files) {
+            for (File file : files) {
-				try {
+                try {
                     Files.move(file.toPath(), new File("plugins", file.getName()).toPath(), StandardCopyOption.REPLACE_EXISTING);
                     System.out.println("Updated " + file.getName());
-				} catch (IOException e) {
+                } catch (IOException e) {
-					e.printStackTrace();
+                    e.printStackTrace();
-				}
+                }
-			}
+            }
-			System.out.println("Update complete!");
+            System.out.println("Update complete!");
         }).start();
 	}
 

ButtonCore/src/main/java/buttondevteam/lib/PluginUpdater.java

@@ -22,15 +22,15 @@ public class PluginUpdater {
 	private PluginUpdater() {
 	}
 
-	public static final File updatedir = new File("TBMC", "pluginupdates");
+    public static final File updatedir = new File("TBMC", "pluginupdates");
 	/**
 	 * See {@link TBMCCoreAPI#UpdatePlugin(String, CommandSender, String)}
 	 */
 	public static boolean UpdatePlugin(String name, CommandSender sender, String branch) {
-		if (!updatedir.exists() && !updatedir.mkdirs()) {
+        if (!updatedir.exists() && !updatedir.mkdirs()) {
-			error(sender, "Failed to create update directory!");
+            error(sender, "Failed to create update directory!");
-			return false;
+            return false;
-		}
+        }
 		info(sender, "Checking plugin name...");
 		List<String> plugins = GetPluginNames();
 		String correctname = null;
@@ -60,32 +60,32 @@ public class PluginUpdater {
 			return false;
 		}
 		info(sender, "Updating TBMC plugin: " + correctname + " from " + correctbranch.get());
-		return updatePluginJitPack(sender, correctname, correctbranch.get());
+        return updatePluginJitPack(sender, correctname, correctbranch.get());
 	}
 
 	private static boolean updatePluginJitPack(CommandSender sender, String correctname,
-											   String correctbranch) {
+                                               String correctbranch) {
 		URL url;
-		File result = new File(updatedir, correctname + ".jar");
+        File result = new File(updatedir, correctname + ".jar");
 		try {
 			url = new URL("https://jitpack.io/com/github/TBMCPlugins/"
 					+ (correctname.equals("ButtonCore") ? "ButtonCore/ButtonCore" : correctname) + "/"
-					+ correctbranch + "-SNAPSHOT/" + correctname + "-" + correctbranch + "-SNAPSHOT.jar"); // ButtonCore exception required since it hosts Towny as well
+                    + correctbranch + "-SNAPSHOT/" + correctname + "-" + correctbranch + "-SNAPSHOT.jar"); // ButtonCore exception required since it hosts Towny as well
 			FileUtils.copyURLToFile(url, result);
 			if (!result.exists() || result.length() < 25) {
 				result.delete();
-				error(sender, "The downloaded JAR for " + correctname + " from " + correctbranch
+                error(sender, "The downloaded JAR for " + correctname + " from " + correctbranch
 						+ " is too small (smnaller than 25 bytes). Am I downloading from the right place?");
 				return false;
 			} else {
-				info(sender, "Updating plugin " + correctname + " from " + correctbranch + " done!");
+                info(sender, "Updating plugin " + correctname + " from " + correctbranch + " done!");
 				return true;
 			}
 		} catch (FileNotFoundException e) {
 			error(sender,
-					"Can't find JAR for " + correctname + " from " + correctbranch
+                    "Can't find JAR for " + correctname + " from " + correctbranch
 							+ ", the build probably failed. Build log (scroll to bottom):" + "\n"
-							+ "https://jitpack.io/com/github/TBMCPlugins/" + correctname + "/" + correctbranch
+                            + "https://jitpack.io/com/github/TBMCPlugins/" + correctname + "/" + correctbranch
 							+ "-SNAPSHOT/build.log\nIf you'd like to rebuild the same commit, go to:\nhttps://jitpack.io/#TBMCPlugins/"
 							+ correctname + "\nAnd delete the newest build.");
 		} catch (IOException e) {

ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java

@@ -71,8 +71,8 @@ public class TBMCCoreAPI {
 		return body;
 	}
 
-	private static final HashMap<String, Throwable> exceptionsToSend = new HashMap<>();
+    private static final HashMap<String, Throwable> exceptionsToSend = new HashMap<>();
-	private static final List<String> debugMessagesToSend = new ArrayList<>();
+    private static final List<String> debugMessagesToSend = new ArrayList<>();
 
 	/**
 	 * Send exception to the {@link TBMCExceptionEvent}.

ButtonCore/src/main/java/buttondevteam/lib/TBMCExceptionEvent.java

@@ -7,7 +7,7 @@ import org.bukkit.event.HandlerList;
 
 /**
  * <p>
- * This event gets called (ideally) each time an exception occurs in a TBMC plugin. To call it, use {@link TBMCCoreAPI#SendException(String, Exception)}.
+ * This event gets called (ideally) each time an exception occurs in a TBMC plugin. To call it, use {@link TBMCCoreAPI#SendException(String, Throwable)}.
  * </p>
  * 
  * @author Norbi

ButtonCore/src/main/java/buttondevteam/lib/chat/Channel.java

@@ -91,7 +91,7 @@ public class Channel {
 
     static void RegisterChannel(Channel channel) {
         channels.add(channel);
-        Bukkit.getScheduler().runTask(Bukkit.getPluginManager().callEvent(new ChatChannelRegisterEvent(channel))); // Wait for server start
+        Bukkit.getScheduler().runTask(MainPlugin.Instance, () -> Bukkit.getPluginManager().callEvent(new ChatChannelRegisterEvent(channel))); // Wait for server start
     }
 
     public static class RecipientTestResult {

ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java

@@ -66,7 +66,7 @@ public abstract class ChromaGamerBase implements AutoCloseable {
 	}
 
 	/**
-	 * Use {@link #data()} or {@link #data(String)} where possible; the 'id' must be always set
+     * Use {@link #data(Object)} or {@link #data(String, Object)} where possible; the 'id' must be always set
 	 */
 	protected YamlConfiguration plugindata;
 

ButtonProcessor/src/main/java/buttondevteam/buttonproc/ButtonProcessor.java

@@ -1,20 +1,17 @@
 package buttondevteam.buttonproc;
 
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic.Kind;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
 
 @SupportedAnnotationTypes("buttondevteam.*")
 public class ButtonProcessor extends AbstractProcessor {