Format

92 files changed, 11149 insertions, 7268 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
index e5299d5..4e6f398 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
@@ -2,54 +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 3c671f0..03bfe04 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
@@ -5,6 +5,9 @@ import com.google.common.collect.Ordering;
 import com.thatgravyboat.skyblockhud.dungeons.DungeonHandler;
 import com.thatgravyboat.skyblockhud.location.*;
 import com.thatgravyboat.skyblockhud.seasons.SeasonDateHandler;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Pattern;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.scoreboard.ScorePlayerTeam;
@@ -17,108 +20,195 @@ import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.regex.Pattern;
-
 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;
 
-    @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()){
+  public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile(
+    "[^]\\[a-z A-Z:0-9/'.()+\\d-§?]"
+  );
+  private static final Ordering<NetworkPlayerInfo> sortingList = Ordering.from(
+    new Playe