2 files changed, 100 insertions, 69 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
index 3ca82e7..3e1c995 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
@@ -12,31 +12,48 @@ import org.apache.commons.lang3.StringUtils;
 
 public class Commands {
 
-    private static final SimpleCommand.ProcessCommandRunnable settingsRunnable = new SimpleCommand.ProcessCommandRunnable() {
-        public void processCommand(ICommandSender sender, String[] args) {
-            if(args.length > 0) {
-                SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config, StringUtils.join(args, " ")));
-            } else {
-                SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config));
-            }
-        }
-    };
-
-    private static final SimpleCommand settingsCommand = new SimpleCommand("sbh", settingsRunnable);
-    private static final SimpleCommand settingsCommand2 = new SimpleCommand("sbhsettings", settingsRunnable);
-    private static final SimpleCommand settingsCommand3 = new SimpleCommand("sbhud", settingsRunnable);
+  private static final SimpleCommand.ProcessCommandRunnable settingsRunnable = new SimpleCommand.ProcessCommandRunnable() {
+    public void processCommand(ICommandSender sender, String[] args) {
+      if (args.length > 0) {
+        SkyblockHud.screenToOpen =
+          new GuiScreenElementWrapper(
+            new SBHConfigEditor(SkyblockHud.config, StringUtils.join(args, " "))
+          );
+      } else {
+        SkyblockHud.screenToOpen =
+          new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config));
+      }
+    }
+  };
 
-    private static final SimpleCommand mapCommand = new SimpleCommand("sbhmap", new SimpleCommand.ProcessCommandRunnable() {
-        public void processCommand(ICommandSender sender, String[] args) {
-            if (LocationHandler.getCurrentLocation().getCategory().getMap() != null)
-                SkyblockHud.screenToOpen = new MapHandler.MapScreen();
-        }
-    });
+  private static final SimpleCommand settingsCommand = new SimpleCommand(
+    "sbh",
+    settingsRunnable
+  );
+  private static final SimpleCommand settingsCommand2 = new SimpleCommand(
+    "sbhsettings",
+    settingsRunnable
+  );
+  private static final SimpleCommand settingsCommand3 = new SimpleCommand(
+    "sbhud",
+    settingsRunnable
+  );
 
-    public static void init(){
-        ClientCommandHandler.instance.registerCommand(settingsCommand);
-        ClientCommandHandler.instance.registerCommand(settingsCommand2);
-        ClientCommandHandler.instance.registerCommand(settingsCommand3);
-        ClientCommandHandler.instance.registerCommand(mapCommand);
+  private static final SimpleCommand mapCommand = new SimpleCommand(
+    "sbhmap",
+    new SimpleCommand.ProcessCommandRunnable() {
+      public void processCommand(ICommandSender sender, String[] args) {
+        if (
+          LocationHandler.getCurrentLocation().getCategory().getMap() != null
+        ) SkyblockHud.screenToOpen = new MapHandler.MapScreen();
+      }
     }
+  );
+
+  public static void init() {
+    ClientCommandHandler.instance.registerCommand(settingsCommand);
+    ClientCommandHandler.instance.registerCommand(settingsCommand2);
+    ClientCommandHandler.instance.registerCommand(settingsCommand3);
+    ClientCommandHandler.instance.registerCommand(mapCommand);
+  }
 }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java b/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java
index 7fc7920..49a02a8 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java
@@ -1,58 +1,72 @@
 package com.thatgravyboat.skyblockhud.commands;
 
+import java.util.List;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.BlockPos;
 
-import java.util.List;
-
 /**
  @author Moulberry
  **/
 public class SimpleCommand extends CommandBase {
 
-    private String commandName;
-    private ProcessCommandRunnable runnable;
-    private TabCompleteRunnable tabRunnable;
-
-    public SimpleCommand(String commandName, ProcessCommandRunnable runnable) {
-        this.commandName = commandName;
-        this.runnable = runnable;
-    }
-
-    public SimpleCommand(String commandName, ProcessCommandRunnable runnable, TabCompleteRunnable tabRunnable) {
-        this.commandName = commandName;
-        this.runnable = runnable;
-        this.tabRunnable = tabRunnable;
-    }
-
-    public abstract static class ProcessCommandRunnable {
-        public abstract void processCommand(ICommandSender sender, String[] args);
-    }
-
-    public abstract static class TabCompleteRunnable {
-        public abstract List<String> tabComplete(ICommandSender sender, String[] args, BlockPos pos);
-    }
-
-    public boolean canCommandSenderUseCommand(ICommandSender sender) {
-        return true;
-    }
-
-    public String getCommandName() {
-        return commandName;
-    }
-
-    public String getCommandUsage(ICommandSender sender) {
-        return "/" + commandName;
-    }
-
-    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
-        runnable.processCommand(sender, args);
-    }
-
-    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
-        if(tabRunnable != null) return tabRunnable.tabComplete(sender, args, pos);
-        return null;
-    }
+  private String commandName;
+  private ProcessCommandRunnable runnable;
+  private TabCompleteRunnable tabRunnable;
+
+  public SimpleCommand(String commandName, ProcessCommandRunnable runnable) {
+    this.commandName = commandName;
+    this.runnable = runnable;
+  }
+
+  public SimpleCommand(
+    String commandName,
+    ProcessCommandRunnable runnable,
+    TabCompleteRunnable tabRunnable
+  ) {
+    this.commandName = commandName;
+    this.runnable = runnable;
+    this.tabRunnable = tabRunnable;
+  }
+
+  public abstract static class ProcessCommandRunnable {
+
+    public abstract void processCommand(ICommandSender sender, String[] args);
+  }
+
+  public abstract static class TabCompleteRunnable {
+
+    public abstract List<String> tabComplete(
+      ICommandSender sender,
+      String[] args,
+      BlockPos pos
+    );
+  }
+
+  public boolean canCommandSenderUseCommand(ICommandSender sender) {
+    return true;
+  }
+
+  public String getCommandName() {
+    return commandName;
+  }
+
+  public String getCommandUsage(ICommandSender sender) {
+    return "/" + commandName;
+  }
+
+  public void processCommand(ICommandSender sender, String[] args)
+    throws CommandException {
+    runnable.processCommand(sender, args);
+  }
+
+  public List<String> addTabCompletionOptions(
+    ICommandSender sender,
+    String[] args,
+    BlockPos pos
+  ) {
+    if (tabRunnable != null) return tabRunnable.tabComplete(sender, args, pos);
+    return null;
+  }
 }