Code Clean Up (#2)

* intellij code clean up

* optimize imports

* format

* intellij suggestions

* fix empty catch issues

1 files changed, 207 insertions, 220 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
index 9fbe27dd..591d7053 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
@@ -25,7 +25,6 @@ import io.github.moulberry.notenoughupdates.options.NEUConfigEditor;
 import io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer;
 import io.github.moulberry.notenoughupdates.profileviewer.PlayerStats;
 import io.github.moulberry.notenoughupdates.util.Constants;
-import io.github.moulberry.notenoughupdates.util.SBInfo;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.client.Minecraft;
@@ -40,23 +39,17 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.*;
 import net.minecraft.world.storage.MapData;
 import net.minecraftforge.client.ClientCommandHandler;
-import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.ModContainer;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.text.WordUtils;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
-import java.awt.datatransfer.StringSelection;
 import java.io.*;
-import java.lang.management.ManagementFactory;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -64,7 +57,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class Commands {
 
-    public Commands(){
+    public Commands() {
         //ClientCommandHandler.instance.registerCommand(collectionLogCommand);
         //ClientCommandHandler.instance.registerCommand(collectionLogCommand2);
         ClientCommandHandler.instance.registerCommand(nullzeeSphereCommand);
@@ -85,9 +78,9 @@ public class Commands {
         ClientCommandHandler.instance.registerCommand(customizeCommand2);
         ClientCommandHandler.instance.registerCommand(devTestCommand);
         ClientCommandHandler.instance.registerCommand(packDevCommand);
-        if(!Loader.isModLoaded("skyblockextras")) ClientCommandHandler.instance.registerCommand(viewCataCommand);
+        if (!Loader.isModLoaded("skyblockextras")) ClientCommandHandler.instance.registerCommand(viewCataCommand);
         ClientCommandHandler.instance.registerCommand(peekCommand);
-//        ClientCommandHandler.instance.registerCommand(tutorialCommand);
+        //ClientCommandHandler.instance.registerCommand(tutorialCommand);
         ClientCommandHandler.instance.registerCommand(overlayPlacementsCommand);
         ClientCommandHandler.instance.registerCommand(enchantColourCommand);
         ClientCommandHandler.instance.registerCommand(neuAhCommand);
@@ -115,16 +108,16 @@ public class Commands {
 
     SimpleCommand nullzeeSphereCommand = new SimpleCommand("neuzeesphere", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
-            if(args.length != 1) {
-                sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"Usage: /neuzeesphere [on/off] or /neuzeesphere (radius) or /neuzeesphere setCenter"));
+            if (args.length != 1) {
+                sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /neuzeesphere [on/off] or /neuzeesphere (radius) or /neuzeesphere setCenter"));
                 return;
             }
-            if(args[0].equalsIgnoreCase("on")) {
+            if (args[0].equalsIgnoreCase("on")) {
                 NullzeeSphere.enabled = true;
-            } else if(args[0].equalsIgnoreCase("off")) {
+            } else if (args[0].equalsIgnoreCase("off")) {
                 NullzeeSphere.enabled = false;
-            } else if(args[0].equalsIgnoreCase("setCenter")) {
-                EntityPlayerSP p = ((EntityPlayerSP)sender);
+            } else if (args[0].equalsIgnoreCase("setCenter")) {
+                EntityPlayerSP p = ((EntityPlayerSP) sender);
                 NullzeeSphere.centerPos = new BlockPos(p.posX, p.posY, p.posZ);
                 NullzeeSphere.overlayVBO = null;
             } else {
@@ -132,8 +125,8 @@ public class Commands {
                     float radius = Float.parseFloat(args[0]);
                     NullzeeSphere.size = radius;
                     NullzeeSphere.overlayVBO = null;
-                } catch(Exception e) {
-                    sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"Can't parse radius: " + args[0]));
+                } catch (Exception e) {
+                    sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Can't parse radius: " + args[0]));
                 }
             }
         }
@@ -141,18 +134,18 @@ public class Commands {
 
     /*SimpleCommand itemRenameCommand = new SimpleCommand("neurename", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
-            if(args.length == 0) {
+            if (args.length == 0) {
                 args = new String[]{"help"};
             }
             String heldUUID = NotEnoughUpdates.INSTANCE.manager.getUUIDForItem(Minecraft.getMinecraft().thePlayer.getHeldItem());
-            switch(args[0].toLowerCase()) {
+            switch (args[0].toLowerCase()) {
                 case "clearall":
                     NotEnoughUpdates.INSTANCE.manager.itemRenameJson = new JsonObject();
                     NotEnoughUpdates.INSTANCE.manager.saveItemRenameConfig();
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "[NEU] Cleared custom name for all items"));
                     break;
                 case "clear":
-                    if(heldUUID == null) {
+                    if (heldUUID == null) {
                         sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[NEU] Can't clear rename - no UUID"));
                         return;
                     }
@@ -161,7 +154,7 @@ public class Commands {
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "[NEU] Cleared custom name for held item"));
                     break;
                 case "copyuuid":
-                    if(heldUUID == null) {
+                    if (heldUUID == null) {
                         sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[NEU] Can't clear rename - no UUID"));
                         return;
                     }
@@ -170,33 +163,33 @@ public class Commands {
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "[NEU] UUID copied to clipboard"));
                     break;
                 case "uuid":
-                    if(heldUUID == null) {
+                    if (heldUUID == null) {
                         sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[NEU] Can't get UUID - no UUID"));
                         return;
                     }
                     ChatStyle style = new ChatStyle();
                     style.setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
-                            new ChatComponentText(EnumChatFormatting.GRAY+"Click to copy to clipboard")));
+                            new ChatComponentText(EnumChatFormatting.GRAY + "Click to copy to clipboard")));
                     style.setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/neurename copyuuid"));
 
-                    ChatComponentText text = new ChatComponentText(EnumChatFormatting.YELLOW+"[NEU] The UUID of your currently held item is: " +
+                    ChatComponentText text = new ChatComponentText(EnumChatFormatting.YELLOW + "[NEU] The UUID of your currently held item is: " +
                             EnumChatFormatting.GREEN + heldUUID);
                     text.setChatStyle(style);
                     sender.addChatMessage(text);
                     break;
                 case "set":
-                    if(heldUUID == null) {
+                    if (heldUUID == null) {
                         sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[NEU] Can't rename item - no UUID"));
                         return;
                     }
-                    if(args.length == 1) {
+                    if (args.length == 1) {
                         sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[NEU] Usage: /neurename set [name...]"));
                         return;
                     }
                     StringBuilder sb = new StringBuilder();
-                    for(int i=1; i<args.length; i++) {
+                    for (int i = 1; i < args.length; i++) {
                         sb.append(args[i]);
-                        if(i<args.length-1) sb.append(" ");
+                        if (i < args.length - 1) sb.append(" ");
                     }
                     String name = sb.toString()
                             .replace("\\&", "{amp}")
@@ -208,7 +201,7 @@ public class Commands {
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "[NEU] Set custom name for held item"));
                     break;
                 default:
-                    sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[NEU] Unknown subcommand \""+args[0]+"\""));
+                    sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[NEU] Unknown subcommand \"" + args[0] + "\""));
                 case "help":
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "[NEU] Available commands:"));
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "help: Print this message"));
@@ -255,21 +248,17 @@ public class Commands {
                     "",
                     "\u00a76\u00a7lDev commands:",
                     "\u00a76/neupackdev \u00a7r\u00a77- pack creator command - getnpc");
-            for (int i = 0; i < neuHelpMessages.size(); i++) {
-                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(neuHelpMessages.get(i)
-                ));
-
+            for (String neuHelpMessage : neuHelpMessages) {
+                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(neuHelpMessage));
             }
-            if(NotEnoughUpdates.INSTANCE.config.hidden.dev) {
+            if (NotEnoughUpdates.INSTANCE.config.hidden.dev) {
                 ArrayList<String> neuDevHelpMessages = Lists.newArrayList(
                         "\u00a76/neudevtest \u00a7r\u00a77- dev test command",
                         "\u00a76/neuzeephere \u00a7r\u00a77- sphere",
                         "\u00a76/neudungeonwintest \u00a7r\u00a77- displays the dungeon win screen");
 
-                for (int i = 0; i < neuDevHelpMessages.size(); i++) {
-                    Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(neuDevHelpMessages.get(i)
-                    ));
-
+                for (String neuDevHelpMessage : neuDevHelpMessages) {
+                    Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(neuDevHelpMessage));
                 }
             }
             Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
@@ -284,9 +273,9 @@ public class Commands {
     SimpleCommand neuFeatures = new SimpleCommand("neufeatures", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
             Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-            if(Constants.MISC == null || !Constants.MISC.has("featureslist")){
-                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""+EnumChatFormatting.DARK_RED+EnumChatFormatting.BOLD+"WARNING: "+EnumChatFormatting.RESET+EnumChatFormatting.RED+"Could not load URL from repo."));
-                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""+EnumChatFormatting.RED+ "Please run "+EnumChatFormatting.BOLD+"/neuresetrepo"+EnumChatFormatting.RESET+EnumChatFormatting.RED+" and "+EnumChatFormatting.BOLD+"restart your game"+EnumChatFormatting.RESET+EnumChatFormatting.RED+" in order to fix. "+EnumChatFormatting.DARK_RED+EnumChatFormatting.BOLD+"If that doesn't fix it"+EnumChatFormatting.RESET+EnumChatFormatting.RED+", please join discord.gg/moulberry and post in #neu-support"));
+            if (Constants.MISC == null || !Constants.MISC.has("featureslist")) {
+                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("" + EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "WARNING: " + EnumChatFormatting.RESET + EnumChatFormatting.RED + "Could not load URL from repo."));
+                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("" + EnumChatFormatting.RED + "Please run " + EnumChatFormatting.BOLD + "/neuresetrepo" + EnumChatFormatting.RESET + EnumChatFormatting.RED + " and " + EnumChatFormatting.BOLD + "restart your game" + EnumChatFormatting.RESET + EnumChatFormatting.RED + " in order to fix. " + EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "If that doesn't fix it" + EnumChatFormatting.RESET + EnumChatFormatting.RED + ", please join discord.gg/moulberry and post in #neu-support"));
                 Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
                 return;
             }
@@ -295,11 +284,11 @@ public class Commands {
             Desktop desk = Desktop.getDesktop();
             try {
                 desk.browse(new URI(url));
-                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_PURPLE+""+EnumChatFormatting.BOLD+"NEU"+EnumChatFormatting.RESET+EnumChatFormatting.GOLD+"> Opening Feature List in browser."));
-            } catch (URISyntaxException | IOException ignored){
+                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.BOLD + "NEU" + EnumChatFormatting.RESET + EnumChatFormatting.GOLD + "> Opening Feature List in browser."));
+            } catch (URISyntaxException | IOException ignored) {
 
                 ChatComponentText clickTextFeatures = new ChatComponentText(
-                        EnumChatFormatting.DARK_PURPLE+""+EnumChatFormatting.BOLD+"NEU"+EnumChatFormatting.RESET+EnumChatFormatting.GOLD+"> Click here to open the Feature List in your browser.");
+                        EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.BOLD + "NEU" + EnumChatFormatting.RESET + EnumChatFormatting.GOLD + "> Click here to open the Feature List in your browser.");
                 clickTextFeatures.setChatStyle(Utils.createClickStyle(ClickEvent.Action.OPEN_URL, url));
                 Minecraft.getMinecraft().thePlayer.addChatMessage(clickTextFeatures);
 
@@ -309,7 +298,6 @@ public class Commands {
         }
     });
 
-
     SimpleCommand stWhyCommand = new SimpleCommand("neustwhy", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
             NEUEventListener.displayNotification(Lists.newArrayList(
@@ -350,8 +338,8 @@ public class Commands {
 
     SimpleCommand dungeonWinTest = new SimpleCommand("neudungeonwintest", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
-            if(args.length > 0) {
-                DungeonWin.TEAM_SCORE = new ResourceLocation("notenoughupdates:dungeon_win/"+args[0].toLowerCase()+".png");
+            if (args.length > 0) {
+                DungeonWin.TEAM_SCORE = new ResourceLocation("notenoughupdates:dungeon_win/" + args[0].toLowerCase() + ".png");
             }
 
             DungeonWin.displayWin();
@@ -361,11 +349,11 @@ public class Commands {
     SimpleCommand reloadRepoCommand = new SimpleCommand("neureloadrepo", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
             File items = new File(NotEnoughUpdates.INSTANCE.manager.repoLocation, "items");
-            if(items.exists()) {
+            if (items.exists()) {
                 File[] itemFiles = new File(NotEnoughUpdates.INSTANCE.manager.repoLocation, "items").listFiles();
-                if(itemFiles != null) {
-                    for(File f : itemFiles) {
-                        String internalname = f.getName().substring(0, f.getName().length()-5);
+                if (itemFiles != null) {
+                    for (File f : itemFiles) {
+                        String internalname = f.getName().substring(0, f.getName().length() - 5);
                         NotEnoughUpdates.INSTANCE.manager.loadItem(internalname);
                     }
                 }
@@ -373,10 +361,10 @@ public class Commands {
             Constants.reload();
 
             NotEnoughUpdates.INSTANCE.newConfigFile();
-            if(NotEnoughUpdates.INSTANCE.getConfigFile().exists()) {
-                try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(NotEnoughUpdates.INSTANCE.getConfigFile()), StandardCharsets.UTF_8))) {
+            if (NotEnoughUpdates.INSTANCE.getConfigFile().exists()) {
+                try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(NotEnoughUpdates.INSTANCE.getConfigFile()), StandardCharsets.UTF_8))) {
                     NotEnoughUpdates.INSTANCE.config = NotEnoughUpdates.INSTANCE.manager.gson.fromJson(reader, NEUConfig.class);
-                } catch(Exception e) { }
+                } catch (Exception ignored) {}
             }
         }
     });
@@ -386,48 +374,48 @@ public class Commands {
     SimpleCommand peekCommand = new SimpleCommand("peek", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
             String name;
-            if(args.length == 0) {
+            if (args.length == 0) {
                 name = Minecraft.getMinecraft().thePlayer.getName();
             } else {
                 name = args[0];
             }
-            int id = new Random().nextInt(Integer.MAX_VALUE/2)+Integer.MAX_VALUE/2;
+            int id = new Random().nextInt(Integer.MAX_VALUE / 2) + Integer.MAX_VALUE / 2;
 
             Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(
-                    EnumChatFormatting.YELLOW+"[PEEK] Getting player information..."), id);
-            NotEnoughUpdates.INSTANCE.profileViewer.getProfileByName(name, profile -> {
+                    EnumChatFormatting.YELLOW + "[PEEK] Getting player information..."), id);
+            NotEnoughUpdates.profileViewer.getProfileByName(name, profile -> {
                 if (profile == null) {
                     Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(
-                            EnumChatFormatting.RED+"[PEEK] Unknown player or api is down."), id);
+                            EnumChatFormatting.RED + "[PEEK] Unknown player or api is down."), id);
                 } else {
                     profile.resetCache();
 
-                    if(peekCommandExecutorService == null || peekCommandExecutorService.isShutdown()) {
+                    if (peekCommandExecutorService == null || peekCommandExecutorService.isShutdown()) {
                         peekCommandExecutorService = Executors.newSingleThreadScheduledExecutor();
                     } else {
                         Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-                                EnumChatFormatting.RED+"[PEEK] New peek command run, cancelling old one."));
+                                EnumChatFormatting.RED + "[PEEK] New peek command run, cancelling old one."));
                         peekCommandExecutorService.shutdownNow();
                         peekCommandExecutorService = Executors.newSingleThreadScheduledExecutor();
                     }
 
                     Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(
-                            EnumChatFormatting.YELLOW+"[PEEK] Getting player skyblock profiles..."), id);
+                            EnumChatFormatting.YELLOW + "[PEEK] Getting player skyblock profiles..."), id);
 
                     long startTime = System.currentTimeMillis();
                     peekCommandExecutorService.schedule(new Runnable() {
                         public void run() {
-                            if(System.currentTimeMillis() - startTime > 10*1000) {
+                            if (System.currentTimeMillis() - startTime > 10 * 1000) {
 
                                 Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(
-                                        EnumChatFormatting.RED+"[PEEK] Getting profile info took too long, aborting."), id);
+                                        EnumChatFormatting.RED + "[PEEK] Getting profile info took too long, aborting."), id);
                                 return;
                             }
 
                             String g = EnumChatFormatting.GRAY.toString();
 
                             JsonObject profileInfo = profile.getProfileInformation(null);
-                            if(profileInfo != null) {
+                            if (profileInfo != null) {
                                 float overallScore = 0;
 
                                 boolean isMe = name.equalsIgnoreCase("moulberry");
@@ -435,21 +423,21 @@ public class Commands {
                                 PlayerStats.Stats stats = profile.getStats(null);
                                 JsonObject skill = profile.getSkillInfo(null);
 
-                                Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(EnumChatFormatting.GREEN+" "+
-                                        EnumChatFormatting.STRIKETHROUGH+"-=-" +EnumChatFormatting.RESET+EnumChatFormatting.GREEN+" "+
+                                Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(EnumChatFormatting.GREEN + " " +
+                                        EnumChatFormatting.STRIKETHROUGH + "-=-" + EnumChatFormatting.RESET + EnumChatFormatting.GREEN + " " +
                                         Utils.getElementAsString(profile.getHypixelProfile().get("displayname"), name) + "'s Info " +
-                                        EnumChatFormatting.STRIKETHROUGH+"-=-"), id);
+                                        EnumChatFormatting.STRIKETHROUGH + "-=-"), id);
 
-                                if(skill == null) {
-                                    Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW+"Skills api disabled!"));
+                                if (skill == null) {
+                                    Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Skills api disabled!"));
                                 } else {
                                     float totalSkillLVL = 0;
                                     float totalSkillCount = 0;
 
-                                    for(Map.Entry<String, JsonElement> entry : skill.entrySet()) {
-                                        if(entry.getKey().startsWith("level_skill")) {
-                                            if(entry.getKey().contains("runecrafting")) continue;
-                                            if(entry.getKey().contains("carpentry")) continue;
+                                    for (Map.Entry<String, JsonElement> entry : skill.entrySet()) {
+                                        if (entry.getKey().startsWith("level_skill")) {
+                                            if (entry.getKey().contains("runecrafting")) continue;
+                                            if (entry.getKey().contains("carpentry")) continue;
                                             totalSkillLVL += entry.getValue().getAsFloat();
                                             totalSkillCount++;
                                         }
@@ -461,9 +449,9 @@ public class Commands {
                                     float wolf = Utils.getElementAsFloat(skill.get("level_slayer_wolf"), 0);
                                     float enderman = Utils.getElementAsFloat(skill.get("level_slayer_enderman"), 0);
 
-                                    float avgSkillLVL = totalSkillLVL/totalSkillCount;
+                                    float avgSkillLVL = totalSkillLVL / totalSkillCount;
 
-                                    if(isMe) {
+                                    if (isMe) {
                                         avgSkillLVL = 6;
                                         combat = 4;
                                         zombie = 2;
@@ -472,104 +460,104 @@ public class Commands {
                                         enderman = 0;
                                     }
 
-                                    EnumChatFormatting combatPrefix = combat>20?(combat>35?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting zombiePrefix = zombie>3?(zombie>6?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting spiderPrefix = spider>3?(spider>6?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting wolfPrefix = wolf>3?(wolf>6?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting endermanPrefix = enderman>3?(enderman>6?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting avgPrefix = avgSkillLVL>20?(avgSkillLVL>35?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
+                                    EnumChatFormatting combatPrefix = combat > 20 ? (combat > 35 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting zombiePrefix = zombie > 3 ? (zombie > 6 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting spiderPrefix = spider > 3 ? (spider > 6 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting wolfPrefix = wolf > 3 ? (wolf > 6 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting endermanPrefix = enderman > 3 ? (enderman > 6 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting avgPrefix = avgSkillLVL > 20 ? (avgSkillLVL > 35 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
 
-                                    overallScore += zombie*zombie/81f;
-                                    overallScore += spider*spider/81f;
-                                    overallScore += wolf*wolf/81f;
-                                    overallScore += enderman*enderman/81f;
-                                    overallScore += avgSkillLVL/20f;
+                                    overallScore += zombie * zombie / 81f;
+                                    overallScore += spider * spider / 81f;
+                                    overallScore += wolf * wolf / 81f;
+                                    overallScore += enderman * enderman / 81f;
+                                    overallScore += avgSkillLVL / 20f;
 
-                                    int cata = (int)Utils.getElementAsFloat(skill.get("level_skill_catacombs"), 0);
-                                    EnumChatFormatting cataPrefix = cata>15?(cata>25?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
+                                    int cata = (int) Utils.getElementAsFloat(skill.get("level_skill_catacombs"), 0);
+                                    EnumChatFormatting cataPrefix = cata > 15 ? (cata > 25 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
 
-                                    overallScore += cata*cata/2000f;
+                                    overallScore += cata * cata / 2000f;
 
                                     Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-                                            g+"Combat: "+combatPrefix+(int)Math.floor(combat) +
-                                                    (cata > 0 ? g+" - Cata: "+cataPrefix+cata : "")+
-                                                    g+" - AVG: " + avgPrefix+(int)Math.floor(avgSkillLVL)));
+                                            g + "Combat: " + combatPrefix + (int) Math.floor(combat) +
+                                                    (cata > 0 ? g + " - Cata: " + cataPrefix + cata : "") +
+                                                    g + " - AVG: " + avgPrefix + (int) Math.floor(avgSkillLVL)));
                                     Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-                                            g+"Slayer: "+zombiePrefix+(int)Math.floor(zombie)+g+"-"+
-                                                    spiderPrefix+(int)Math.floor(spider)+g+"-"+
-                                                    wolfPrefix+(int)Math.floor(wolf)+"-"+
-                                                    endermanPrefix+(int)Math.floor(enderman)));
+                                            g + "Slayer: " + zombiePrefix + (int) Math.floor(zombie) + g + "-" +
+                                                    spiderPrefix + (int) Math.floor(spider) + g + "-" +
+                                                    wolfPrefix + (int) Math.floor(wolf) + "-" +
+                                                    endermanPrefix + (int) Math.floor(enderman)));
                                 }
                                 if (stats == null) {
                                     Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-                                            EnumChatFormatting.YELLOW+"Skills, collection and/or inventory apis disabled!"));
+                                            EnumChatFormatting.YELLOW + "Skills, collection and/or inventory apis disabled!"));
                                 } else {
-                                    int health = (int)stats.get("health");
-                                    int defence = (int)stats.get("defence");
-                                    int strength = (int)stats.get("strength");
-                                    int intelligence = (int)stats.get("intelligence");
+                                    int health = (int) stats.get("health");
+                                    int defence = (int) stats.get("defence");
+                                    int strength = (int) stats.get("strength");
+                                    int intelligence = (int) stats.get("intelligence");
 
-                                    EnumChatFormatting healthPrefix = health>800?(health>1600?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting defencePrefix = defence>200?(defence>600?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting strengthPrefix = strength>100?(strength>300?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
-                                    EnumChatFormatting intelligencePrefix = intelligence>300?(intelligence>900?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
+                                    EnumChatFormatting healthPrefix = health > 800 ? (health > 1600 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting defencePrefix = defence > 200 ? (defence > 600 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting strengthPrefix = strength > 100 ? (strength > 300 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
+                                    EnumChatFormatting intelligencePrefix = intelligence > 300 ? (intelligence > 900 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
 
                                     Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-                                            g+"Stats  : "+healthPrefix+health+EnumChatFormatting.RED+"\u2764 "+
-                                                    defencePrefix+defence+EnumChatFormatting.GREEN+"\u2748 "+
-                                                    strengthPrefix+strength+EnumChatFormatting.RED+"\u2741 "+
-                                                    intelligencePrefix+intelligence+EnumChatFormatting.AQUA+"\u270e "));
+                                            g + "Stats  : " + healthPrefix + health + EnumChatFormatting.RED + "\u2764 " +
+                                                    defencePrefix + defence + EnumChatFormatting.GREEN + "\u2748 " +
+                                                    strengthPrefix + strength + EnumChatFormatting.RED + "\u2741 " +
+                                                    intelligencePrefix + intelligence + EnumChatFormatting.AQUA + "\u270e "));
                                 }
                                 float bankBalance = Utils.getElementAsFloat(Utils.getElement(profileInfo, "banking.balance"), -1);
                                 float purseBalance = Utils.getElementAsFloat(Utils.getElement(profileInfo, "coin_purse"), 0);
 
                                 long networth = profile.getNetWorth(null);
-                                float money = Math.max(bankBalance+purseBalance, networth);
-                                EnumChatFormatting moneyPrefix = money>50*1000*1000?
-                                        (money>200*1000*1000?EnumChatFormatting.GREEN:EnumChatFormatting.YELLOW):EnumChatFormatting.RED;
+                                float money = Math.max(bankBalance + purseBalance, networth);
+                                EnumChatFormatting moneyPrefix = money > 50 * 1000 * 1000 ?
+                                        (money > 200 * 1000 * 1000 ? EnumChatFormatting.GREEN : EnumChatFormatting.YELLOW) : EnumChatFormatting.RED;
                                 Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-                                        g+"Purse: "+moneyPrefix+Utils.shortNumberFormat(purseBalance, 0) + g+" - Bank: " +
-                                                (bankBalance == -1 ? EnumChatFormatting.YELLOW+"N/A" : moneyPrefix+
-                                                        (isMe?"4.8b":Utils.shortNumberFormat(bankBalance, 0))) +
-                                                (networth > 0 ? g+" - Net: "+moneyPrefix+Utils.shortNumberFormat(networth, 0) : "")));
+                                        g + "Purse: " + moneyPrefix + Utils.shortNumberFormat(purseBalance, 0) + g + " - Bank: " +
+                                                (bankBalance == -1 ? EnumChatFormatting.YELLOW + "N/A" : moneyPrefix +
+                                                        (isMe ? "4.8b" : Utils.shortNumberFormat(bankBalance, 0))) +
+                                                (networth > 0 ? g + " - Net: " + moneyPrefix + Utils.shortNumberFormat(networth, 0) : "")));
 
-                                overallScore += Math.min(2, money/(100f*1000*1000));
+                                overallScore += Math.min(2, money / (100f * 1000 * 1000));
 
                                 String activePet = Utils.getElementAsString(Utils.getElement(profile.getPetsInfo(null), "active_pet.type"),
                                         "None Active");
                                 String activePetTier = Utils.getElementAsString(Utils.getElement(profile.getPetsInfo(null), "active_pet.tier"), "UNKNOWN");
 
                                 String col = NotEnoughUpdates.petRarityToColourMap.get(activePetTier);
-                                if(col == null) col = EnumChatFormatting.LIGHT_PURPLE.toString();
+                                if (col == null) col = EnumChatFormatting.LIGHT_PURPLE.toString();
 
-                                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(g+"Pet    : " +
+                                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(g + "Pet    : " +
                                         col + WordUtils.capitalizeFully(activePet.replace("_", " "))));
 
                                 String overall = "Skywars Main";
-                                if(isMe) {
+                                if (isMe) {
                                     overall = Utils.chromaString("Literally the best player to exist"); // ego much
-                                } else if(overallScore < 5 && (bankBalance+purseBalance) > 500*1000*1000) {
-                                    overall = EnumChatFormatting.GOLD+"Bill Gates";
-                                } else if(overallScore > 9) {
+                                } else if (overallScore < 5 && (bankBalance + purseBalance) > 500 * 1000 * 1000) {
+                                    overall = EnumChatFormatting.GOLD + "Bill Gates";
+                                } else if (overallScore > 9) {
                                     overall = Utils.chromaString("Didn't even think this score was possible");
-                                } else if(overallScore > 8) {
+                                } else if (overallScore > 8) {
                                     overall = Utils.chromaString("Mentally unstable");
-                                } else if(overallScore > 7) {
-                                    overall = EnumChatFormatting.GOLD+"Why though 0.0";
-                                } else if(overallScore > 5.5) {
-                                    overall = EnumChatFormatting.GOLD+"Bro stop playing";
-                                } else if(overallScore > 4) {
-                                    overall = EnumChatFormatting.GREEN+"Kinda sweaty";
-                                } else if(overallScore > 3) {
-                                    overall = EnumChatFormatting.YELLOW+"Alright I guess";
-                                } else if(overallScore > 2) {
-                                    overall = EnumChatFormatting.YELLOW+"Ender Non";
-                                } else if(overallScore > 1) {
-                                    overall = EnumChatFormatting.RED+"Played Skyblock";
+                                } else if (overallScore > 7) {
+                                    overall = EnumChatFormatting.GOLD + "Why though 0.0";
+                                } else if (overallScore > 5.5) {
+                                    overall = EnumChatFormatting.GOLD + "Bro stop playing";
+                                } else if (overallScore > 4) {
+                                    overall = EnumChatFormatting.GREEN + "Kinda sweaty";
+                                } else if (overallScore > 3) {
+                                    overall = EnumChatFormatting.YELLOW + "Alright I guess";
+                                } else if (overallScore > 2) {
+                                    overall = EnumChatFormatting.YELLOW + "Ender Non";
+                                } else if (overallScore > 1) {
+                                    overall = EnumChatFormatting.RED + "Played Skyblock";
                                 }
 
-                                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(g+"Overall score: " +
-                                        overall + g + " (" + Math.round(overallScore*10)/10f + ")"));
+                                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(g + "Overall score: " +
+                                        overall + g + " (" + Math.round(overallScore * 10) / 10f + ")"));
 
                                 peekCommandExecutorService.shutdownNow();
                             } else {
@@ -599,7 +587,7 @@ public class Commands {
 
     public SimpleCommand.ProcessCommandRunnable viewProfileRunnable = new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
-            if(!OpenGlHelper.isFramebufferEnabled()) {
+            if (!OpenGlHelper.isFramebufferEnabled()) {
                 Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +
                         "Some parts of the profile viewer do not work with OF Fast Render. Go to ESC > Options > Video Settings > Performance > Fast Render to disable it."));
 
@@ -608,8 +596,8 @@ public class Commands {
                 Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +
                         "Can't view profile, apikey is not set. Run /api new and put the result in settings."));
             } else if (args.length == 0) {
-                NotEnoughUpdates.INSTANCE.profileViewer.getProfileByName(Minecraft.getMinecraft().thePlayer.getName(), profile -> {
-                    if(profile == null) {
+                NotEnoughUpdates.profileViewer.getProfileByName(Minecraft.getMinecraft().thePlayer.getName(), profile -> {
+                    if (profile == null) {
                         Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +
                                 "Invalid player name/api key. Maybe api is down? Try /api new."));
                     } else {
@@ -621,8 +609,8 @@ public class Commands {
                 Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +