Code Clean Up (#2)

* intellij code clean up

* optimize imports

* format

* intellij suggestions

* fix empty catch issues

1 files changed, 44 insertions, 44 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
index 68815fb8..061780cf 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 public class XPInformation {
 
-    private static XPInformation INSTANCE = new XPInformation();
+    private static final XPInformation INSTANCE = new XPInformation();
 
     public static XPInformation getInstance() {
         return INSTANCE;
@@ -30,15 +30,15 @@ public class XPInformation {
         public boolean fromApi = false;
     }
 
-    private HashMap<String, SkillInfo> skillInfoMap = new HashMap<>();
+    private final HashMap<String, SkillInfo> skillInfoMap = new HashMap<>();
     public HashMap<String, Float> updateWithPercentage = new HashMap<>();
 
     public int correctionCounter = 0;
 
-    private static Splitter SPACE_SPLITTER = Splitter.on("  ").omitEmptyStrings().trimResults();
-    private static Pattern SKILL_PATTERN = Pattern.compile("\\+(\\d+(?:,\\d+)*(?:\\.\\d+)?) (.+) \\((\\d+(?:,\\d+)*(?:\\.\\d+)?)/(\\d+(?:,\\d+)*(?:\\.\\d+)?)\\)");
-    private static Pattern SKILL_PATTERN_MULTIPLIER = Pattern.compile("\\+(\\d+(?:,\\d+)*(?:\\.\\d+)?) (.+) \\((\\d+(?:,\\d+)*(?:\\.\\d+)?)/(\\d+(?:k|m|b))\\)");
-    private static Pattern SKILL_PATTERN_PERCENTAGE = Pattern.compile("\\+(\\d+(?:,\\d+)*(?:\\.\\d+)?) (.+) \\((\\d\\d?(?:\\.\\d\\d?)?)%\\)");
+    private static final Splitter SPACE_SPLITTER = Splitter.on("  ").omitEmptyStrings().trimResults();
+    private static final Pattern SKILL_PATTERN = Pattern.compile("\\+(\\d+(?:,\\d+)*(?:\\.\\d+)?) (.+) \\((\\d+(?:,\\d+)*(?:\\.\\d+)?)/(\\d+(?:,\\d+)*(?:\\.\\d+)?)\\)");
+    private static final Pattern SKILL_PATTERN_MULTIPLIER = Pattern.compile("\\+(\\d+(?:,\\d+)*(?:\\.\\d+)?) (.+) \\((\\d+(?:,\\d+)*(?:\\.\\d+)?)/(\\d+(?:k|m|b))\\)");
+    private static final Pattern SKILL_PATTERN_PERCENTAGE = Pattern.compile("\\+(\\d+(?:,\\d+)*(?:\\.\\d+)?) (.+) \\((\\d\\d?(?:\\.\\d\\d?)?)%\\)");
 
     public HashMap<String, SkillInfo> getSkillInfoMap() {
         return skillInfoMap;
@@ -52,25 +52,25 @@ public class XPInformation {
 
     @SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true)
     public void onChatReceived(ClientChatReceivedEvent event) {
-        if(event.type == 2) {
+        if (event.type == 2) {
             JsonObject leveling = Constants.LEVELING;
-            if(leveling == null)  return;
+            if (leveling == null) return;
 
             String actionBar = StringUtils.cleanColour(event.message.getUnformattedText());
 
-            if(lastActionBar != null && lastActionBar.equalsIgnoreCase(actionBar)) {
+            if (lastActionBar != null && lastActionBar.equalsIgnoreCase(actionBar)) {
                 return;
             }
             lastActionBar = actionBar;
 
             List<String> components = SPACE_SPLITTER.splitToList(actionBar);
 
-            for(String component : components) {
+            for (String component : components) {
                 Matcher matcher = SKILL_PATTERN.matcher(component);
-                if(matcher.matches()) {
+                if (matcher.matches()) {
                     String skillS = matcher.group(2);
-                    String currentXpS = matcher.group(3).replace(",","");
-                    String maxXpS = matcher.group(4).replace(",","");
+                    String currentXpS = matcher.group(3).replace(",", "");
+                    String maxXpS = matcher.group(4).replace(",", "");
 
                     float currentXp = Float.parseFloat(currentXpS);
                     float maxXp = Float.parseFloat(maxXpS);
@@ -81,9 +81,9 @@ public class XPInformation {
                     skillInfo.totalXp = currentXp;
 
                     JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
-                    for(int i=0; i<levelingArray.size(); i++) {
+                    for (int i = 0; i < levelingArray.size(); i++) {
                         float cap = levelingArray.get(i).getAsFloat();
-                        if(maxXp > 0 && maxXp <= cap) {
+                        if (maxXp > 0 && maxXp <= cap) {
                             break;
                         }
 
@@ -95,30 +95,30 @@ public class XPInformation {
                     return;
                 } else {
                     matcher = SKILL_PATTERN_PERCENTAGE.matcher(component);
-                    if(matcher.matches()) {
+                    if (matcher.matches()) {
                         String skillS = matcher.group(2);
-                        String xpPercentageS = matcher.group(3).replace(",","");
+                        String xpPercentageS = matcher.group(3).replace(",", "");
 
                         float xpPercentage = Float.parseFloat(xpPercentageS);
                         updateWithPercentage.put(skillS.toLowerCase(), xpPercentage);
                     } else {
                         matcher = SKILL_PATTERN_MULTIPLIER.matcher(component);
 
-                        if(matcher.matches()) {
+                        if (matcher.matches()) {
                             String skillS = matcher.group(2);
-                            String currentXpS = matcher.group(3).replace(",","");
-                            String maxXpS = matcher.group(4).replace(",","");
+                            String currentXpS = matcher.group(3).replace(",", "");
+                            String maxXpS = matcher.group(4).replace(",", "");
 
                             float maxMult = 1;
-                            if(maxXpS.endsWith("k")) {
+                            if (maxXpS.endsWith("k")) {
                                 maxMult = 1000;
-                                maxXpS = maxXpS.substring(0, maxXpS.length()-1);
-                            } else if(maxXpS.endsWith("m")) {
+                                maxXpS = maxXpS.substring(0, maxXpS.length() - 1);
+                            } else if (maxXpS.endsWith("m")) {
                                 maxMult = 1000000;
-                                maxXpS = maxXpS.substring(0, maxXpS.length()-1);
-                            } else if(maxXpS.endsWith("b")) {
+                                maxXpS = maxXpS.substring(0, maxXpS.length() - 1);
+                            } else if (maxXpS.endsWith("b")) {
                                 maxMult = 1000000000;
-                                maxXpS = maxXpS.substring(0, maxXpS.length()-1);
+                                maxXpS = maxXpS.substring(0, maxXpS.length() - 1);
                             }
 
                             float currentXp = Float.parseFloat(currentXpS);
@@ -130,9 +130,9 @@ public class XPInformation {
                             skillInfo.totalXp = currentXp;
 
                             JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
-                            for(int i=0; i<levelingArray.size(); i++) {
+                            for (int i = 0; i < levelingArray.size(); i++) {
                                 float cap = levelingArray.get(i).getAsFloat();
-                                if(maxXp > 0 && maxXp <= cap) {
+                                if (maxXp > 0 && maxXp <= cap) {
                                     break;
                                 }
 
@@ -150,19 +150,19 @@ public class XPInformation {
     }
 
     public void updateLevel(String skill, int level) {
-        if(updateWithPercentage.containsKey(skill)) {
+        if (updateWithPercentage.containsKey(skill)) {
             JsonObject leveling = Constants.LEVELING;
-            if(leveling == null)  return;
+            if (leveling == null) return;
 
             SkillInfo skillInfo = new SkillInfo();
             skillInfo.totalXp = 0;
             skillInfo.level = level;
 
             JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
-            for(int i=0; i<levelingArray.size(); i++) {
+            for (int i = 0; i < levelingArray.size(); i++) {
                 float cap = levelingArray.get(i).getAsFloat();
-                if(i == level) {
-                    skillInfo.currentXp += updateWithPercentage.get(skill)/100f * cap;
+                if (i == level) {
+                    skillInfo.currentXp += updateWithPercentage.get(skill) / 100f * cap;
                     skillInfo.totalXp += skillInfo.currentXp;
                     skillInfo.currentXpMax = cap;
                 } else {
@@ -172,12 +172,12 @@ public class XPInformation {
 
             SkillInfo old = skillInfoMap.get(skill.toLowerCase());
 
-            if(old.totalXp <= skillInfo.totalXp) {
+            if (old.totalXp <= skillInfo.totalXp) {
                 correctionCounter--;
-                if(correctionCounter < 0) correctionCounter = 0;
+                if (correctionCounter < 0) correctionCounter = 0;
 
                 skillInfoMap.put(skill.toLowerCase(), skillInfo);
-            } else if(++correctionCounter >= 10) {
+            } else if (++correctionCounter >= 10) {
                 correctionCounter = 0;
                 skillInfoMap.put(skill.toLowerCase(), skillInfo);
             }
@@ -186,24 +186,24 @@ public class XPInformation {
     }
 
     public void tick() {
-        ProfileApiSyncer.getInstance().requestResync("xpinformation", 5*60*1000,
+        ProfileApiSyncer.getInstance().requestResync("xpinformation", 5 * 60 * 1000,
                 () -> {}, this::onApiUpdated);
     }
 
-    private static final String[] skills = {"taming","mining","foraging","enchanting","carpentry","farming","combat","fishing","alchemy","runecrafting"};
+    private static final String[] skills = {"taming", "mining", "foraging", "enchanting", "carpentry", "farming", "combat", "fishing", "alchemy", "runecrafting"};
 
     private void onApiUpdated(ProfileViewer.Profile profile) {
         JsonObject skillInfo = profile.getSkillInfo(null);
 
-        for(String skill : skills) {
+        for (String skill : skills) {
             SkillInfo info = new SkillInfo();
 
-            float level = skillInfo.get("level_skill_"+skill).getAsFloat();
+            float level = skillInfo.get("level_skill_" + skill).getAsFloat();
 
-            info.totalXp = skillInfo.get("experience_skill_"+skill).getAsFloat();
-            info.currentXpMax = skillInfo.get("maxxp_skill_"+skill).getAsFloat();
-            info.level = (int)level;
-            info.currentXp = (level%1)*info.currentXpMax;
+            info.totalXp = skillInfo.get("experience_skill_" + skill).getAsFloat();
+            info.currentXpMax = skillInfo.get("maxxp_skill_" + skill).getAsFloat();
+            info.level = (int) level;
+            info.currentXp = (level % 1) * info.currentXpMax;
             info.fromApi = true;
 
             skillInfoMap.put(skill.toLowerCase(), info);