diff --git a/languages/en-GB.yml b/languages/en-GB.yml index 14c541ee0..eb3deed10 100644 --- a/languages/en-GB.yml +++ b/languages/en-GB.yml @@ -456,6 +456,7 @@ command: funFact: "Just some random facts!" game: "Access Ree6 internal Games." hornyjail: "Put someone into the Horny-Jail." + hornyjail_slash: "Put someone into the Not-Well-Behaved-Jail." hug: "Hug someone you like!" kiss: "Kiss someone!" manga: "Search for mangas on kitsu.io!" @@ -510,6 +511,7 @@ command: volume: "Change the Volume of the current Track." nsfw: "Shows a random NSFW Image." rule34: "Shows a random Rule34 Image." + rule34_slash: "Shows not safe for work Images from a specific Website." category: info: "Used to gather information or provide information." moderation: "Moderation Tools that can help you manager Users or prevent rule breaking on the Server." diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java b/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java index a1b94a840..2b3eff4fa 100644 --- a/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java +++ b/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java @@ -53,7 +53,7 @@ public void onPerform(CommandEvent commandEvent) { */ @Override public CommandData getCommandData() { - return new CommandDataImpl("hornyjail", LanguageService.getDefault("command.description.hornyjail")).addOptions(new OptionData(OptionType.USER, "target", "The User that should be put into the Hornyjail!").setRequired(true)); + return new CommandDataImpl("behavejail", LanguageService.getDefault("command.description.hornyjail_slash")).addOptions(new OptionData(OptionType.USER, "target", "The User that should be put into the Hornyjail!").setRequired(true)); } /** diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java b/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java index 3d72f929b..f4978442b 100644 --- a/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java +++ b/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java @@ -31,7 +31,7 @@ public void onPerform(CommandEvent commandEvent) { if (!jsonObject.has("series")) { em.setTitle("Error!"); em.setColor(Color.RED); - em.setDescription(commandEvent.getResource("command.default.retrievalError")); + em.setDescription(commandEvent.getResource("message.default.retrievalError")); em.setFooter(commandEvent.getMember().getUser().getAsTag() + " - " + Data.ADVERTISEMENT, commandEvent.getMember().getUser().getAvatarUrl()); commandEvent.reply(em.build()); return; @@ -40,8 +40,8 @@ public void onPerform(CommandEvent commandEvent) { JsonObject jsonObject1 = jsonObject.get("series").getAsJsonObject(); em.setImage((jsonObject.has("display_picture") ? jsonObject.get("display_picture").getAsString() : "https://images.ree6.de/notfound.png")); - em.addField("**" + commandEvent.getResource("label.character") + "**", "``" + (jsonObject.has("name") ? jsonObject.get("name").getAsString() : commandEvent.getResource("command.default.retrievalError")) + "``", true); - em.addField("**" + commandEvent.getResource("label.from") + "**", "``" + (jsonObject1.has("name") ? jsonObject1.get("name").getAsString() : commandEvent.getResource("command.default.retrievalError")) + "``", true); + em.addField("**" + commandEvent.getResource("label.character") + "**", "``" + (jsonObject.has("name") ? jsonObject.get("name").getAsString() : commandEvent.getResource("message.default.retrievalError")) + "``", true); + em.addField("**" + commandEvent.getResource("label.from") + "**", "``" + (jsonObject1.has("name") ? jsonObject1.get("name").getAsString() : commandEvent.getResource("message.default.retrievalError")) + "``", true); if((jsonObject.has("nsfw") && jsonObject.get("nsfw").getAsBoolean())) { em.addField("**NSFW**", "", true); } diff --git a/src/main/java/de/presti/ree6/commands/impl/nsfw/Rule34.java b/src/main/java/de/presti/ree6/commands/impl/nsfw/Rule34.java index 3b5c74264..738507727 100644 --- a/src/main/java/de/presti/ree6/commands/impl/nsfw/Rule34.java +++ b/src/main/java/de/presti/ree6/commands/impl/nsfw/Rule34.java @@ -131,7 +131,7 @@ public void sendImage(CommandEvent commandEvent, Message message, String tags) { */ @Override public CommandData getCommandData() { - return new CommandDataImpl("r34", LanguageService.getDefault("command.description.rule34")) + return new CommandDataImpl("r34", LanguageService.getDefault("command.description.rule34_slash")) .addOptions(new OptionData(OptionType.STRING, "tags", "Tags for the image search")); }