From 29dd1787151a758fa658d180649d2f5ed45a9e45 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 30 Dec 2019 03:46:43 +0100 Subject: [PATCH] CONTINUE WORK LATER!!! --- .../hadder/commands/general/HelpCommand.java | 25 ++++++++++++++++--- .../com/bbn/hadder/utils/MessageEditor.java | 5 +--- .../Translations/Translations_en.properties | 4 ++- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index c564410..2028453 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -7,6 +7,7 @@ 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; @@ -56,15 +57,31 @@ public class HelpCommand implements Command { } } + public static class HelpInfo { + private String[] labels; + private String description; + private String usage; + private String example; + + public HelpInfo(String[] labels, String description, String usage, String example) { + this.labels = labels; + this.description = description; + this.usage = usage; + this.example = example; + } + } + public void sendHelp(Command cmd, CommandEvent event) { if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - String name = cmd.labels()[0]; + String name = labels()[0]; event.getChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, "", cmd.description()) + MessageEditor.MessageType.INFO) .setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())) - .addField(MessageEditor.getTerm(event, "commands.general.help.field.usage", "", ""), - event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + event.getMessageEditor().getTerm(cmd.usage()), false) + .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 + "") .build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index c5b10fe..81b94c2 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -113,10 +113,7 @@ public class MessageEditor { return this.handle(rethink.getLanguage(user.getId()), string, extra, extra_two); } - public static String getTerm(CommandEvent event, String string, String extra, String extra_two) { - return new MessageEditor(null, null) - .handle(event.getRethink().getLanguage(event.getAuthor().getId()), string, extra, extra_two); - } + private String handle(String language_code, String string, String extra, String extra_two) { Locale locale = new Locale(language_code); diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index d8cfb15..6ae7aee 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description: ** +commands.general.help.usage = **Usage\: ** +commands.general.help.example = **Example: ** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName]