Code Clean Up (#2)

* intellij code clean up

* optimize imports

* format

* intellij suggestions

* fix empty catch issues

1 files changed, 88 insertions, 81 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java
index 83c4b7ae..0aa80126 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java
@@ -4,7 +4,6 @@ import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.auction.APIManager;
 import io.github.moulberry.notenoughupdates.core.config.KeybindHelper;
 import io.github.moulberry.notenoughupdates.util.Constants;
-import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
@@ -21,10 +20,10 @@ public class ItemPriceInformation {
     }
 
     public static boolean addToTooltip(List<String> tooltip, String internalname, ItemStack stack, boolean useStackSize) {
-        if(stack.getTagCompound().hasKey("disableNeuTooltip") && stack.getTagCompound().getBoolean("disableNeuTooltip")){
+        if (stack.getTagCompound().hasKey("disableNeuTooltip") && stack.getTagCompound().getBoolean("disableNeuTooltip")) {
             return false;
         }
-        if(NotEnoughUpdates.INSTANCE.config.tooltipTweaks.disablePriceKey && !KeybindHelper.isKeyDown(NotEnoughUpdates.INSTANCE.config.tooltipTweaks.disablePriceKeyKeybind)){
+        if (NotEnoughUpdates.INSTANCE.config.tooltipTweaks.disablePriceKey && !KeybindHelper.isKeyDown(NotEnoughUpdates.INSTANCE.config.tooltipTweaks.disablePriceKeyKeybind)) {
             return false;
         }
         JsonObject auctionInfo = NotEnoughUpdates.INSTANCE.manager.auctionManager.getItemAuctionInfo(internalname);
@@ -39,7 +38,7 @@ public class ItemPriceInformation {
 
         NumberFormat format = NumberFormat.getInstance(Locale.US);
 
-        if(bazaarItem) {
+        if (bazaarItem) {
             List<Integer> lines = NotEnoughUpdates.INSTANCE.config.tooltipTweaks.priceInfoBaz;
 
             boolean added = false;
@@ -48,161 +47,169 @@ public class ItemPriceInformation {
 
             int stackMultiplier = 1;
             int shiftStackMultiplier = useStackSize && stack.stackSize > 1 ? stack.stackSize : 64;
-            if(shiftPressed) {
+            if (shiftPressed) {
                 stackMultiplier = shiftStackMultiplier;
             }
 
             //values = {"", "Buy", "Sell", "Buy (Insta)", "Sell (Insta)", "Raw Craft Cost"}
-            for(int lineId : lines) {
+            for (int lineId : lines) {
                 switch (lineId) {
                     case 0:
-                        if(bazaarInfo.has("avg_buy")) {
-                            if(!added) {
+                        if (bazaarInfo.has("avg_buy")) {
+                            if (!added) {
                                 tooltip.add("");
-                                if(!shiftPressed) tooltip.add(EnumChatFormatting.DARK_GRAY.toString()+"[SHIFT show x"+shiftStackMultiplier+"]");
+                                if (!shiftPressed)
+                                    tooltip.add(EnumChatFormatting.DARK_GRAY + "[SHIFT show x" + shiftStackMultiplier + "]");
                                 added = true;
                             }
-                            int bazaarBuyPrice = (int)bazaarInfo.get("avg_buy").getAsFloat()*stackMultiplier;
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Bazaar Buy: "+
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format(bazaarBuyPrice)+" coins");
+                            int bazaarBuyPrice = (int) bazaarInfo.get("avg_buy").getAsFloat() * stackMultiplier;
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Buy: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarBuyPrice) + " coins");
                         }
                         break;
                     case 1:
-                        if(bazaarInfo.has("avg_sell")) {
-                            if(!added) {
+                        if (bazaarInfo.has("avg_sell")) {
+                            if (!added) {
                                 tooltip.add("");
-                                if(!shiftPressed) tooltip.add(EnumChatFormatting.DARK_GRAY.toString()+"[SHIFT show x"+shiftStackMultiplier+"]");
+                                if (!shiftPressed)
+                                    tooltip.add(EnumChatFormatting.DARK_GRAY + "[SHIFT show x" + shiftStackMultiplier + "]");
                                 added = true;
                             }
-                            int bazaarSellPrice = (int)bazaarInfo.get("avg_sell").getAsFloat()*stackMultiplier;
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Bazaar Sell: "+
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format(bazaarSellPrice)+" coins");
+                            int bazaarSellPrice = (int) bazaarInfo.get("avg_sell").getAsFloat() * stackMultiplier;
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Sell: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarSellPrice) + " coins");
                         }
                         break;
                     case 2:
-                        if(bazaarInfo.has("curr_buy")) {
-                            if(!added) {
+                        if (bazaarInfo.has("curr_buy")) {
+                            if (!added) {
                                 tooltip.add("");
-                                if(!shiftPressed) tooltip.add(EnumChatFormatting.DARK_GRAY.toString()+"[SHIFT show x"+shiftStackMultiplier+"]");
+                                if (!shiftPressed)
+                                    tooltip.add(EnumChatFormatting.DARK_GRAY + "[SHIFT show x" + shiftStackMultiplier + "]");
                                 added = true;
                             }
-                            int bazaarInstantBuyPrice = (int)bazaarInfo.get("curr_buy").getAsFloat()*stackMultiplier;
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Bazaar Insta-Buy: "+
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format(bazaarInstantBuyPrice)+" coins");
+                            int bazaarInstantBuyPrice = (int) bazaarInfo.get("curr_buy").getAsFloat() * stackMultiplier;
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Insta-Buy: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarInstantBuyPrice) + " coins");
                         }
                         break;
                     case 3:
-                        if(bazaarInfo.has("curr_sell")) {
-                            if(!added) {
+                        if (bazaarInfo.has("curr_sell")) {
+                            if (!added) {
                                 tooltip.add("");
-                                if(!shiftPressed) tooltip.add(EnumChatFormatting.DARK_GRAY.toString()+"[SHIFT show x"+shiftStackMultiplier+"]");
+                                if (!shiftPressed)
+                                    tooltip.add(EnumChatFormatting.DARK_GRAY + "[SHIFT show x" + shiftStackMultiplier + "]");
                                 added = true;
                             }
-                            int bazaarInstantSellPrice = (int)bazaarInfo.get("curr_sell").getAsFloat()*stackMultiplier;
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Bazaar Insta-Sell: "+
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format(bazaarInstantSellPrice)+" coins");
+                            int bazaarInstantSellPrice = (int) bazaarInfo.get("curr_sell").getAsFloat() * stackMultiplier;
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Insta-Sell: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarInstantSellPrice) + " coins");
                         }
                         break;
                     case 4:
-                        if(craftCost.fromRecipe) {
-                            if((int)craftCost.craftCost == 0){ continue;}
-                            if(!added) {
+                        if (craftCost.fromRecipe) {
+                            if ((int) craftCost.craftCost == 0) {
+                                continue;
+                            }
+                            if (!added) {
                                 tooltip.add("");
                                 added = true;
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Raw Craft Cost: "+
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format((int)craftCost.craftCost)+" coins");
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format((int) craftCost.craftCost) + " coins");
                         }
                         break;
                 }
             }
 
             return added;
-        } else if(auctionItem) {
+        } else if (auctionItem) {
             List<Integer> lines = NotEnoughUpdates.INSTANCE.config.tooltipTweaks.priceInfoAuc;
 
             boolean added = false;
 
-            for(int lineId : lines) {
+            for (int lineId : lines) {
                 switch (lineId) {
                     case 0:
-                        if(lowestBin > 0) {
-                            if(!added) {
+                        if (lowestBin > 0) {
+                            if (!added) {
                                 tooltip.add("");
                                 added = true;
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Lowest BIN: " +
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format(lowestBin)+" coins");
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Lowest BIN: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(lowestBin) + " coins");
                         }
                         break;
                     case 1:
-                        if(auctionInfo != null) {
-                            if(!added) {
+                        if (auctionInfo != null) {
+                            if (!added) {
                                 tooltip.add("");
                                 added = true;
                             }
 
-                            if(auctionInfo.has("clean_price")) {
-                                tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"AH Price (Clean): "+ EnumChatFormatting.GOLD+
-                                        EnumChatFormatting.BOLD+
-                                        format.format((int)auctionInfo.get("clean_price").getAsFloat())+" coins");
+                            if (auctionInfo.has("clean_price")) {
+                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Price (Clean): " + EnumChatFormatting.GOLD +
+                                        EnumChatFormatting.BOLD +
+                                        format.format((int) auctionInfo.get("clean_price").getAsFloat()) + " coins");
                             } else {
-                                int auctionPrice = (int)(auctionInfo.get("price").getAsFloat() / auctionInfo.get("count").getAsFloat());
-                                tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"AH Price: "+ EnumChatFormatting.GOLD+
-                                        EnumChatFormatting.BOLD+format.format(auctionPrice)+" coins");
+                                int auctionPrice = (int) (auctionInfo.get("price").getAsFloat() / auctionInfo.get("count").getAsFloat());
+                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Price: " + EnumChatFormatting.GOLD +
+                                        EnumChatFormatting.BOLD + format.format(auctionPrice) + " coins");
                             }
 
                         }
                         break;
                     case 2:
-                        if(auctionInfo != null) {
-                            if(!added) {
+                        if (auctionInfo != null) {
+                            if (!added) {
                                 tooltip.add("");
                                 added = true;
                             }
-                            if(auctionInfo.has("clean_price")) {
-                                tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"AH Sales (Clean): "+
-                                        EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+
-                                        format.format(auctionInfo.get("clean_sales").getAsFloat())+" sales/day");
+                            if (auctionInfo.has("clean_price")) {
+                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Sales (Clean): " +
+                                        EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
+                                        format.format(auctionInfo.get("clean_sales").getAsFloat()) + " sales/day");
                             } else {
-                                tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"AH Sales: "+
-                                        EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+
-                                        format.format(auctionInfo.get("sales").getAsFloat())+" sales/day");
+                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Sales: " +
+                                        EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
+                                        format.format(auctionInfo.get("sales").getAsFloat()) + " sales/day");
                             }
                         }
                         break;
                     case 3:
-                        if(craftCost.fromRecipe) {
-                            if((int)craftCost.craftCost == 0){ continue;}
-                            if(!added) {
+                        if (craftCost.fromRecipe) {
+                            if ((int) craftCost.craftCost == 0) {
+                                continue;
+                            }
+                            if (!added) {
                                 tooltip.add("");
                                 added = true;
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Raw Craft Cost: "+
-                                        EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format((int)craftCost.craftCost)+" coins");
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format((int) craftCost.craftCost) + " coins");
                         }
                         break;
                     case 4:
-                        if(lowestBinAvg > 0) {
-                            if(!added) {
+                        if (lowestBinAvg > 0) {
+                            if (!added) {
                                 tooltip.add("");
                                 added = true;
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"AVG Lowest BIN: "+
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+format.format(lowestBinAvg)+" coins");
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AVG Lowest BIN: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(lowestBinAvg) + " coins");
                         }
                         break;
                     case 5:
-                        if(Constants.ESSENCECOSTS == null) break;
+                        if (Constants.ESSENCECOSTS == null) break;
                         JsonObject essenceCosts = Constants.ESSENCECOSTS;
-                        if(!essenceCosts.has(internalname)) {
+                        if (!essenceCosts.has(internalname)) {
                             break;
                         }
                         JsonObject itemCosts = essenceCosts.get(internalname).getAsJsonObject();
                         String essenceType = itemCosts.get("type").getAsString();
 
                         int dungeonItemLevel = -1;
-                        if(stack != null && stack.hasTagCompound() &&
+                        if (stack != null && stack.hasTagCompound() &&
                                 stack.getTagCompound().hasKey("ExtraAttributes", 10)) {
                             NBTTagCompound ea = stack.getTagCompound().getCompoundTag("ExtraAttributes");
 
@@ -210,24 +217,24 @@ public class ItemPriceInformation {
                                 dungeonItemLevel = ea.getInteger("dungeon_item_level");
                             }
                         }
-                        if(dungeonItemLevel == -1) {
+                        if (dungeonItemLevel == -1) {
                             int dungeonizeCost = 0;
-                            if(itemCosts.has("dungeonize")) {
+                            if (itemCosts.has("dungeonize")) {
                                 dungeonizeCost = itemCosts.get("dungeonize").getAsInt();
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Dungeonize Cost: " +
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+dungeonizeCost+" "+essenceType);
-                        } else if(dungeonItemLevel >= 0 && dungeonItemLevel <= 4) {
-                            String costType = (dungeonItemLevel+1)+"";
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Dungeonize Cost: " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + dungeonizeCost + " " + essenceType);
+                        } else if (dungeonItemLevel >= 0 && dungeonItemLevel <= 4) {
+                            String costType = (dungeonItemLevel + 1) + "";
 
                             int upgradeCost = itemCosts.get(costType).getAsInt();
                             StringBuilder star = new StringBuilder();
-                            for(int i=0; i<=dungeonItemLevel; i++) {
+                            for (int i = 0; i <= dungeonItemLevel; i++) {
                                 star.append('\u272A');
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString()+EnumChatFormatting.BOLD+"Upgrade to "+
-                                    EnumChatFormatting.GOLD+star+EnumChatFormatting.YELLOW+EnumChatFormatting.BOLD+": " +
-                                    EnumChatFormatting.GOLD+EnumChatFormatting.BOLD+upgradeCost+" "+essenceType);
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Upgrade to " +
+                                    EnumChatFormatting.GOLD + star + EnumChatFormatting.YELLOW + EnumChatFormatting.BOLD + ": " +
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + upgradeCost + " " + essenceType);
                         }
                         break;
                 }