feat: improve formating :)

1 files changed, 233 insertions, 212 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 d1bed30e..aef2490e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
@@ -19,217 +19,238 @@ import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 public class XPInformation {
-    private static final XPInformation INSTANCE = new XPInformation();
-
-    public static XPInformation getInstance() {
-        return INSTANCE;
-    }
-
-    public static class SkillInfo {
-        public int level;
-        public float totalXp;
-        public float currentXp;
-        public float currentXpMax;
-        public boolean fromApi = false;
-    }
-
-    private final HashMap<String, SkillInfo> skillInfoMap = new HashMap<>();
-    public HashMap<String, Float> updateWithPercentage = new HashMap<>();
-
-    public int correctionCounter = 0;
-
-    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;
-    }
-
-    public SkillInfo getSkillInfo(String skillName) {
-        return skillInfoMap.get(skillName.toLowerCase());
-    }
-
-    private String lastActionBar = null;
-
-    @SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true)
-    public void onChatReceived(ClientChatReceivedEvent event) {
-        if (event.type == 2) {
-            JsonObject leveling = Constants.LEVELING;
-            if (leveling == null) return;
-
-            String actionBar = StringUtils.cleanColour(event.message.getUnformattedText());
-
-            if (lastActionBar != null && lastActionBar.equalsIgnoreCase(actionBar)) {
-                return;
-            }
-            lastActionBar = actionBar;
-
-            List<String> components = SPACE_SPLITTER.splitToList(actionBar);
-
-            for (String component : components) {
-                Matcher matcher = SKILL_PATTERN.matcher(component);
-                if (matcher.matches()) {
-                    String skillS = matcher.group(2);
-                    String currentXpS = matcher.group(3).replace(",", "");
-                    String maxXpS = matcher.group(4).replace(",", "");
-
-                    float currentXp = Float.parseFloat(currentXpS);
-                    float maxXp = Float.parseFloat(maxXpS);
-
-                    SkillInfo skillInfo = new SkillInfo();
-                    skillInfo.currentXp = currentXp;
-                    skillInfo.currentXpMax = maxXp;
-                    skillInfo.totalXp = currentXp;
-
-                    JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
-                    for (int i = 0; i < levelingArray.size(); i++) {
-                        float cap = levelingArray.get(i).getAsFloat();
-                        if (maxXp > 0 && maxXp <= cap) {
-                            break;
-                        }
-
-                        skillInfo.totalXp += cap;
-                        skillInfo.level++;
-                    }
-
-                    skillInfoMap.put(skillS.toLowerCase(), skillInfo);
-                    return;
-                } else {
-                    matcher = SKILL_PATTERN_PERCENTAGE.matcher(component);
-                    if (matcher.matches()) {
-                        String skillS = matcher.group(2);
-                        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()) {
-                            String skillS = matcher.group(2);
-                            String currentXpS = matcher.group(3).replace(",", "");
-                            String maxXpS = matcher.group(4).replace(",", "");
-
-                            float maxMult = 1;
-                            if (maxXpS.endsWith("k")) {
-                                maxMult = 1000;
-                                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")) {
-                                maxMult = 1000000000;
-                                maxXpS = maxXpS.substring(0, maxXpS.length() - 1);
-                            }
-
-                            float currentXp = Float.parseFloat(currentXpS);
-                            float maxXp = Float.parseFloat(maxXpS) * maxMult;
-
-                            SkillInfo skillInfo = new SkillInfo();
-                            skillInfo.currentXp = currentXp;
-                            skillInfo.currentXpMax = maxXp;
-                            skillInfo.totalXp = currentXp;
-
-                            JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
-                            for (int i = 0; i < levelingArray.size(); i++) {
-                                float cap = levelingArray.get(i).getAsFloat();
-                                if (maxXp > 0 && maxXp <= cap) {
-                                    break;
-                                }
-
-                                skillInfo.totalXp += cap;
-                                skillInfo.level++;
-                            }
-
-                            skillInfoMap.put(skillS.toLowerCase(), skillInfo);
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public void updateLevel(String skill, int level) {
-        if (updateWithPercentage.containsKey(skill)) {
-            JsonObject leveling = Constants.LEVELING;
-            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++) {
-                float cap = levelingArray.get(i).getAsFloat();
-                if (i == level) {
-                    skillInfo.currentXp += updateWithPercentage.get(skill) / 100f * cap;
-                    skillInfo.totalXp += skillInfo.currentXp;
-                    skillInfo.currentXpMax = cap;
-                } else {
-                    skillInfo.totalXp += cap;
-                }
-            }
-
-            SkillInfo old = skillInfoMap.get(skill.toLowerCase());
-
-            if (old.totalXp <= skillInfo.totalXp) {
-                correctionCounter--;
-                if (correctionCounter < 0) correctionCounter = 0;
-
-                skillInfoMap.put(skill.toLowerCase(), skillInfo);
-            } else if (++correctionCounter >= 10) {
-                correctionCounter = 0;
-                skillInfoMap.put(skill.toLowerCase(), skillInfo);
-            }
-        }
-        updateWithPercentage.clear();
-    }
-
-    public void tick() {
-        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 void onApiUpdated(ProfileViewer.Profile profile) {
-        JsonObject skillInfo = profile.getSkillInfo(null);
-
-        for (String skill : skills) {
-            SkillInfo info = new SkillInfo();
-
-            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.fromApi = true;
-
-            skillInfoMap.put(skill.toLowerCase(), info);
-        }
-    }
-
-    public double getPetLevel(String petId, double exp, String rarity) {
-        Stream<JsonElement> pet_levels = StreamSupport.stream(Constants.PETS.get("pet_levels").getAsJsonArray().spliterator(), false);
-        int pet_rarity_offset = Constants.PETS.getAsJsonObject("pet_rarity_offset").get(rarity).getAsInt();
-        JsonObject custom_pet_leveling = Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(petId);
-        List<Integer> xpLevelsRequired = pet_levels.skip(pet_rarity_offset).limit(100).map(JsonElement::getAsInt).collect(Collectors.toList());
-        if (custom_pet_leveling != null && custom_pet_leveling.get("type").getAsInt() == 1)
-            xpLevelsRequired.addAll(StreamSupport.stream(custom_pet_leveling.getAsJsonArray("pet_levels").spliterator(), false).map(JsonElement::getAsInt).collect(Collectors.toList()));
-        double remainingExp = exp;
-        for (int i = 0; i < xpLevelsRequired.size(); i++) {
-            int xpForCurrentLevel = xpLevelsRequired.get(i);
-            if (remainingExp >= xpForCurrentLevel) {
-                remainingExp -= xpForCurrentLevel;
-            } else {
-                return i + 1 + remainingExp / xpForCurrentLevel;
-            }
-        }
-        return xpLevelsRequired.size();
-    }
+	private static final XPInformation INSTANCE = new XPInformation();
+
+	public static XPInformation getInstance() {
+		return INSTANCE;
+	}
+
+	public static class SkillInfo {
+		public int level;
+		public float totalXp;
+		public float currentXp;
+		public float currentXpMax;
+		public boolean fromApi = false;
+	}
+
+	private final HashMap<String, SkillInfo> skillInfoMap = new HashMap<>();
+	public HashMap<String, Float> updateWithPercentage = new HashMap<>();
+
+	public int correctionCounter = 0;
+
+	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;
+	}
+
+	public SkillInfo getSkillInfo(String skillName) {
+		return skillInfoMap.get(skillName.toLowerCase());
+	}
+
+	private String lastActionBar = null;
+
+	@SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true)
+	public void onChatReceived(ClientChatReceivedEvent event) {
+		if (event.type == 2) {
+			JsonObject leveling = Constants.LEVELING;
+			if (leveling == null) return;
+
+			String actionBar = StringUtils.cleanColour(event.message.getUnformattedText());
+
+			if (lastActionBar != null && lastActionBar.equalsIgnoreCase(actionBar)) {
+				return;
+			}
+			lastActionBar = actionBar;
+
+			List<String> components = SPACE_SPLITTER.splitToList(actionBar);
+
+			for (String component : components) {
+				Matcher matcher = SKILL_PATTERN.matcher(component);
+				if (matcher.matches()) {
+					String skillS = matcher.group(2);
+					String currentXpS = matcher.group(3).replace(",", "");
+					String maxXpS = matcher.group(4).replace(",", "");
+
+					float currentXp = Float.parseFloat(currentXpS);
+					float maxXp = Float.parseFloat(maxXpS);
+
+					SkillInfo skillInfo = new SkillInfo();
+					skillInfo.currentXp = currentXp;
+					skillInfo.currentXpMax = maxXp;
+					skillInfo.totalXp = currentXp;
+
+					JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
+					for (int i = 0; i < levelingArray.size(); i++) {
+						float cap = levelingArray.get(i).getAsFloat();
+						if (maxXp > 0 && maxXp <= cap) {
+							break;
+						}
+
+						skillInfo.totalXp += cap;
+						skillInfo.level++;
+					}
+
+					skillInfoMap.put(skillS.toLowerCase(), skillInfo);
+					return;
+				} else {
+					matcher = SKILL_PATTERN_PERCENTAGE.matcher(component);
+					if (matcher.matches()) {
+						String skillS = matcher.group(2);
+						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()) {
+							String skillS = matcher.group(2);
+							String currentXpS = matcher.group(3).replace(",", "");
+							String maxXpS = matcher.group(4).replace(",", "");
+
+							float maxMult = 1;
+							if (maxXpS.endsWith("k")) {
+								maxMult = 1000;
+								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")) {
+								maxMult = 1000000000;
+								maxXpS = maxXpS.substring(0, maxXpS.length() - 1);
+							}
+
+							float currentXp = Float.parseFloat(currentXpS);
+							float maxXp = Float.parseFloat(maxXpS) * maxMult;
+
+							SkillInfo skillInfo = new SkillInfo();
+							skillInfo.currentXp = currentXp;
+							skillInfo.currentXpMax = maxXp;
+							skillInfo.totalXp = currentXp;
+
+							JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
+							for (int i = 0; i < levelingArray.size(); i++) {
+								float cap = levelingArray.get(i).getAsFloat();
+								if (maxXp > 0 && maxXp <= cap) {
+									break;
+								}
+
+								skillInfo.totalXp += cap;
+								skillInfo.level++;
+							}
+
+							skillInfoMap.put(skillS.toLowerCase(), skillInfo);
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public void updateLevel(String skill, int level) {
+		if (updateWithPercentage.containsKey(skill)) {
+			JsonObject leveling = Constants.LEVELING;
+			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++) {
+				float cap = levelingArray.get(i).getAsFloat();
+				if (i == level) {
+					skillInfo.currentXp += updateWithPercentage.get(skill) / 100f * cap;
+					skillInfo.totalXp += skillInfo.currentXp;
+					skillInfo.currentXpMax = cap;
+				} else {
+					skillInfo.totalXp += cap;
+				}
+			}
+
+			SkillInfo old = skillInfoMap.get(skill.toLowerCase());
+
+			if (old.totalXp <= skillInfo.totalXp) {
+				correctionCounter--;
+				if (correctionCounter < 0) correctionCounter = 0;
+
+				skillInfoMap.put(skill.toLowerCase(), skillInfo);
+			} else if (++correctionCounter >= 10) {
+				correctionCounter = 0;
+				skillInfoMap.put(skill.toLowerCase(), skillInfo);
+			}
+		}
+		updateWithPercentage.clear();
+	}
+
+	public void tick() {
+		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 void onApiUpdated(ProfileViewer.Profile profile) {
+		JsonObject skillInfo = profile.getSkillInfo(null);
+
+		for (String skill : skills) {
+			SkillInfo info = new SkillInfo();
+
+			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.fromApi = true;
+
+			skillInfoMap.put(skill.toLowerCase(), info);
+		}
+	}
+
+	public double getPetLevel(String petId, double exp, String rarity) {
+		Stream<JsonElement> pet_levels =
+			StreamSupport.stream(Constants.PETS.get("pet_levels").getAsJsonArray().spliterator(), false);
+		int pet_rarity_offset = Constants.PETS.getAsJsonObject("pet_rarity_offset").get(rarity).getAsInt();
+		JsonObject custom_pet_leveling = Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(petId);
+		List<Integer> xpLevelsRequired =
+			pet_levels.skip(pet_rarity_offset).limit(100).map(JsonElement::getAsInt).collect(Collectors.toList());
+		if (custom_pet_leveling != null && custom_pet_leveling.get("type").getAsInt() == 1)
+			xpLevelsRequired.addAll(StreamSupport
+				.stream(custom_pet_leveling.getAsJsonArray("pet_levels").spliterator(), false)
+				.map(JsonElement::getAsInt)
+				.collect(Collectors.toList()));
+		double remainingExp = exp;
+		for (int i = 0; i < xpLevelsRequired.size(); i++) {
+			int xpForCurrentLevel = xpLevelsRequired.get(i);
+			if (remainingExp >= xpForCurrentLevel) {
+				remainingExp -= xpForCurrentLevel;
+			} else {
+				return i + 1 + remainingExp / xpForCurrentLevel;
+			}
+		}
+		return xpLevelsRequired.size();
+	}
 
 }