pom.xml

@@ -31,11 +31,6 @@
         <artifactId>rethinkdb-driver</artifactId>
         <version>2.3.3</version>
       </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.8.6</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

src/main/java/com/bbn/hadder/Hadder.java

@@ -97,6 +97,7 @@ public class Hadder {
                         new InfoCommand(),
                         new SkipCommand(),
                         new EditRulesCommand(),
+                        new VolumeCommand(),
                         new StopCommand()), config, helpCommand);
 
         builder.addEventListeners(

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

@@ -29,12 +29,12 @@ public class ScreenShareCommand implements Command {
             } else {
                 List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
                 if (vcs.size() > 1) {
-                    EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.ERROR, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description");
+                    EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.WARNING, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description");
                     for (int i = 0; i < vcs.size(); i++) {
                         VoiceChannel voiceChannel = vcs.get(i);
                         eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
                     }
-                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).build()).queue();
+                    event.getChannel().sendMessage(eb.build()).queue();
                     new EventWaiter().newOnMessageEventWaiter(msgevent -> {
                         try {
                             int i = Integer.parseInt(msgevent.getMessage().getContentRaw());

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

@@ -35,14 +35,14 @@ public class BanCommand implements Command {
                 } else {
                     event.getTextChannel().sendMessage(
                             event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.WARNING,
+                                    MessageEditor.MessageType.ERROR,
                                     "commands.moderation.ban.error.title",
                                     "commands.moderation.ban.myself.error.description").build()).queue();
                 }
             } else {
                 event.getTextChannel().sendMessage
                         (event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.WARNING,
+                                MessageEditor.MessageType.ERROR,
                                 "commands.moderation.ban.error.title",
                                 "commands.moderation.ban.yourself.error.description").build()).queue();
             }
@@ -61,13 +61,13 @@ public class BanCommand implements Command {
                     } else {
                         event.getTextChannel().sendMessage(
                                 event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.WARNING,
+                                        MessageEditor.MessageType.ERROR,
                                         "commands.moderation.ban.error.title",
                                         "commands.moderation.ban.myself.error.description").build()).queue();
                     }
                 } else {
                     event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.WARNING,
+                            MessageEditor.MessageType.ERROR,
                             "commands.moderation.ban.error.title",
                             "commands.moderation.ban.yourself.error.description").build()).queue();
                 }

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

@@ -45,7 +45,7 @@ public class ClearCommand implements Command {
                     try {
                         int nbToDelete = Integer.parseInt(args[0]);
                         if (nbToDelete < 1 || nbToDelete > 99) {
-                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "", "commands.moderation.clear.number.error.description").build()).queue();
+                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.number.error.title", "commands.moderation.clear.number.error.description").build()).queue();
                         } else {
                             List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
                             List<Message> msgToDelete = new ArrayList<>(history);
@@ -73,7 +73,7 @@ public class ClearCommand implements Command {
                     } catch (NumberFormatException e) {
                         event.getHelpCommand().sendHelp(this, event);
                     } catch (IllegalArgumentException e) {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description")
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description")
                                 .build()).queue();
                     }
                 }

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

@@ -29,7 +29,7 @@ public class InviteDetectCommand implements Command {
                                         .build()).queue();
                     } else {
                         event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.WARNING,
+                                MessageEditor.MessageType.ERROR,
                                 "commands.moderation.invitedetect.activate.error.title",
                                 "commands.moderation.invitedetect.activate.error.description")
                                 .build()).queue();
@@ -46,7 +46,7 @@ public class InviteDetectCommand implements Command {
                                 .build()).queue();
                     } else {
                         event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.WARNING,
+                                MessageEditor.MessageType.ERROR,
                                 "commands.moderation.invitedetect.deactivate.error.title",
                                 "commands.moderation.invitedetect.deactivate.error.description")
                                 .build()).queue();

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

@@ -35,12 +35,12 @@ public class KickCommand implements Command {
                 } else {
                     event.getTextChannel().sendMessage(
                             event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.WARNING,
+                                    MessageEditor.MessageType.ERROR,
                                     "commands.moderation.kick.error.title",
                                     "commands.moderation.kick.myself.error.description").build()).queue();
                 }
             } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
             }
         } else if (event.getMessage().getMentionedMembers().size() == 0) {
             event.getHelpCommand().sendHelp(this, event);
@@ -55,10 +55,10 @@ public class KickCommand implements Command {
                             event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
                         }
                     } else {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue();
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue();
                     }
                 } else {
-                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
+                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
                 }
             }
             event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();

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

