diff --git a/docs/acf-core/co/aikar/commands/CommandHelpFormatter.html b/docs/acf-core/co/aikar/commands/CommandHelpFormatter.html index d50db0a4..126e5cf9 100644 --- a/docs/acf-core/co/aikar/commands/CommandHelpFormatter.html +++ b/docs/acf-core/co/aikar/commands/CommandHelpFormatter.html @@ -148,7 +148,7 @@ extends String[] getEntryFormatReplacements(CommandHelp help, - HelpEntry e) + HelpEntry entry)
Override this to control replacements
@@ -162,7 +162,7 @@ extends @NotNull String[] getParameterFormatReplacements(CommandHelp help, CommandParameter param, - HelpEntry page) + HelpEntry entry)
Override this to control replacements
@@ -341,7 +341,7 @@ extends

  • printDetailedHelpCommand

    -
    public void printDetailedHelpCommand(CommandHelp help,
+
    public void printDetailedHelpCommand(CommandHelp help,
                                      CommandIssuer issuer,
                                      HelpEntry entry)
    • @@ -352,7 +352,7 @@ extends

  • printDetailedParameter

    -
    public void printDetailedParameter(CommandHelp help,
+
    public void printDetailedParameter(CommandHelp help,
                                    CommandIssuer issuer,
                                    HelpEntry entry,
                                    CommandParameter param)
    
@@ -364,7 +364,7 @@ extends 
 
  • 
 
    printDetailedHelpFooter
    
-
    public void printDetailedHelpFooter(CommandHelp help,
+
    public void printDetailedHelpFooter(CommandHelp help,
                                     CommandIssuer issuer,
                                     HelpEntry entry)
    
 
    • 
@@ -375,7 +375,7 @@ extends 
 
  • 
 
    getHeaderFooterFormatReplacements
    
-
    public String[] getHeaderFooterFormatReplacements(CommandHelp help)
    
+
    public String[] getHeaderFooterFormatReplacements(CommandHelp help)
    
 
    Override this to control replacements
    
 
    
 
    Parameters:
    
@@ -390,13 +390,13 @@ extends 
 
  • 
 
    getEntryFormatReplacements
    
-
    public String[] getEntryFormatReplacements(CommandHelp help,
-                                           HelpEntry e)
    
+
    public String[] getEntryFormatReplacements(CommandHelp help,
+                                           HelpEntry entry)
    
 
    Override this to control replacements
    
 
    
 
    Parameters:
    
 
    help - 
    
-
    e - 
    
+
    entry - 
    
 
    Returns:
    
 
    
 
    • 
@@ -408,15 +408,15 @@ extends 
 
    getParameterFormatReplacements
    
 
    @NotNull
-public @NotNull String[] getParameterFormatReplacements(CommandHelp help,
+public @NotNull String[] getParameterFormatReplacements(CommandHelp help,
                                                                  CommandParameter param,
-                                                                 HelpEntry page)
    
+                                                                 HelpEntry entry)
    • Override this to control replacements
    Parameters:
    help -
    param -
    -
    page -
    +
    entry -
    Returns:
    • diff --git a/docs/acf-core/co/aikar/commands/class-use/CommandHelp.html b/docs/acf-core/co/aikar/commands/class-use/CommandHelp.html index 8c7a6731..df8cb442 100644 --- a/docs/acf-core/co/aikar/commands/class-use/CommandHelp.html +++ b/docs/acf-core/co/aikar/commands/class-use/CommandHelp.html @@ -155,7 +155,7 @@ String[] CommandHelpFormatter.getEntryFormatReplacements(CommandHelp help, - HelpEntry e) + HelpEntry entry)
    Override this to control replacements
    @@ -169,7 +169,7 @@ @NotNull String[] CommandHelpFormatter.getParameterFormatReplacements(CommandHelp help, CommandParameter param, - HelpEntry page) + HelpEntry entry)
    Override this to control replacements
    diff --git a/docs/acf-core/co/aikar/commands/class-use/CommandParameter.html b/docs/acf-core/co/aikar/commands/class-use/CommandParameter.html index 7d6f1653..863241fe 100644 --- a/docs/acf-core/co/aikar/commands/class-use/CommandParameter.html +++ b/docs/acf-core/co/aikar/commands/class-use/CommandParameter.html @@ -127,7 +127,7 @@ @NotNull String[] CommandHelpFormatter.getParameterFormatReplacements(CommandHelp help, CommandParameter param, - HelpEntry page) + HelpEntry entry)
    Override this to control replacements
    diff --git a/docs/acf-core/co/aikar/commands/class-use/HelpEntry.html b/docs/acf-core/co/aikar/commands/class-use/HelpEntry.html index e7236bd7..55972b8d 100644 --- a/docs/acf-core/co/aikar/commands/class-use/HelpEntry.html +++ b/docs/acf-core/co/aikar/commands/class-use/HelpEntry.html @@ -130,7 +130,7 @@ String[] CommandHelpFormatter.getEntryFormatReplacements(CommandHelp help, - HelpEntry e) + HelpEntry entry)
    Override this to control replacements
    @@ -138,7 +138,7 @@ @NotNull String[] CommandHelpFormatter.getParameterFormatReplacements(CommandHelp help, CommandParameter param, - HelpEntry page) + HelpEntry entry)
    Override this to control replacements
    diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandHelp.html b/docs/acf-core/src-html/co/aikar/commands/CommandHelp.html index 16b06203..332a5407 100644 --- a/docs/acf-core/src-html/co/aikar/commands/CommandHelp.html +++ b/docs/acf-core/src-html/co/aikar/commands/CommandHelp.html @@ -61,7 +61,7 @@ 053 this.issuer = issuer; 054 this.perPage = manager.defaultHelpPerPage; 055 this.commandPrefix = manager.getCommandPrefix(issuer); -056 this.commandName = this.commandPrefix + rootCommand.getCommandName(); +056 this.commandName = rootCommand.getCommandName(); 057 058 059 SetMultimap<String, RegisteredCommand> subCommands = rootCommand.getSubCommands(); diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandHelpFormatter.html b/docs/acf-core/src-html/co/aikar/commands/CommandHelpFormatter.html index 8fc1563b..73956b03 100644 --- a/docs/acf-core/src-html/co/aikar/commands/CommandHelpFormatter.html +++ b/docs/acf-core/src-html/co/aikar/commands/CommandHelpFormatter.html @@ -92,84 +92,87 @@ 084 085 public void printDetailedHelpHeader(CommandHelp help, CommandIssuer issuer, HelpEntry entry) { 086 issuer.sendMessage(MessageType.HELP, MessageKeys.HELP_DETAILED_HEADER, -087 "{command}", entry.getCommand() -088 ); -089 } -090 +087 "{command}", entry.getCommand(), +088 "{commandprefix}", help.getCommandPrefix() +089 ); +090 } 091 -092 public void printDetailedHelpCommand(CommandHelp help, CommandIssuer issuer, HelpEntry entry) { -093 String formatted = this.manager.formatMessage(issuer, MessageType.HELP, MessageKeys.HELP_DETAILED_COMMAND_FORMAT, getEntryFormatReplacements(help, entry)); -094 for (String msg : ACFPatterns.NEWLINE.split(formatted)) { -095 issuer.sendMessageInternal(ACFUtil.rtrim(msg)); -096 } -097 } -098 -099 public void printDetailedParameter(CommandHelp help, CommandIssuer issuer, HelpEntry entry, CommandParameter param) { -100 String formattedMsg = this.manager.formatMessage(issuer, MessageType.HELP, MessageKeys.HELP_DETAILED_PARAMETER_FORMAT, getParameterFormatReplacements(help, param, entry)); -101 for (String msg : ACFPatterns.NEWLINE.split(formattedMsg)) { -102 issuer.sendMessageInternal(ACFUtil.rtrim(msg)); -103 } -104 } -105 -106 public void printDetailedHelpFooter(CommandHelp help, CommandIssuer issuer, HelpEntry entry) { -107 // default doesn't have a footer -108 } -109 -110 /** -111 * Override this to control replacements -112 * -113 * @param help -114 * @return -115 */ -116 public String[] getHeaderFooterFormatReplacements(CommandHelp help) { -117 return new String[]{ -118 "{search}", help.search != null ? String.join(" ", help.search) : "", -119 "{command}", help.getCommandName(), -120 "{rootcommand}", help.getCommandName(), -121 "{page}", "" + help.getPage(), -122 "{totalpages}", "" + help.getTotalPages(), -123 "{results}", "" + help.getTotalResults() -124 }; -125 } -126 -127 /** -128 * Override this to control replacements -129 * -130 * @param help -131 * @param e -132 * @return -133 */ -134 public String[] getEntryFormatReplacements(CommandHelp help, HelpEntry e) { -135 //{command} {parameters} {separator} {description} -136 return new String[]{ -137 "{command}", e.getCommand(), -138 "{rootcommand}", help.getCommandName(), -139 "{parameters}", e.getParameterSyntax(), -140 "{separator}", e.getDescription().isEmpty() ? "" : "-", -141 "{description}", e.getDescription() -142 }; -143 } -144 -145 /** -146 * Override this to control replacements -147 * -148 * @param help -149 * @param param -150 * @param page -151 * @return -152 */ -153 @NotNull -154 public String[] getParameterFormatReplacements(CommandHelp help, CommandParameter param, HelpEntry page) { -155 //{name} {description} -156 return new String[]{ -157 "{name}", param.getName(), -158 "{syntax}", ACFUtil.nullDefault(param.getSyntax(), ""), -159 "{description}", ACFUtil.nullDefault(param.getDescription(), ""), -160 "{command}", page.getCommand(), -161 "{rootcommand}", help.getCommandName() -162 }; -163 } -164} +092 +093 public void printDetailedHelpCommand(CommandHelp help, CommandIssuer issuer, HelpEntry entry) { +094 String formatted = this.manager.formatMessage(issuer, MessageType.HELP, MessageKeys.HELP_DETAILED_COMMAND_FORMAT, getEntryFormatReplacements(help, entry)); +095 for (String msg : ACFPatterns.NEWLINE.split(formatted)) { +096 issuer.sendMessageInternal(ACFUtil.rtrim(msg)); +097 } +098 } +099 +100 public void printDetailedParameter(CommandHelp help, CommandIssuer issuer, HelpEntry entry, CommandParameter param) { +101 String formattedMsg = this.manager.formatMessage(issuer, MessageType.HELP, MessageKeys.HELP_DETAILED_PARAMETER_FORMAT, getParameterFormatReplacements(help, param, entry)); +102 for (String msg : ACFPatterns.NEWLINE.split(formattedMsg)) { +103 issuer.sendMessageInternal(ACFUtil.rtrim(msg)); +104 } +105 } +106 +107 public void printDetailedHelpFooter(CommandHelp help, CommandIssuer issuer, HelpEntry entry) { +108 // default doesn't have a footer +109 } +110 +111 /** +112 * Override this to control replacements +113 * +114 * @param help +115 * @return +116 */ +117 public String[] getHeaderFooterFormatReplacements(CommandHelp help) { +118 return new String[]{ +119 "{search}", help.search != null ? String.join(" ", help.search) : "", +120 "{command}", help.getCommandName(), +121 "{commandprefix}", help.getCommandPrefix(), +122 "{rootcommand}", help.getCommandName(), +123 "{page}", "" + help.getPage(), +124 "{totalpages}", "" + help.getTotalPages(), +125 "{results}", "" + help.getTotalResults() +126 }; +127 } +128 +129 /** +130 * Override this to control replacements +131 * +132 * @param help +133 * @param entry +134 * @return +135 */ +136 public String[] getEntryFormatReplacements(CommandHelp help, HelpEntry entry) { +137 //{command} {parameters} {separator} {description} +138 return new String[]{ +139 "{command}", entry.getCommand(), +140 "{commandprefix}", help.getCommandPrefix(), +141 "{parameters}", entry.getParameterSyntax(), +142 "{separator}", entry.getDescription().isEmpty() ? "" : "-", +143 "{description}", entry.getDescription() +144 }; +145 } +146 +147 /** +148 * Override this to control replacements +149 * +150 * @param help +151 * @param param +152 * @param entry +153 * @return +154 */ +155 @NotNull +156 public String[] getParameterFormatReplacements(CommandHelp help, CommandParameter param, HelpEntry entry) { +157 //{name} {description} +158 return new String[]{ +159 "{name}", param.getName(), +160 "{syntax}", ACFUtil.nullDefault(param.getSyntax(), ""), +161 "{description}", ACFUtil.nullDefault(param.getDescription(), ""), +162 "{command}", help.getCommandName(), +163 "{fullcommand}", entry.getCommand(), +164 "{commandprefix}", help.getCommandPrefix() +165 }; +166 } +167}