Some Help command stuff

src/main/java/com/bbn/hadder/commands/Command.java

@@ -13,5 +13,5 @@ public interface Command {
 
     String usage();
 
-    String ex
+    String example();
 }

src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java

@@ -66,6 +66,11 @@ public class AvatarCommand implements Command {
 
     @Override
     public String usage() {
-        return "user/id";
+        return "[User]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder";
     }
 }

src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java

@@ -73,6 +73,11 @@ public class ClydeCommand implements Command {
 
     @Override
     public String usage() {
-        return "content";
+        return "[Content]";
+    }
+
+    @Override
+    public String example() {
+        return "Hey I am Clyde";
     }
 }

src/main/java/com/bbn/hadder/commands/fun/GifCommand.java

@@ -58,6 +58,11 @@ public class GifCommand implements Command {
 
     @Override
     public String usage() {
-        return "searchterm";
+        return "[Term]";
+    }
+
+    @Override
+    public String example() {
+        return "Cute cat";
     }
 }

src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java

@@ -57,6 +57,11 @@ public class MemeCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/general/AboutCommand.java

@@ -34,6 +34,11 @@ public class AboutCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java

@@ -50,6 +50,11 @@ public class EqualsCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/general/HelpCommand.java

@@ -7,7 +7,6 @@ import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -61,13 +60,17 @@ public class HelpCommand implements Command {
         if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
                 (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
             String name = labels()[0];
+            StringBuilder b = new StringBuilder();
+            b.append(event.getMessageEditor().getTerm("commands.general.help.description")).append(cmd.description()).append("\n");
+            if (!cmd.usage().equals(null)) {
+                b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.usage()).append("\n");
+            }
             event.getChannel().sendMessage(event.getMessageEditor().getMessage(
                     MessageEditor.MessageType.INFO)
                     .setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase()))
                     .setDescription(
-                            event.getMessageEditor().getTerm("commands.general.help.description") + cmd.description() + "\n" +
-                            event.getMessageEditor().getTerm("commands.general.help.usage") + event.getRethink().getGuildPrefix(event.getGuild().getId()) + name + " " + cmd.usage() + "\n" +
-                            event.getMessageEditor().getTerm("commands.general.help.example") + event.getRethink().getGuildPrefix(event.getGuild().getId()) + name + "")
+                            b.toString() +
+                            event.getMessageEditor().getTerm("commands.general.help.example") + event.getRethink().getGuildPrefix(event.getGuild().getId()) + name + cmd.example())
                     .build()).queue();
 
         }
@@ -85,6 +88,11 @@ public class HelpCommand implements Command {
 
     @Override
     public String usage() {
-        return "commands.general.help.help.label";
+        return "[Command name]";
+    }
+
+    @Override
+    public String example() {
+        return "ban";
     }
 }

src/main/java/com/bbn/hadder/commands/general/InviteCommand.java

@@ -37,6 +37,11 @@ public class InviteCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/general/PingCommand.java

@@ -31,6 +31,11 @@ public class PingCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java

@@ -65,6 +65,11 @@ public class FeedbackCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java

@@ -99,6 +99,11 @@ public class GitHubCommand implements Command {
 
     @Override
     public String usage() {
-        return "username";
+        return "[GH-name]";
+    }
+
+    @Override
+    public String example() {
+        return "GregTCLTK";
     }
 }

src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java

