Command, restart, command improvements

Fixed default command handler not being overridable in some cases
Schrestart now takes seconds as param, not ticks
Allowing to change the current timer value in the restart event

HelpText support added
Automatically generating usage text (ButtonProcessor)

.idea/libraries/Maven__com_github_TBMCPlugins_ButtonCore_Towny_master_248b0d8d0a_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.TBMCPlugins.ButtonCore:Towny:master-248b0d8d0a-1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/TBMCPlugins/ButtonCore/Towny/master-248b0d8d0a-1/Towny-master-248b0d8d0a-1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/TBMCPlugins/ButtonCore/Towny/master-248b0d8d0a-1/Towny-master-248b0d8d0a-1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/TBMCPlugins/ButtonCore/Towny/master-248b0d8d0a-1/Towny-master-248b0d8d0a-1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_github_milkbowl_VaultAPI_master_431c5273c2_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.milkbowl:VaultAPI:master-431c5273c2-1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/milkbowl/VaultAPI/master-431c5273c2-1/VaultAPI-master-431c5273c2-1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/milkbowl/VaultAPI/master-431c5273c2-1/VaultAPI-master-431c5273c2-1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/milkbowl/VaultAPI/master-431c5273c2-1/VaultAPI-master-431c5273c2-1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

BuildConfigUpdater/BuildConfigUpdater.iml

@@ -12,6 +12,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
+    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />

BuildConfigUpdater/src/main/java/BCUMain.java

@@ -1,4 +1,4 @@
-import buttondevteam.component.updater.PluginUpdater;
+import buttondevteam.core.component.updater.PluginUpdater;
 
 import java.util.List;
 import java.util.stream.Collectors;

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

@@ -11,7 +11,10 @@ import org.bukkit.plugin.Plugin;
 
 import java.util.Optional;
 
-@CommandClass(modOnly = true)
+@CommandClass(modOnly = true, helpText = {
+	"§6---- Component command ----",
+	"Can be used to enable/disable/list components"
+})
 public class ComponentCommand extends Command2 {
 	public ComponentCommand() {
 		addParamConverter(Plugin.class, arg -> Bukkit.getPluginManager().getPlugin(arg));
@@ -58,13 +61,6 @@ public class ComponentCommand extends Command2 {
 			.filter(c -> c.getClass().getSimpleName().equalsIgnoreCase(arg)).findAny();
 		if (!oc.isPresent())
 			sender.sendMessage("§cComponent not found!"); //^ Much simpler to solve in the new command system
-		return oc; //TODO: Offer overload options with clickable link (with all the plugins it found)
+		return oc;
 	} //TODO: Tabcompletion for the new command system
-
-	public String[] GetHelpText(String alias) { //TODO
-		return new String[]{
-			"§6---- Component command ----",
-			"Enable or disable or list components"
-		};
-	}
 }

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

@@ -1,14 +1,14 @@
 package buttondevteam.core;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
-import buttondevteam.component.channel.ChannelComponent;
+import buttondevteam.core.component.channel.ChannelComponent;
-import buttondevteam.component.channel.ChatRoom;
+import buttondevteam.core.component.channel.ChatRoom;
-import buttondevteam.component.members.MemberComponent;
+import buttondevteam.core.component.members.MemberComponent;
-import buttondevteam.component.randomtp.RandomTPComponent;
+import buttondevteam.core.component.randomtp.RandomTPComponent;
-import buttondevteam.component.restart.RestartComponent;
+import buttondevteam.core.component.restart.RestartComponent;
-import buttondevteam.component.towny.TownyComponent;
+import buttondevteam.core.component.towny.TownyComponent;
-import buttondevteam.component.updater.PluginUpdater;
+import buttondevteam.core.component.updater.PluginUpdater;
-import buttondevteam.component.updater.PluginUpdaterComponent;
+import buttondevteam.core.component.updater.PluginUpdaterComponent;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.ButtonPlugin;
 import buttondevteam.lib.architecture.Component;

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

@@ -1,7 +1,7 @@
 package buttondevteam.core;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
-import buttondevteam.component.channel.ChannelComponent;
+import buttondevteam.core.component.channel.ChannelComponent;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TBMCChatAPI;

ButtonCore/src/main/java/buttondevteam/core/component/channel/Channel.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.channel;
+package buttondevteam.core.component.channel;
 
 import buttondevteam.core.ComponentManager;
 import buttondevteam.core.MainPlugin;

ButtonCore/src/main/java/buttondevteam/core/component/channel/ChannelComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.channel;
+package buttondevteam.core.component.channel;
 
 import buttondevteam.lib.architecture.Component;
 import org.bukkit.plugin.java.JavaPlugin;

ButtonCore/src/main/java/buttondevteam/core/component/channel/ChatChannelRegisterEvent.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.channel;
+package buttondevteam.core.component.channel;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

ButtonCore/src/main/java/buttondevteam/core/component/channel/ChatRoom.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.channel;
+package buttondevteam.core.component.channel;
 
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TBMCChatAPI;

ButtonCore/src/main/java/buttondevteam/core/component/members/MemberCommand.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.members;
+package buttondevteam.core.component.members;
 
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.chat.CommandClass;

ButtonCore/src/main/java/buttondevteam/core/component/members/MemberComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.members;
+package buttondevteam.core.component.members;
 
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.architecture.Component;

ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.randomtp;
+package buttondevteam.core.component.randomtp;
 
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.CommandClass;

ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTPComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.randomtp;
+package buttondevteam.core.component.randomtp;
 
 import buttondevteam.lib.architecture.Component;
 

ButtonCore/src/main/java/buttondevteam/core/component/restart/PrimeRestartCommand.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.restart;
+package buttondevteam.core.component.restart;
 
 import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCCommandBase;

ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.restart;
+package buttondevteam.core.component.restart;
 
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.IFakePlayer;

ButtonCore/src/main/java/buttondevteam/core/component/restart/ScheduledRestartCommand.java

@@ -1,9 +1,11 @@
-package buttondevteam.component.restart;
+package buttondevteam.core.component.restart;
 
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.ScheduledServerRestartEvent;
 import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCCommandBase;
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarFlag;
@@ -14,43 +16,45 @@ import org.bukkit.scheduler.BukkitTask;
 
 @CommandClass(modOnly = true, path = "schrestart")
 public class ScheduledRestartCommand extends TBMCCommandBase {
-	private static volatile int restartcounter;
+	@Getter
-	private static volatile BukkitTask restarttask;
+	@Setter
-	private static volatile BossBar restartbar;
+	private int restartCounter;
+	private BukkitTask restarttask;
+	private volatile BossBar restartbar;
 
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
-		int ticks = 20 * 60;
+		int secs = 60;
 		try {
 			if (args.length > 0)
-				ticks = Integer.parseInt(args[0]);
+				secs = Integer.parseInt(args[0]);
 		} catch (NumberFormatException e) {
-            sender.sendMessage("§cError: Ticks must be a number.");
+			sender.sendMessage("§cError: Seconds must be a number.");
             return false;
 		}
-		if (ticks < 20) {
+		if (secs < 10) {
-			sender.sendMessage("§cError: Ticks must be more than 20.");
+			sender.sendMessage("§cError: Seconds must be at least 10.");
 			return false;
 		}
-		final int restarttime = restartcounter = ticks;
+		final int restarttime = restartCounter = secs * 20;
-		restartbar = Bukkit.createBossBar("Server restart in " + ticks / 20f + "s", BarColor.RED, BarStyle.SOLID,
+		restartbar = Bukkit.createBossBar("Server restart in " + secs + "s", BarColor.RED, BarStyle.SOLID,
 				BarFlag.DARKEN_SKY);
 		restartbar.setProgress(1);
         Bukkit.getOnlinePlayers().forEach(p -> restartbar.addPlayer(p));
-		sender.sendMessage("Scheduled restart in " + ticks / 20f);
+		sender.sendMessage("Scheduled restart in " + secs);
-		ScheduledServerRestartEvent e = new ScheduledServerRestartEvent(ticks);
+		ScheduledServerRestartEvent e = new ScheduledServerRestartEvent(restarttime, this);
 		Bukkit.getPluginManager().callEvent(e);
 		restarttask = Bukkit.getScheduler().runTaskTimer(MainPlugin.Instance, () -> {
-			if (restartcounter < 0) {
+			if (restartCounter < 0) {
 				restarttask.cancel();
                 restartbar.getPlayers().forEach(p -> restartbar.removePlayer(p));
 				Bukkit.spigot().restart();
 			}
-			if (restartcounter % 200 == 0)
+			if (restartCounter % 200 == 0)
-				Bukkit.broadcastMessage("§c-- The server is restarting in " + restartcounter / 20 + " seconds!");
+				Bukkit.broadcastMessage("§c-- The server is restarting in " + restartCounter / 20 + " seconds! (/press)");
-			restartbar.setProgress(restartcounter / (double) restarttime);
+			restartbar.setProgress(restartCounter / (double) restarttime);
-			restartbar.setTitle(String.format("Server restart in %.2f", restartcounter / 20f));
+			restartbar.setTitle(String.format("Server restart in %.2f", restartCounter / 20f));
-			restartcounter--;
+			restartCounter--;
 		}, 1, 1);
 		return true;
 	}

ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.towny;
+package buttondevteam.core.component.towny;
 
 import buttondevteam.core.ComponentManager;
 import buttondevteam.lib.TBMCCoreAPI;

ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdater.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.updater;
+package buttondevteam.core.component.updater;
 
 import buttondevteam.lib.TBMCCoreAPI;
 import com.google.gson.JsonArray;

ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdaterComponent.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.updater;
+package buttondevteam.core.component.updater;
 
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.TBMCChatAPI;

ButtonCore/src/main/java/buttondevteam/core/component/updater/UpdatePluginCommand.java

@@ -1,4 +1,4 @@
-package buttondevteam.component.updater;
+package buttondevteam.core.component.updater;
 
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.TBMCCoreAPI;

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

@@ -1,20 +1,18 @@
 package buttondevteam.lib;
 
+import buttondevteam.core.component.restart.ScheduledRestartCommand;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+@Getter
+@RequiredArgsConstructor
 public class ScheduledServerRestartEvent extends Event {
 	private static final HandlerList handlers = new HandlerList();
 
-    private final int restartticks;
+	private final int restartTicks;
-
+	private final ScheduledRestartCommand command;
-	public ScheduledServerRestartEvent(int restartticks) {
-		this.restartticks = restartticks;
-	}
-
-	public int getRestartTicks() {
-		return restartticks;
-	}
 
 	@Override
 	public HandlerList getHandlers() {

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

@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.chat.ChatMessage;
 import lombok.Getter;
 import lombok.experimental.Delegate;

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

@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

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

@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.command.CommandSender;

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

@@ -1,7 +1,7 @@
 package buttondevteam.lib;
 
-import buttondevteam.component.updater.PluginUpdater;
 import buttondevteam.core.MainPlugin;
+import buttondevteam.core.component.updater.PluginUpdater;
 import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.potato.DebugPotato;
 import org.apache.commons.io.IOUtils;

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

@@ -1,6 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
 import lombok.Getter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.HandlerList;

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

@@ -0,0 +1,38 @@
+package buttondevteam.lib;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public final class ThorpeUtils {
+	private ThorpeUtils() {}
+
+	public static String getDisplayName(CommandSender sender) {
+		if (sender instanceof IHaveFancyName)
+			return ((IHaveFancyName) sender).getFancyName();
+		if (sender instanceof Player)
+			return ((Player) sender).getDisplayName();
+		return sender.getName();
+	}
+
+	public static String getFullDisplayName(CommandSender sender) {
+		if (sender instanceof IHaveFancyName)
+			return ((IHaveFancyName) sender).getFancyFullName();
+		return getDisplayName(sender);
+	}
+
+	public interface IHaveFancyName {
+		/**
+		 * May not be null.
+		 *
+		 * @return The name to be displayed in most places.
+		 */
+		String getFancyName();
+
+		/**
+		 * May return null.
+		 *
+		 * @return The full name that can be used to uniquely indentify the user.
+		 */
+		String getFancyFullName();
+	}
+}

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

@@ -1,18 +1,24 @@
 package buttondevteam.lib.chat;
 
+import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.player.ChromaGamerBase;
 import lombok.RequiredArgsConstructor;
+import lombok.experimental.var;
 import lombok.val;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.YamlConfiguration;
 
+import java.io.InputStreamReader;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * The method name is the subcommand, use underlines (_) to add further subcommands.
@@ -26,7 +32,6 @@ public abstract class Command2 {
 	 * @param args    All of the arguments passed as is
 	 * @return The success of the command
 	 */
-	@Subcommand
 	public boolean def(CommandSender sender, @TextArg String args) {
 		return false;
 	}
@@ -58,12 +63,17 @@ public abstract class Command2 {
 	@Target(ElementType.METHOD)
 	@Retention(RetentionPolicy.RUNTIME)
 	public @interface Subcommand {
+		/**
+		 * Help text to show players. A usage message will be also shown below it.
+		 */
+		String[] helpText() default {};
 	}
 
 	@RequiredArgsConstructor
 	private static class SubcommandData {
 		public final Method method;
 		public final Command2 command;
+		public final String[] helpText;
 	}
 
 	private static HashMap<String, SubcommandData> subcommands = new HashMap<>();
@@ -133,8 +143,8 @@ public abstract class Command2 {
 			//System.out.println("Our params: "+params);
 			val ret = sd.method.invoke(sd.command, params.toArray()); //I FORGOT TO TURN IT INTO AN ARRAY (for a long time)
 			if (ret instanceof Boolean) {
-				if (!(boolean) ret)
+				if (!(boolean) ret) //Show usage
-					sender.sendMessage("Wrong usage."); //TODO: Show help text
+					sender.sendMessage(sd.helpText);
 			} else if (ret != null)
 				throw new Exception("Wrong return type! Must return a boolean or void. Return value: "+ret);
 			return true; //We found a method
@@ -143,11 +153,55 @@ public abstract class Command2 {
 	} //TODO: Add to the help
 
 	public static void registerCommand(Command2 command) {
-		for (val method : command.getClass().getMethods())
+		try { //Register the default handler first so it can be reliably overwritten
-			if (method.isAnnotationPresent(Subcommand.class))
+			val method = command.getClass().getMethod("def", CommandSender.class, String.class);
-				subcommands.put("/" + command.path + //Add command path (class name by default)
+			val cc = command.getClass().getAnnotation(CommandClass.class);
-						(method.getName().equals("def") ? "" : " " + method.getName().replace('_', ' ').toLowerCase()), //Add method name, unless it's 'def'
+			var ht = cc == null ? new String[0] : cc.helpText();
-					new SubcommandData(method, command)); //Result of the above (def) is that it will show the help text
+			String[] both = Arrays.copyOf(ht, ht.length + 1);
+			both[ht.length] = "Usage: /" + command.path; //TODO: Print subcommands
+			ht = both;
+			subcommands.put("/" + command.path, new SubcommandData(method, command, ht)); //TODO: Disable components when the plugin is disabled
+		} catch (Exception e) {
+			TBMCCoreAPI.SendException("Could not register default handler for command /" + command.path, e);
+		} //Continue on
+		for (val method : command.getClass().getMethods()) {
+			val ann = method.getAnnotation(Subcommand.class);
+			if (ann != null) {
+				val cc = command.getClass().getAnnotation(CommandClass.class);
+				var ht = ann.helpText().length != 0 || cc == null ? ann.helpText() : cc.helpText(); //If cc is null then it's empty array
+				val subcommand = "/" + command.path + //Add command path (class name by default)
+					(method.getName().equals("def") ? "" : " " + method.getName().replace('_', ' ').toLowerCase()); //Add method name, unless it's 'def'
+				ht = getHelpText(method, ht, subcommand);
+				subcommands.put(subcommand, new SubcommandData(method, command, ht)); //Result of the above (def) is that it will show the help text
+			}
+		}
+	}
+
+	private static String[] getHelpText(Method method, String[] ht, String subcommand) { //TODO: helpText[0]="§6---- "+helpText[0]+" ----";
+		val str = Command2.class.getResourceAsStream("/commands.yml");
+		if (str == null)
+			TBMCCoreAPI.SendException("Error while getting command data!", new Exception("Resource not found!"));
+		else {
+			YamlConfiguration yc = YamlConfiguration.loadConfiguration(new InputStreamReader(str)); //Generated by ButtonProcessor
+			val ccs = yc.getConfigurationSection(method.getDeclaringClass().getName());
+			if (ccs != null) {
+				val cs = ccs.getConfigurationSection(method.getName());
+				if (cs != null) {
+					val mname = cs.getString("method");
+					val params = cs.getString("params");
+					val goodname = method.getName() + "(" + Arrays.stream(method.getParameterTypes()).map(cl -> cl.getCanonicalName()).collect(Collectors.joining(",")) + ")";
+					if (goodname.equals(mname) && params != null) {
+						String[] both = Arrays.copyOf(ht, ht.length + 1);
+						both[ht.length] = "Usage: " + subcommand + " " + params;
+						ht = both;
+					} else
+						TBMCCoreAPI.SendException("Error while getting command data!", new Exception("Method '" + method.toString() + "' != " + mname + " or params is " + params));
+				} else
+					TBMCCoreAPI.SendException("Error while getting command data!", new Exception("cs is " + cs));
+			} else
+				TBMCCoreAPI.SendException("Error while getting command data!", new Exception("ccs is " + ccs));
+		}
+		return ht;
 	}
 
 	private final String path;

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

@@ -38,7 +38,7 @@ public @interface CommandClass {
     boolean excludeFromPath() default false;
 
 	/**
-	 * The help text to show for the players.
+	 * The help text to show for the players. A usage message will be also shown below it.
 	 *
 	 * @return The help text
 	 */

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

@@ -1,9 +1,9 @@
 package buttondevteam.lib.chat;
 
-import buttondevteam.component.channel.Channel;
-import buttondevteam.component.channel.Channel.RecipientTestResult;
 import buttondevteam.core.CommandCaller;
 import buttondevteam.core.MainPlugin;
+import buttondevteam.core.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel.RecipientTestResult;
 import buttondevteam.lib.TBMCChatEvent;
 import buttondevteam.lib.TBMCChatPreprocessEvent;
 import buttondevteam.lib.TBMCCoreAPI;

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

@@ -1,6 +1,6 @@
 package buttondevteam.lib.player;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 public class ChannelPlayerData { //I just want this to work

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

@@ -1,6 +1,6 @@
 package buttondevteam.lib.player;
 
-import buttondevteam.component.channel.Channel;
+import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.TBMCCoreAPI;
 import com.google.common.collect.HashBiMap;
 import lombok.val;

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

@@ -1,6 +1,6 @@
 package buttondevteam.lib.player;
 
-import buttondevteam.component.towny.TownyComponent;
+import buttondevteam.core.component.towny.TownyComponent;
 import buttondevteam.lib.TBMCCoreAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;

ButtonProcessor/ButtonProcessor.iml

@@ -12,6 +12,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
+    <orderEntry type="library" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
   </component>
 </module>

ButtonProcessor/pom.xml

@@ -1,6 +1,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+    <dependencies>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.21</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
     <parent>
 		<groupId>com.github.TBMCPlugins</groupId>
 		<artifactId>ButtonCore</artifactId>

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

@@ -1,17 +1,25 @@
 package buttondevteam.buttonproc;
 
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.*;
-import javax.lang.model.element.Element;
+import javax.tools.Diagnostic;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
+import javax.tools.FileObject;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardLocation;
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @SupportedAnnotationTypes("buttondevteam.*")
 public class ButtonProcessor extends AbstractProcessor {
@@ -23,7 +31,7 @@ public class ButtonProcessor extends AbstractProcessor {
                 System.out.println("Processing " + targetcl);
                 List<? extends AnnotationMirror> annotationMirrors = processingEnv.getElementUtils()
                         .getAllAnnotationMirrors(targetcl);
-                System.out.println("Annotations: " + annotationMirrors);
+	            //System.out.println("Annotations: " + annotationMirrors);
                 Function<String, Boolean> hasAnnotation = ann -> annotationMirrors.stream()
                         .anyMatch(am -> am.getAnnotationType().toString().contains(ann));
                 if (hasAnnotation.apply("ChromaGamerEnforcer") && !hasAnnotation.apply("UserClass")
@@ -36,15 +44,67 @@ public class ButtonProcessor extends AbstractProcessor {
                             "No PlayerClass annotation found for " + targetcl.getSimpleName(), targetcl);
                 for (AnnotationMirror annotation : annotationMirrors) {
                     String type = annotation.getAnnotationType().toString();
-                    System.out.println("Type: " + type);
+	                //System.out.println("Type: " + type);
+                }
+	            processSubcommands(targetcl, annotationMirrors);
             }
         }
+		try {
+			if (found) {
+				FileObject fo = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", "commands.yml");
+				yc.save(new File(fo.toUri()));
+				found = false;
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
         return true; // claim the annotations
     }
 
+	private YamlConfiguration yc = new YamlConfiguration();
+	private boolean found = false;
+
+	private void processSubcommands(Element targetcl, List<? extends AnnotationMirror> annotationMirrors) {
+		if (!(targetcl instanceof ExecutableElement))
+			return;
+		//System.out.println("Annotations: "+annotationMirrors);
+		if (annotationMirrors.stream().noneMatch(an -> an.getAnnotationType().toString().endsWith("Subcommand")))
+			return;
+		//System.out.print("Processing method: " + targetcl.getEnclosingElement()+" "+targetcl);
+		ConfigurationSection cs = yc.createSection(targetcl.getEnclosingElement().toString()
+			+ "." + targetcl.getSimpleName().toString()); //Need to do the 2 config sections at once so it doesn't overwrite the class section
+		System.out.println(targetcl);
+		cs.set("method", targetcl.toString());
+		cs.set("params", ((ExecutableElement) targetcl).getParameters().stream().skip(1).map(p -> {
+			//String tn=p.asType().toString();
+			//return tn.substring(tn.lastIndexOf('.')+1)+" "+p.getSimpleName();
+			boolean optional = p.getAnnotationMirrors().stream().anyMatch(am -> am.getAnnotationType().toString().endsWith("Optional"));
+			if (optional)
+				return "[" + p.getSimpleName() + "]";
+			return "<" + p.getSimpleName() + ">";
+		}).collect(Collectors.joining(" ")));
+		//System.out.println();
+		found = true;
+	}
+
 	@Override
     public SourceVersion getSupportedSourceVersion() {
         return SourceVersion.latestSupported();
     }
+
+	private String fetchSourcePath() {
+		try {
+			JavaFileObject generationForPath = processingEnv.getFiler().createSourceFile("PathFor" + getClass().getSimpleName());
+			Writer writer = generationForPath.openWriter();
+			String sourcePath = generationForPath.toUri().getPath();
+			writer.close();
+			generationForPath.delete();
+
+			return sourcePath;
+		} catch (IOException e) {
+			processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, "Unable to determine source file path!");
+		}
+
+		return "";
+	}
 }