Format v2

89 files changed, 11642 insertions, 10878 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
index 4e6f398..28c5485 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
@@ -2,58 +2,58 @@ package com.thatgravyboat.skyblockhud;
 
 public class ComponentBuilder {
 
-  public StringBuilder builder;
-
-  public ComponentBuilder() {
-    this.builder = new StringBuilder();
-  }
-
-  public ComponentBuilder apd(String text) {
-    return apd(text, '7');
-  }
-
-  public ComponentBuilder apd(String text, char[] colors) {
-    for (char color : colors) {
-      builder.append("\u00A7").append(color);
-    }
-    builder.append(text).append("\u00A7").append('r');
-    return this;
-  }
-
-  public ComponentBuilder apd(String text, char color) {
-    builder
-      .append("\u00A7")
-      .append(color)
-      .append(text)
-      .append("\u00A7")
-      .append('r');
-    return this;
-  }
-
-  public ComponentBuilder nl() {
-    builder.append("\n");
-    return this;
-  }
-
-  public ComponentBuilder nl(String text, char color) {
-    apd(text, color);
-    builder.append("\n");
-    return this;
-  }
-
-  public ComponentBuilder nl(String text, char[] colors) {
-    apd(text, colors);
-    builder.append("\n");
-    return this;
-  }
-
-  public ComponentBuilder nl(String text) {
-    apd(text);
-    builder.append("\n");
-    return this;
-  }
-
-  public String build() {
-    return builder.toString();
-  }
+    public StringBuilder builder;
+
+    public ComponentBuilder() {
+        this.builder = new StringBuilder();
+    }
+
+    public ComponentBuilder apd(String text) {
+        return apd(text, '7');
+    }
+
+    public ComponentBuilder apd(String text, char[] colors) {
+        for (char color : colors) {
+            builder.append("\u00A7").append(color);
+        }
+        builder.append(text).append("\u00A7").append('r');
+        return this;
+    }
+
+    public ComponentBuilder apd(String text, char color) {
+        builder
+            .append("\u00A7")
+            .append(color)
+            .append(text)
+            .append("\u00A7")
+            .append('r');
+        return this;
+    }
+
+    public ComponentBuilder nl() {
+        builder.append("\n");
+        return this;
+    }
+
+    public ComponentBuilder nl(String text, char color) {
+        apd(text, color);
+        builder.append("\n");
+        return this;
+    }
+
+    public ComponentBuilder nl(String text, char[] colors) {
+        apd(text, colors);
+        builder.append("\n");
+        return this;
+    }
+
+    public ComponentBuilder nl(String text) {
+        apd(text);
+        builder.append("\n");
+        return this;
+    }
+
+    public String build() {
+        return builder.toString();
+    }
 }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
index 03bfe04..ef2028d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
@@ -22,193 +22,243 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ComponentHandler {
 
-  public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile(
-    "[^]\\[a-z A-Z:0-9/'.()+\\d-§?]"
-  );
-  private static final Ordering<NetworkPlayerInfo> sortingList = Ordering.from(
-    new PlayerComparator()
-  );
-  private static int ticksExisted = 0;
+    public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile(
+        "[^]\\[a-z A-Z:0-9/'.()+\\d-§?]"
+    );
+    private static final Ordering<NetworkPlayerInfo> sortingList = Ordering.from(
+        new PlayerComparator()
+    );
+    private static int ticksExisted = 0;
 
-  @SubscribeEvent
-  public void onClientTick(TickEvent.ClientTickEvent event) {
-    Minecraft mc = Minecraft.getMinecraft();
-    ticksExisted++;
-    boolean eventPass = false;
-    if (mc.theWorld != null) {
-      List<NetworkPlayerInfo> players = sortingList.sortedCopy(
-        mc.thePlayer.sendQueue.getPlayerInfoMap()
-      );
-      GuiIngameForge.renderObjective =
-        !SkyblockHud.hasSkyblockScoreboard() ||
-        !SkyblockHud.config.misc.hideScoreboard;
-      if (players != null && SkyblockHud.hasSkyblockScoreboard()) {
-        if (ticksExisted % 60 == 0) {
-          for (NetworkPlayerInfo player : players) {
-            if (player.getDisplayName() != null) {
-              String formattedTabListPlayer = SCOREBOARD_CHARACTERS
-                .matcher(
-                  Utils.removeColor(player.getDisplayName().getFormattedText())
-                )
-                .replaceAll("");
-              if (
-                LocationHandler.getCurrentLocation().equals(Locations.CATACOMBS)
-              ) {
-                if (
-                  formattedTabListPlayer
-                    .toLowerCase()
-                    .contains("secrets found:")
-                ) DungeonHandler.parseTotalSecrets(formattedTabListPlayer);
-                if (
-                  formattedTabListPlayer.toLowerCase().contains("deaths:")
-                ) DungeonHandler.parseDeaths(formattedTabListPlayer);
-                if (
-                  formattedTabListPlayer.toLowerCase().contains("crypts:")
-                ) DungeonHandler.parseCrypts(formattedTabListPlayer);
-              } else if (
-                LocationHandler
-                  .getCurrentLocation()
-                  .getCategory()
-                  .equals(LocationCategory.DWARVENMINES)
-              ) {
-                if (
-                  formatte