code cleanup

src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java

@@ -16,23 +16,16 @@
 package com.jagrosh.jmusicbot.commands.dj;
 
 import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.menu.ButtonMenu;
 import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.audio.AudioHandler;
 import com.jagrosh.jmusicbot.audio.QueuedTrack;
 import com.jagrosh.jmusicbot.commands.DJCommand;
-import com.jagrosh.jmusicbot.commands.music.PlayCmd;
-import static com.jagrosh.jmusicbot.commands.music.PlayCmd.CANCEL;
-import static com.jagrosh.jmusicbot.commands.music.PlayCmd.LOAD;
 import com.jagrosh.jmusicbot.utils.FormatUtil;
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import java.util.concurrent.TimeUnit;
-import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.exceptions.PermissionException;
 
 /**
  *
@@ -69,9 +62,9 @@ public class PlaynextCmd extends DJCommand
     
     private class ResultHandler implements AudioLoadResultHandler
     {
-        final Message m;
-        final CommandEvent event;
-        final boolean ytsearch;
+        private final Message m;
+        private final CommandEvent event;
+        private final boolean ytsearch;
         
         private ResultHandler(Message m, CommandEvent event, boolean ytsearch)
         {

src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java

@@ -63,5 +63,5 @@ public class RepeatCmd extends DJCommand
     }
 
     @Override
-    public void doCommand(CommandEvent event) {}
+    public void doCommand(CommandEvent event) { /* Intentionally Empty */ }
 }

src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java

@@ -17,7 +17,6 @@ package com.jagrosh.jmusicbot.commands.general;
 
 import com.jagrosh.jdautilities.command.Command;
 import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jmusicbot.Bot;
 import com.jagrosh.jmusicbot.settings.Settings;
 import net.dv8tion.jda.core.EmbedBuilder;
 import net.dv8tion.jda.core.MessageBuilder;

src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java

@@ -99,9 +99,9 @@ public class PlayCmd extends MusicCommand
     
     private class ResultHandler implements AudioLoadResultHandler
     {
-        final Message m;
-        final CommandEvent event;
-        final boolean ytsearch;
+        private final Message m;
+        private final CommandEvent event;
+        private final boolean ytsearch;
         
         private ResultHandler(Message m, CommandEvent event, boolean ytsearch)
         {

src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java

@@ -73,8 +73,9 @@ public class SearchCmd extends MusicCommand
     
     private class ResultHandler implements AudioLoadResultHandler 
     {
-        final Message m;
-        final CommandEvent event;
+        private final Message m;
+        private final CommandEvent event;
+        
         private ResultHandler(Message m, CommandEvent event)
         {
             this.m = m;

src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java

@@ -27,8 +27,11 @@ import com.jagrosh.jmusicbot.commands.OwnerCommand;
  */
 public class EvalCmd extends OwnerCommand 
 {
+    private final Bot bot;
+    
     public EvalCmd(Bot bot)
     {
+        this.bot = bot;
         this.name = "eval";
         this.help = "evaluates nashorn code";
         this.guildOnly = false;
@@ -38,6 +41,7 @@ public class EvalCmd extends OwnerCommand
     protected void execute(CommandEvent event) 
     {
         ScriptEngine se = new ScriptEngineManager().getEngineByName("Nashorn");
+        se.put("bot", bot);
         se.put("event", event);
         se.put("jda", event.getJDA());
         se.put("guild", event.getGuild());

src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java

@@ -26,7 +26,7 @@ import net.dv8tion.jda.core.exceptions.RateLimitedException;
  */
 public class SetnameCmd extends OwnerCommand
 {
-    public SetnameCmd(Bot bot)
+    public SetnameCmd()
     {
         this.name = "setname";
         this.help = "sets the name of the bot";
@@ -37,13 +37,18 @@ public class SetnameCmd extends OwnerCommand
     @Override
     protected void execute(CommandEvent event) 
     {
-        try {
+        try 
+        {
             String oldname = event.getSelfUser().getName();
             event.getSelfUser().getManager().setName(event.getArgs()).complete(false);
             event.reply(event.getClient().getSuccess()+" Name changed from `"+oldname+"` to `"+event.getArgs()+"`");
-        } catch(RateLimitedException e) {
+        } 
+        catch(RateLimitedException e) 
+        {
             event.reply(event.getClient().getError()+" Name can only be changed twice per hour!");
-        } catch(Exception e) {
+        }
+        catch(Exception e) 
+        {
             event.reply(event.getClient().getError()+" That name is not valid!");
         }
     }