@@ -82,6 +82,11 @@ public class ScreenShareCommand implements Command {
 
     @Override
     public String usage() {
-        return "vc-name/id";
+        return "[Channel]";
+    }
+
+    @Override
+    public String example() {
+        return "Gaming-Lounge";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java

@@ -92,6 +92,11 @@ public class BanCommand implements Command {
 
     @Override
     public String usage() {
-        return "user";
+        return "[User(s)]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java

@@ -97,6 +97,11 @@ public class ClearCommand implements Command {
 
     @Override
     public String usage() {
-        return "number";
+        return "[Amount]";
+    }
+
+    @Override
+    public String example() {
+        return "69";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java

@@ -93,6 +93,11 @@ public class EditRulesCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java

@@ -70,6 +70,11 @@ public class InviteDetectCommand implements Command {
 
     @Override
     public String usage() {
-        return "<on/off>";
+        return "[on/off]";
+    }
+
+    @Override
+    public String example() {
+        return "on";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java

@@ -77,6 +77,11 @@ public class KickCommand implements Command {
 
     @Override
     public String usage() {
-        return "user";
+        return "[User(s)]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java

@@ -105,6 +105,11 @@ public class NickCommand implements Command {
 
     @Override
     public String usage() {
-        return "user+nickname";
+        return "[User(s)] [New nickname]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder Cutie";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java

@@ -46,6 +46,11 @@ public class PrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "prefix";
+        return "[New Prefix]";
+    }
+
+    @Override
+    public String example() {
+        return "!";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java

@@ -117,6 +117,11 @@ public class RegionChangeCommand implements Command {
 
     @Override
     public String usage() {
-        return "region";
+        return "[New region]";
+    }
+
+    @Override
+    public String example() {
+        return "frankfurt";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java

@@ -95,6 +95,11 @@ public class RoleCommand implements Command {
 
     @Override
     public String usage() {
-        return "add/remove <@role> <@user>";
+        return "[add/remove] [Role>] [User]";
+    }
+
+    @Override
+    public String example() {
+        return "add @Skidder @Epic-Gamer";
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java

@@ -230,6 +230,11 @@ public class RulesCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java

@@ -45,6 +45,11 @@ public class StarBoardCommand implements Command {
 
     @Override
     public String usage() {
-        return "<Channel id or channel mention> [Needed stars]";
+        return "[Channel] [Needed stars]";
+    }
+
+    @Override
+    public String example() {
+        return "#starboard 4";
     }
 }

src/main/java/com/bbn/hadder/commands/music/InfoCommand.java

@@ -40,6 +40,11 @@ public class InfoCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/music/JoinCommand.java

@@ -74,6 +74,11 @@ public class JoinCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java

@@ -40,6 +40,11 @@ public class LeaveCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/music/PlayCommand.java

@@ -52,6 +52,11 @@ public class PlayCommand implements Command {
 
     @Override
     public String usage() {
-        return "song";
+        return "[Song URL/Name]";
+    }
+
+    @Override
+    public String example() {
+        return "Last Christmas";
     }
 }

src/main/java/com/bbn/hadder/commands/music/QueueCommand.java

@@ -44,6 +44,11 @@ public class QueueCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/music/SkipCommand.java

@@ -36,6 +36,11 @@ public class SkipCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/music/StopCommand.java

@@ -39,6 +39,11 @@ public class StopCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java

@@ -24,7 +24,6 @@ public class AnalCommand implements Command {
             Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/").build();
 
             try {
-
                 Response response = caller.newCall(request).execute();
                 JSONObject json = new JSONObject(response.body().string());
                 JSONObject data = json.getJSONObject("data");
@@ -58,6 +57,11 @@ public class AnalCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java

@@ -24,7 +24,6 @@ public class BDSMCommand implements Command {
             Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd").build();
 
             try {
-
                 Response response = caller.newCall(request).execute();
                 JSONObject json = new JSONObject(response.body().string());
                 JSONObject data = json.getJSONObject("data");
@@ -58,6 +57,11 @@ public class BDSMCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java

@@ -54,6 +54,11 @@ public class BlowjobCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java

@@ -58,6 +58,11 @@ public class BoobsCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java

@@ -58,6 +58,11 @@ public class CumCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java

@@ -54,6 +54,11 @@ public class EroticCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java

@@ -58,6 +58,11 @@ public class FeetCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java

@@ -58,6 +58,11 @@ public class FingeringCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java

@@ -58,6 +58,11 @@ public class LickingCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java

@@ -58,6 +58,11 @@ public class PornCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java

@@ -54,6 +54,11 @@ public class PussyCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java

@@ -62,6 +62,11 @@ public class RandomPornCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java

@@ -58,6 +58,11 @@ event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEd
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java

@@ -59,6 +59,11 @@ public class SpankCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java

@@ -55,6 +55,11 @@ public class TransCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java

@@ -102,6 +102,11 @@ public class EvalCommand implements Command {
 
     @Override
     public String usage() {
-        return "commands.owner.eval.help.usage";
+        return "[Code]";
+    }
+
+    @Override
+    public String example() {
+        return "System.out.println(\"Hey\")";
     }
 }

src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java

@@ -46,6 +46,11 @@ public class GuildLeaveCommand implements Command {
 
     @Override
     public String usage() {
-        return "guildid";
+        return "[Guild-ID]";
+    }
+
+    @Override
+    public String example() {
+        return "366971954244354048";
     }
 }

src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java

@@ -29,6 +29,11 @@ public class RebootCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java

@@ -33,6 +33,11 @@ public class ShutdownCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/owner/TestCommand.java

@@ -28,6 +28,11 @@ public class TestCommand implements Command {
 
     @Override
     public String usage() {
-        return "";
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
     }
 }

src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java

@@ -64,6 +64,11 @@ public class LanguageCommand implements Command {
 
     @Override
     public String usage() {
-        return "commands.settings.language.help.usage";
+        return "[Language code]";
+    }
+
+    @Override
+    public String example() {
+        return "de";
     }
 }

src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java

@@ -36,6 +36,11 @@ public class UserPrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "userprefix";
+        return "[New Prefix]";
+    }
+
+    @Override
+    public String example() {
+        return "!";
     }
 }