@@ -13,7 +13,6 @@ public class PrefixCommand implements Command {
     public void executed(String[] args, CommandEvent event) {
         if (args.length == 1) {
             if (!args[0].contains("\"")) {
-
                 event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
                 event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
                         MessageEditor.MessageType.INFO,

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

@@ -88,7 +88,7 @@ public class RulesCommand implements Command {
                         } else {
                             event3.getChannel().sendMessage(
                                     event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.WARNING,
+                                            MessageEditor.MessageType.ERROR,
                                             "commands.moderation.rules.role.error.title",
                                             "commands.moderation.rules.role.error.description")
                                     .build()).queue();
@@ -104,7 +104,7 @@ public class RulesCommand implements Command {
         } else {
             event.getTextChannel().sendMessage(
                     event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.WARNING,
+                            MessageEditor.MessageType.ERROR,
                             "commands.moderation.rules.guild.error.title",
                             "commands.moderation.rules.guild.error.description")
                     .build()).queue();
@@ -160,7 +160,7 @@ public class RulesCommand implements Command {
                         } else {
                             event.getTextChannel().sendMessage(
                                     event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.WARNING,
+                                            MessageEditor.MessageType.ERROR,
                                             "commands.moderation.rules.emote.error.equal.title",
                                             "commands.moderation.rules.emote.error.equal.description")
                                     .build()).queue();
@@ -205,7 +205,7 @@ public class RulesCommand implements Command {
                         } else {
                             event.getTextChannel().sendMessage(
                                     event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.WARNING,
+                                            MessageEditor.MessageType.ERROR,
                                             "commands.moderation.rules.emote.error.equal.title",
                                             "commands.moderation.rules.emote.error.equal.description")
                                     .build()).queue();

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

@@ -55,7 +55,7 @@ public class JoinCommand implements Command {
             }
         } else {
             event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                MessageEditor.MessageType.WARNING,
+                MessageEditor.MessageType.ERROR,
                 "commands.music.join.error.channel.title",
                 "commands.music.join.error.channel.description")
                     .build()).queue();

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

@@ -21,7 +21,7 @@ public class LeaveCommand implements Command {
                     .build()).queue();
         } else {
             event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                MessageEditor.MessageType.WARNING,
+                MessageEditor.MessageType.ERROR,
                 "commands.music.leave.error.tile",
                 "commands.music.leave.error.description")
                     .build()).queue();

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

@@ -32,7 +32,7 @@ public class PlayCommand implements Command {
                 }
             } else {
                 event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.WARNING,
+                        MessageEditor.MessageType.ERROR,
                         "commands.music.join.error.channel.title",
                         "commands.music.join.error.channel.description")
                         .build()).queue();

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

@@ -16,7 +16,7 @@ public class QueueCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (!event.getAudioManager().hasPlayer(event.getGuild()) || event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING,
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
                     "commands.music.queue.error.title",
                     "commands.music.queue.error.description"
             ).build()).queue();

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

@@ -0,0 +1,61 @@
+package com.bbn.hadder.commands.music;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+/**
+ * @author Skidder / GregTCLTK
+ */
+
+public class VolumeCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
+                try {
+                    int volume = Integer.parseInt(args[0]);
+                    if (volume < 200 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getId())) {
+                        event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume);
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                                "commands.music.volume.success.title", "",
+                                "commands.music.volume.success.description", String.valueOf(volume)).build()).queue();
+                    } else {
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                                "commands.music.volume.error.int.title",
+                                "commands.music.volume.error.int.description").build()).queue();
+                    }
+                } catch (NumberFormatException e) {
+                    event.getHelpCommand().sendHelp(this, event);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.music.info.error.title",
+                        "commands.music.info.error.description").build()).queue();
+            }
+        } else event.getHelpCommand().sendHelp(this, event);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"volume"};
+    }
+
+    @Override
+    public String description() {
+        return "Change the volume of the music.";
+    }
+
+    @Override
+    public String usage() {
+        return "[New volume]";
+    }
+
+    @Override
+    public String example() {
+        return "100";
+    }
+}

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

@@ -27,7 +27,7 @@ public class GuildLeaveCommand implements Command {
                                 .build())
                         .queue();
             } catch (Exception e) {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
             }
         } else {
             event.getHelpCommand().sendHelp(this, event);

src/main/resources/Translations/Translations_en.properties

@@ -4,20 +4,6 @@
 
 Hadder = Hadder
 
-user = <@User>
-searchterm = <SearchTerm>
-username = <Username>
-number = <Number>/all
-prefix = <New Prefix>
-userprefix = <New User-Prefix>
-vc-name/id = <VoiceChannelID|VoiceChannelName>
-user+nickname = <@user> <New Nickname>
-region = <region>
-guildid = <Guild-ID>
-content = <Message-content>
-song = <Song>
-user/id= [@User]/[ID]
-
 error = Error
 none = None
 success\! = Success\!
@@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext
 commands.moderation.ban.help.description = Bans one or more users from the server.
 commands.moderation.lear.all.success.title = Successfully deleted
 commands.moderation.lear.all.success.description = I successfully deleted %extra% messages.
+commands.moderation.clear.number.error.title = Invalid number
 commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
 commands.moderation.clear.success.title = Successfully cleared
 commands.moderation.clear.success.description.singular = Successfully deleted one message.
@@ -221,6 +208,10 @@ commands.music.queue.help.description = Shows the music queue
 commands.music.skip.success.title = Successfully skipped
 commands.music.skip.success.description = I successfully skipped to the next song
 commands.music.skip.help.description = Skips the currently playing song
+commands.music.volume.success.title = Successfully set
+commands.music.volume.success.description = I successfully set the new volume to %extra%
+commands.music.volume.error.int.title = Invalid number
+commands.music.volume.error.int.description = The volume have to be between 1 and 200
 
 commands.nsfw.gif.error.title = GIF not showing? Click here
 commands.nsfw.img.error.title = Image not showing? Click here