112 files changed, 180 insertions, 193 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/ComponentHandler.java
index 5677a7382..5677a7382 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/ComponentHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java b/src/main/java/com/thatgravyboat/skyblockhud_2/DevModeConstants.java
index 89df438d7..7f218384c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/DevModeConstants.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud;
+package com.thatgravyboat.skyblockhud_2;
 
 public class DevModeConstants {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java b/src/main/java/com/thatgravyboat/skyblockhud_2/GuiTextures.java
index bb49c9c9e..486c5f7c6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/GuiTextures.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud;
+package com.thatgravyboat.skyblockhud_2;
 
 import net.minecraft.util.ResourceLocation;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/KillTracking.java
index 84882e1f4..84882e1f4 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/KillTracking.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/LeaderboardGetter.java
index de485ef5e..de485ef5e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/LeaderboardGetter.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/LocationChangeEvent.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/LocationChangeEvent.java
index 560ad32e4..560ad32e4 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/LocationChangeEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/LocationChangeEvent.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/ProfileJoinedEvent.java
index f1d4d38b8..c1d51baf6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/ProfileJoinedEvent.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.events;
+package com.thatgravyboat.skyblockhud_2.api.events;
 
 import net.minecraftforge.fml.common.eventhandler.Event;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/ProfileSwitchedEvent.java
index 408ac8ade..577821349 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/ProfileSwitchedEvent.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.events;
+package com.thatgravyboat.skyblockhud_2.api.events;
 
 import net.minecraftforge.fml.common.eventhandler.Event;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarLineUpdateEvent.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarLineUpdateEvent.java
index 2737ee911..c99684a79 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarLineUpdateEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarLineUpdateEvent.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.events;
+package com.thatgravyboat.skyblockhud_2.api.events;
 
 import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.scoreboard.Scoreboard;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarPostEvent.java
index 34d27e6bc..13bf5c1e8 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarPostEvent.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.events;
+package com.thatgravyboat.skyblockhud_2.api.events;
 
 import java.util.List;
 import net.minecraft.scoreboard.ScoreObjective;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPreGetEvent.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarPreGetEvent.java
index 0db1895c6..b94780acc 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPreGetEvent.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SidebarPreGetEvent.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.events;
+package com.thatgravyboat.skyblockhud_2.api.events;
 
 import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.scoreboard.Scoreboard;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SkyBlockEntityKilled.java
index 61f8d824f..7553c171d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/events/SkyBlockEntityKilled.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.events;
+package com.thatgravyboat.skyblockhud_2.api.events;
 
 import javax.annotation.Nullable;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/item/IAbility.java
index 4f330d9a3..ab3954048 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/item/IAbility.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.item;
+package com.thatgravyboat.skyblockhud_2.api.item;
 
 public interface IAbility {
     String getAbility();
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/EntityTypeHelper.java
index 2d8a17e4b..2d8a17e4b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/EntityTypeHelper.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeRegistry.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/EntityTypeRegistry.java
index d507eecfd..d507eecfd 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeRegistry.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/EntityTypeRegistry.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/SkyBlockEntity.java b/src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/SkyBlockEntity.java
index bcd1196f5..24b30e712 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/SkyBlockEntity.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/api/sbentities/SkyBlockEntity.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.api.sbentities;
+package com.thatgravyboat.skyblockhud_2.api.sbentities;
 
 import java.util.function.Predicate;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/Commands.java
index 360c35578..21bf4529f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/Commands.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.skyblockhud.commands;
+package com.thatgravyboat.skyblockhud_2.commands;
 
 import at.lorenz.mod.LorenzMod;
-import com.thatgravyboat.skyblockhud.config.SBHConfigEditor;
-import com.thatgravyboat.skyblockhud.core.GuiScreenElementWrapper;
+import com.thatgravyboat.skyblockhud_2.config.SBHConfigEditor;
+import com.thatgravyboat.skyblockhud_2.core.GuiScreenElementWrapper;
 //import com.thatgravyboat.skyblockhud.handlers.CrystalWaypoints;
 import net.minecraft.command.ICommandSender;
 import net.minecraftforge.client.ClientCommandHandler;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/SimpleCommand.java
index 57ef3168a..851ea8c5c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/SimpleCommand.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.commands;
+package com.thatgravyboat.skyblockhud_2.commands;
 
 import java.util.List;
 import net.minecraft.command.CommandBase;
@@ -10,8 +10,8 @@ import net.minecraft.util.BlockPos;
  **/
 public class SimpleCommand extends CommandBase {
 
-    private String commandName;
-    private ProcessCommandRunnable runnable;
+    private final String commandName;
+    private final ProcessCommandRunnable runnable;
     private TabCompleteRunnable tabRunnable;
 
     public SimpleCommand(String commandName, ProcessCommandRunnable runnable) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleSubCommand.java b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/SimpleSubCommand.java
index 4869d6bc9..4869d6bc9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleSubCommand.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/commands/SimpleSubCommand.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java b/src/main/java/com/thatgravyboat/skyblockhud_2/config/KeyBindings.java
index 9ffd3523b..0d2e5e5a3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/config/KeyBindings.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.config;
+package com.thatgravyboat.skyblockhud_2.config;
 
 import net.minecraft.client.settings.KeyBinding;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java b/src/main/java/com/thatgravyboat/skyblockhud_2/config/SBHConfig.java
index 62cd406fc..62cd406fc 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/config/SBHConfig.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java b/src/main/java/com/thatgravyboat/skyblockhud_2/config/SBHConfigEditor.java
index 1e8fd5721..1838710b2 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/config/SBHConfigEditor.java
@@ -1,19 +1,19 @@
-package com.thatgravyboat.skyblockhud.config;
+package com.thatgravyboat.skyblockhud_2.config;
 
-import static com.thatgravyboat.skyblockhud.GuiTextures.DISCORD;
-import static com.thatgravyboat.skyblockhud.GuiTextures.TWITTER;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.DISCORD;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.TWITTER;
 
 import at.lorenz.mod.config.Features;
 import com.google.common.collect.Lists;
-import com.thatgravyboat.skyblockhud.core.GlScissorStack;
-import com.thatgravyboat.skyblockhud.core.GuiElement;
-import com.thatgravyboat.skyblockhud.core.config.gui.GuiOptionEditor;
-import com.thatgravyboat.skyblockhud.core.config.gui.GuiOptionEditorAccordion;
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.lerp.LerpUtils;
-import com.thatgravyboat.skyblockhud.core.util.lerp.LerpingInteger;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.GlScissorStack;
+import com.thatgravyboat.skyblockhud_2.core.GuiElement;
+import com.thatgravyboat.skyblockhud_2.core.config.gui.GuiOptionEditor;
+import com.thatgravyboat.skyblockhud_2.core.config.gui.GuiOptionEditorAccordion;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.lerp.LerpUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.lerp.LerpingInteger;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.net.URI;
 import java.util.*;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/BackgroundBlur.java
index 64f04fe70..614b895c7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/BackgroundBlur.java
@@ -1,6 +1,6 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/ChromaColour.java
index d43e8b9cb..1662b2853 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/ChromaColour.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
 import java.awt.*;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GlScissorStack.java
index 0e1694e8a..0b651884a 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GlScissorStack.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
 import java.util.LinkedList;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElement.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElement.java
index e8d9d62df..137c6a5c5 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElement.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElement.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
 import net.minecraft.client.gui.Gui;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementBoolean.java
index 8daf4b1e0..ec3e678e6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementBoolean.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
-import com.thatgravyboat.skyblockhud.GuiTextures;
-import com.thatgravyboat.skyblockhud.core.util.lerp.LerpUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.GuiTextures;
+import com.thatgravyboat.skyblockhud_2.core.util.lerp.LerpUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
 import java.util.function.Consumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
@@ -14,8 +14,8 @@ public class GuiElementBoolean extends GuiElement {
     public int x;
     public int y;
     private boolean value;
-    private int clickRadius;
-    private Consumer<Boolean> toggleCallback;
+    private final int clickRadius;
+    private final Consumer<Boolean> toggleCallback;
 
     private boolean previewValue;
     private int animation = 0;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementColour.java
index c38e51b4c..4002c8bf6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementColour.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.function.Consumer;
@@ -28,18 +28,18 @@ public class GuiElementColour extends GuiElement {
     private static final ResourceLocation colourPickerBarOpacityLocation = new ResourceLocation("mbcore:dynamic/colourpickeropacity");
     private final GuiElementTextField hexField = new GuiElementTextField("", GuiElementTextField.SCALE_TEXT | GuiElementTextField.FORCE_CAPS | GuiElementTextField.NO_SPACE);
 
-    private int x;
-    private int y;
+    private final int x;
+    private final int y;
     private int xSize = 119;
-    private int ySize = 89;
+    private final int ySize = 89;
 
     private float wheelAngle = 0;
     private float wheelRadius = 0;
 
     private int clickedComponent = -1;
 
-    private Consumer<String> colourChangedCallback;
-    private Runnable closeCallback;
+    private final Consumer<String> colourChangedCallback;
+    private final Runnable closeCallback;
     private String colour;
 
     private final boolean opacitySlider;
@@ -160,7 +160,7 @@ public class GuiElementColour extends GuiElement {
         int chromaSpeed = ChromaColour.getSpeed(colour);
         int currentColourChroma = ChromaColour.specialToChromaRGB(colour);
         Color cChroma = new Color(currentColourChroma, true);
-        float hsvChroma[] = Color.RGBtoHSB(cChroma.getRed(), cChroma.getGreen(), cChroma.getBlue(), null);
+        float[] hsvChroma = Color.RGBtoHSB(cChroma.getRed(), cChroma.getGreen(), cChroma.getBlue(), null);
 
         if (chromaSpeed > 0) {
             Gui.drawRect(x + 5 + 64 + valueOffset + opacityOffset + 5 + 1, y + 5 + 1, x + 5 + 64 + valueOffset + opacityOffset + 5 + 10 - 1, y + 5 + 64 - 1, Color.HSBtoRGB(hsvChroma[0], 0.8f, 0.8f));
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementTextField.java
index bbb29eec0..e4430b974 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiElementTextField.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
-import com.thatgravyboat.skyblockhud.core.util.StringUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.StringUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiScreenElementWrapper.java
index 326c85fed..252abcb77 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/GuiScreenElementWrapper.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core;
+package com.thatgravyboat.skyblockhud_2.core;
 
 import java.io.IOException;
 import net.minecraft.client.gui.GuiScreen;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/Config.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java
index 6baf651b4..b30f7924c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/Config.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config;
+package com.thatgravyboat.skyblockhud_2.core.config;
 
 //public class Config {
 //
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/KeybindHelper.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/KeybindHelper.java
index 7470b6ce0..d16282c60 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/KeybindHelper.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/KeybindHelper.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config;
+package com.thatgravyboat.skyblockhud_2.core.config;
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Position.java
index 0b3a1f5d7..f9396f45a 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Position.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config;
+package com.thatgravyboat.skyblockhud_2.core.config;
 
 import com.google.gson.annotations.Expose;
 import net.minecraft.client.gui.ScaledResolution;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/Category.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/Category.java
index 05ae6ad87..5514a5f00 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/Category.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/Category.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigAccordionId.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigAccordionId.java
index 44b82bea6..ae257c1ba 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigAccordionId.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigAccordionId.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorAccordion.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorAccordion.java
index 9712148fa..2a8e5cc14 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorAccordion.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorAccordion.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorBoolean.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorBoolean.java
index f86448e44..9e5a50907 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorBoolean.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorBoolean.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorButton.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorButton.java
index 5e4bab8b2..0b2694d5f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorButton.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorButton.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorColour.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorColour.java
index 146f09ae9..dd766fedf 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorColour.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDraggableList.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorDraggableList.java
index 6bbeb27ec..0d4a591b3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDraggableList.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorDraggableList.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDropdown.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorDropdown.java
index cc8bbf442..0b06807fa 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDropdown.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorDropdown.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorKeybind.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorKeybind.java
index e8e55f1b2..eced2e906 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorKeybind.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorKeybind.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorSlider.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorSlider.java
index dcdf0b18b..4d283d3bb 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorSlider.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorSlider.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorStyle.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorStyle.java
index a02a12d66..dcc8910f9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorStyle.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorStyle.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorText.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorText.java
index 61e7ed58f..fb61eb6d9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorText.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigEditorText.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigOption.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigOption.java
index 457475833..a8a563125 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigOption.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/annotations/ConfigOption.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.config.annotations;
+package com.thatgravyboat.skyblockhud_2.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditor.java
index 927bebf01..000a0a32a 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditor.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.GlStateManager;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorAccordion.java
index dad85a61c..bc4d7e5d4 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorAccordion.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
@@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11;
 
 public class GuiOptionEditorAccordion extends GuiOptionEditor {
 
-    private int accordionId;
+    private final int accordionId;
     private boolean accordionToggled;
 
     public GuiOptionEditorAccordion(ConfigProcessor.ProcessedOption option, int accordionId) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorBoolean.java
index 4167e061f..72cb903a9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorBoolean.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.GuiElementBoolean;
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.GuiElementBoolean;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
 
 public class GuiOptionEditorBoolean extends GuiOptionEditor {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorButton.java
index 0d2f99faa..f1db830bf 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorButton.java
@@ -1,11 +1,11 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import static com.thatgravyboat.skyblockhud.GuiTextures.button_tex;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.button_tex;
 
 import at.lorenz.mod.config.Features;
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorColour.java
index c916fef38..5606be506 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorColour.java
@@ -1,11 +1,11 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import static com.thatgravyboat.skyblockhud.GuiTextures.*;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.*;
 
-import com.thatgravyboat.skyblockhud.core.ChromaColour;
-import com.thatgravyboat.skyblockhud.core.GuiElementColour;
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.ChromaColour;
+import com.thatgravyboat.skyblockhud_2.core.GuiElementColour;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import org.lwjgl.input.Mouse;
@@ -43,10 +43,7 @@ public class GuiOptionEditorColour extends GuiOptionEditor {
 
     @Override
     public boolean mouseInputOverlay(int x, int y, int width, int mouseX, int mouseY) {
-        if (colourElement != null && colourElement.mouseInput(mouseX, mouseY)) {
-            return true;
-        }
-        return false;
+        return colourElement != null && colourElement.mouseInput(mouseX, mouseY);
     }
 
     @Override
@@ -72,10 +69,6 @@ public class GuiOptionEditorColour extends GuiOptionEditor {
 
     @Override
     public boolean keyboardInput() {
-        if (colourElement != null && colourElement.keyboardInput()) {
-            return true;
-        }
-
-        return false;
+        return colourElement != null && colourElement.keyboardInput();
     }
 }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorDraggableList.java
index 1e6fa0c63..aab5b9b7f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorDraggableList.java
@@ -1,13 +1,13 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import static com.thatgravyboat.skyblockhud.GuiTextures.DELETE;
-import static com.thatgravyboat.skyblockhud.GuiTextures.button_tex;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.DELETE;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.button_tex;
 
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.lerp.LerpUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
-import com.thatgravyboat.skyblockhud.utils.Utils;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.lerp.LerpUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.utils.Utils;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.Minecraft;
@@ -21,8 +21,8 @@ import org.lwjgl.opengl.GL11;
 
 public class GuiOptionEditorDraggableList extends GuiOptionEditor {
 
-    private String[] exampleText;
-    private List<Integer> activeText;
+    private final String[] exampleText;
+    private final List<Integer> activeText;
     private int currentDragging = -1;
     private int dragStartIndex = -1;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorDropdown.java
index 6b703cd12..0adc97cd7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorDropdown.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorKeybind.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorKeybind.java
index ecdaa3aae..f0e7c5aa6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorKeybind.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorKeybind.java
@@ -1,11 +1,11 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import static com.thatgravyboat.skyblockhud.GuiTextures.*;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.*;
 
-import com.thatgravyboat.skyblockhud.core.config.KeybindHelper;
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
-import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.config.KeybindHelper;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.render.RenderUtils;
+import com.thatgravyboat.skyblockhud_2.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
@@ -18,7 +18,7 @@ public class GuiOptionEditorKeybind extends GuiOptionEditor {
     private static final ResourceLocation RESET = new ResourceLocation("notenoughupdates:itemcustomize/reset.png");
 
     private int keyCode;
-    private int defaultKeyCode;
+    private final int defaultKeyCode;
     private boolean editingKeycode;
 
     public GuiOptionEditorKeybind(ConfigProcessor.ProcessedOption option, int keyCode, int defaultKeyCode) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorSlider.java
index ad96a4f78..e5b009471 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorSlider.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.GuiElementTextField;
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.core.util.GuiElementSlider;
+import com.thatgravyboat.skyblockhud_2.core.GuiElementTextField;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.util.GuiElementSlider;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorStyle.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorStyle.java
index a2fd17aae..750907091 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorStyle.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorStyle.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.skyblockhud.textures.Textures;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.textures.Textures;
 import java.util.stream.Collectors;
 import org.lwjgl.input.Mouse;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorText.java
index c68deaf30..ecd889897 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiOptionEditorText.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.GuiElementTextField;
-import com.thatgravyboat.skyblockhud.core.config.struct.ConfigProcessor;
+import com.thatgravyboat.skyblockhud_2.core.GuiElementTextField;
+import com.thatgravyboat.skyblockhud_2.core.config.struct.ConfigProcessor;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiPositionEditor.java
index 7c16530c8..1fa0f8865 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/gui/GuiPositionEditor.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.skyblockhud.core.config.gui;
+package com.thatgravyboat.skyblockhud_2.core.config.gui;
 
-import com.thatgravyboat.skyblockhud.core.config.Position;
-import com.thatgravyboat.skyblockhud.utils.Utils;
+import com.thatgravyboat.skyblockhud_2.core.config.Position;
+import com.thatgravyboat.skyblockhud_2.utils.Utils;
 import java.io.IOException;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
@@ -13,7 +13,7 @@ import org.lwjgl.input.Mouse;
 public class GuiPositionEditor extends GuiScreen {
 
     private final Position position;
-    private Position originalPosition;
+    private final Position originalPosition;
     private final int elementWidth;
     private final int elementHeight;
     private final Runnable renderCallback;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/struct/ConfigProcessor.java
index a1a901cdb..0301b76ae 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/struct/ConfigProcessor.java
@@ -1,9 +1,9 @@
-package com.thatgravyboat.skyblockhud.core.config.struct;
+package com.thatgravyboat.skyblockhud_2.core.config.struct;
 
 import at.lorenz.mod.config.Features;
 import com.google.gson.annotations.Expose;
-import com.thatgravyboat.skyblockhud.core.config.annotations.*;
-import com.thatgravyboat.skyblockhud.core.config.gui.*;
+import com.thatgravyboat.skyblockhud_2.core.config.annotations.*;
+import com.thatgravyboat.skyblockhud_2.core.config.gui.*;
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/GuiElementSlider.java
index eb5fe6fa6..f29a47302 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/GuiElementSlider.java
@@ -1,9 +1,9 @@
-package com.thatgravyboat.skyblockhud.core.util;
+package com.thatgravyboat.skyblockhud_2.core.util;
 
-import static com.thatgravyboat.skyblockhud.GuiTextures.*;
+import static com.thatgravyboat.skyblockhud_2.GuiTextures.*;
 
-import com.thatgravyboat.skyblockhud.core.GuiElement;
-import com.thatgravyboat.skyblockhud.utils.Utils;
+import com.thatgravyboat.skyblockhud_2.core.GuiElement;
+import com.thatgravyboat.skyblockhud_2.utils.Utils;
 import java.util.function.Consumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
@@ -18,12 +18,12 @@ public class GuiElementSlider extends GuiElement {
     public int width;
     private static final int HEIGHT = 16;
 
-    private float minValue;
-    private float maxValue;
-    private float minStep;
+    private final float minValue;
+    private final float maxValue;
+    private final float minStep;
 
     private float value;
-    private Consumer<Float> setCallback;
+    private final Consumer<Float> setCallback;
 
     private boolean clicked = false;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/StringUtils.java
index 06506ee0b..7e8d5e621 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/StringUtils.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.util;
+package com.thatgravyboat.skyblockhud_2.core.util;
 
 public class StringUtils {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpUtils.java
index 1b88f5a14..a7a5b8250 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpUtils.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.util.lerp;
+package com.thatgravyboat.skyblockhud_2.core.util.lerp;
 
 public class LerpUtils {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpingFloat.java
index edf129b8c..ae926cc98 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpingFloat.java
@@ -1,10 +1,10 @@
-package com.thatgravyboat.skyblockhud.core.util.lerp;
+package com.thatgravyboat.skyblockhud_2.core.util.lerp;
 
 public class LerpingFloat {
 
     private int timeSpent;
     private long lastMillis;
-    private int timeToReachTarget;
+    private final int timeToReachTarget;
 
     private float targetValue;
     private float lerpValue;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpingInteger.java
index 0bae86985..b6690c6b1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/lerp/LerpingInteger.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.util.lerp;
+package com.thatgravyboat.skyblockhud_2.core.util.lerp;
 
 public class LerpingInteger {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/render/RenderUtils.java
index bbaabb88a..807a0902b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/render/RenderUtils.java
@@ -1,6 +1,6 @@
-package com.thatgravyboat.skyblockhud.core.util.render;
+package com.thatgravyboat.skyblockhud_2.core.util.render;
 
-import com.thatgravyboat.skyblockhud.core.BackgroundBlur;
+import com.thatgravyboat.skyblockhud_2.core.BackgroundBlur;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/render/TextRenderUtils.java
index b8d255103..ea9eee0e6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/util/render/TextRenderUtils.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.core.util.render;
+package com.thatgravyboat.skyblockhud_2.core.util.render;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java b/src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/Classes.java
index b05fe91e1..0c5fad548 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/Classes.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.dungeons;
+package com.thatgravyboat.skyblockhud_2.dungeons;
 
 public enum Classes {
     H("Healer", "H", 154),
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/DungeonHandler.java
index e2117c26f..e2117c26f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/DungeonHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java b/src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/DungeonPlayer.java
index b0816fb96..1dbe4d231 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/dungeons/DungeonPlayer.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.dungeons;
+package com.thatgravyboat.skyblockhud_2.dungeons;
 
 public class DungeonPlayer {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/BossbarHandler.java
index 7c80fe6cc..7c80fe6cc 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/BossbarHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CooldownHandler.java
index 7c4d39ab6..7c4d39ab6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CooldownHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CrystalWaypoints.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CrystalWaypoints.java
index 6a160c790..6a160c790 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CrystalWaypoints.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CrystalWaypoints.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CurrencyHandler.java
index 7520eaf3f..55c07e134 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/CurrencyHandler.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.skyblockhud.handlers;
+package com.thatgravyboat.skyblockhud_2.handlers;
 
-import com.thatgravyboat.skyblockhud.api.events.SidebarLineUpdateEvent;
-import com.thatgravyboat.skyblockhud.api.events.SidebarPostEvent;
-import com.thatgravyboat.skyblockhud.utils.Utils;
+import com.thatgravyboat.skyblockhud_2.api.events.SidebarLineUpdateEvent;
+import com.thatgravyboat.skyblockhud_2.api.events.SidebarPostEvent;
+import com.thatgravyboat.skyblockhud_2.utils.Utils;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/HeldItemHandler.java
index 2feef3817..f1f917833 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/HeldItemHandler.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.handlers;
+package com.thatgravyboat.skyblockhud_2.handlers;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/MapHandler.java
index 5f6b2c64c..5f6b2c64c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/MapHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/NpcDialogue.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/NpcDialogue.java
index 4159cb63f..4159cb63f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/NpcDialogue.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/NpcDialogue.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/SlayerHandler.java
index 4a1f4e698..96c7e7eaf 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/SlayerHandler.java
@@ -1,9 +1,9 @@
-package com.thatgravyboat.skyblockhud.handlers;
+package com.thatgravyboat.skyblockhud_2.handlers;
 
-import com.thatgravyboat.skyblockhud.api.events.SidebarLineUpdateEvent;
-import com.thatgravyboat.skyblockhud.api.events.SidebarPostEvent;
-import com.thatgravyboat.skyblockhud.api.events.SkyBlockEntityKilled;
-import com.thatgravyboat.skyblockhud.utils.Utils;
+import com.thatgravyboat.skyblockhud_2.api.events.SidebarLineUpdateEvent;
+import com.thatgravyboat.skyblockhud_2.api.events.SidebarPostEvent;
+import com.thatgravyboat.skyblockhud_2.api.events.SkyBlockEntityKilled;
+import com.thatgravyboat.skyblockhud_2.utils.Utils;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.regex.Matcher;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/TimeHandler.java
index f1aa22295..d7e486af1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/TimeHandler.java
@@ -1,6 +1,6 @@
-package com.thatgravyboat.skyblockhud.handlers;
+package com.thatgravyboat.skyblockhud_2.handlers;
 
-import com.thatgravyboat.skyblockhud.api.events.SidebarLineUpdateEvent;
+import com.thatgravyboat.skyblockhud_2.api.events.SidebarLineUpdateEvent;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java
index d92851cb3..fefe65470 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/WarpHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java
@@ -1,13 +1,13 @@
-package com.thatgravyboat.skyblockhud.handlers;
+package com.thatgravyboat.skyblockhud_2.handlers;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
 import com.google.gson.*;
 import at.lorenz.mod.LorenzMod;
-import com.thatgravyboat.skyblockhud.api.events.ProfileJoinedEvent;
-import com.thatgravyboat.skyblockhud.api.events.ProfileSwitchedEvent;
-import com.thatgravyboat.skyblockhud.mixins.GuiChestAccessor;
-import com.thatgravyboat.skyblockhud.utils.Utils;
+import com.thatgravyboat.skyblockhud_2.api.events.ProfileJoinedEvent;
+import com.thatgravyboat.skyblockhud_2.api.events.ProfileSwitchedEvent;
+import com.thatgravyboat.skyblockhud_2.mixins.GuiChestAccessor;
+import com.thatgravyboat.skyblockhud_2.utils.Utils;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/mapicons/DwarvenIcons.java
index 1dfb12a0a..1dfb12a0a 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/mapicons/DwarvenIcons.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/mapicons/HubIcons.java
index 0192be305..0192be305 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/mapicons/HubIcons.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/EndIslandHandler.java
index 505db19d2..947f14f4e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/EndIslandHandler.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.location;
+package com.thatgravyboat.skyblockhud_2.location;
 
 public class EndIslandHandler {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmHouseHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/FarmHouseHandler.java
index 005d9ff8c..eab69090d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmHouseHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/FarmHouseHandler.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.skyblockhud.location;
+package com.thatgravyboat.skyblockhud_2.location;
 
-import com.thatgravyboat.skyblockhud.api.events.ProfileSwitchedEvent;
-import com.thatgravyboat.skyblockhud.api.events.SidebarLineUpdateEvent;
+import com.thatgravyboat.skyblockhud_2.api.events.ProfileSwitchedEvent;
+import com.thatgravyboat.skyblockhud_2.api.events.SidebarLineUpdateEvent;
 import java.util.Arrays;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/FarmingIslandHandler.java
index db71fab5d..db71fab5d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/FarmingIslandHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/IslandHandler.java
index d0a4d0eb1..d0a4d0eb1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/IslandHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/LocationCategory.java
index de5c1d223..de5c1d223 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/LocationCategory.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/LocationHandler.java
index 292429571..292429571 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/LocationHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/Locations.java
index 1f5fce003..1f5fce003 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/Locations.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/MinesHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/MinesHandler.java
index b9c7657bc..b9c7657bc 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/MinesHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/MinesHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/location/ParkIslandHandler.java
index b9628d008..312eb3274 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/location/ParkIslandHandler.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.location;
+package com.thatgravyboat.skyblockhud_2.location;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/GuiChestAccessor.java
index 0a1fb7565..1dc3d336e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/GuiChestAccessor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/GuiChestAccessor.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.mixins;
+package com.thatgravyboat.skyblockhud_2.mixins;
 
 import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.inventory.IInventory;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinEntityArrow.java
index d892c01f1..d892c01f1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinEntityArrow.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinGuiIngameForge.java
index 078bdce8f..078bdce8f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinGuiIngameForge.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinItemStack.java b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinItemStack.java
index eef185561..eef185561 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinItemStack.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinItemStack.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinNetHandlerPlayClient.java
index 9d5bf57bc..9d5bf57bc 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinNetHandlerPlayClient.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinRenderItem.java b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinRenderItem.java
index 64f9086fb..64f9086fb 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinRenderItem.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/mixins/MixinRenderItem.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/DungeonOverlay.java
index b158b004c..b158b004c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/DungeonOverlay.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/GenericOverlays.java
index db773024a..db773024a 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/GenericOverlays.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/MiningHud.java b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/MiningHud.java
index 65e4f7eb1..65e4f7eb1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/MiningHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/MiningHud.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/OverlayHud.java
index f815afaa7..f815afaa7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/OverlayHud.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/RPGHud.java
index 69501b89f..69501b89f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/overlay/RPGHud.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java b/src/main/java/com/thatgravyboat/skyblockhud_2/playerstats/ActionBarParsing.java
index 8fddaec98..8fddaec98 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/playerstats/ActionBarParsing.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/seasons/Season.java b/src/main/java/com/thatgravyboat/skyblockhud_2/seasons/Season.java
index da14204da..d2dd8f637 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/seasons/Season.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/seasons/Season.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.seasons;
+package com.thatgravyboat.skyblockhud_2.seasons;
 
 public enum Season {
     EARLYSPRING("earlyspring", "Early Spring", 34, 0),
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/seasons/SeasonDateHandler.java
index cfce37c07..cfce37c07 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/seasons/SeasonDateHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/textures/TextureObject.java b/src/main/java/com/thatgravyboat/skyblockhud_2/textures/TextureObject.java
index 6403e18bc..319afb82c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/textures/TextureObject.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/textures/TextureObject.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.textures;
+package com.thatgravyboat.skyblockhud_2.textures;
 
 import com.google.gson.JsonObject;
 import java.util.Arrays;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/textures/Textures.java b/src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java
index bddc76339..d17636c7c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/textures/Textures.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java
@@ -1,11 +1,11 @@
-package com.thatgravyboat.skyblockhud.textures;
+package com.thatgravyboat.skyblockhud_2.textures;
 
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import at.lorenz.mod.LorenzMod;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java b/src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerFileLoader.java
index ef51769ee..ef51769ee 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerFileLoader.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerHandler.java
index 7cb059ba5..7cb059ba5 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerHandler.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java b/src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerObject.java
index 0f827c6c3..0f827c6c3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/tracker/TrackerObject.java
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/utils/ComponentBuilder.java b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/ComponentBuilder.java
index 1a73e9558..07d0a925b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/utils/ComponentBuilder.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/ComponentBuilder.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.utils;
+package com.thatgravyboat.skyblockhud_2.utils;
 
 public class ComponentBuilder {
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/utils/SpecialColour.java b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/SpecialColour.java
index 9c1b723c8..2b8cd791d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/utils/SpecialColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/SpecialColour.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.utils;
+package com.thatgravyboat.skyblockhud_2.utils;
 
 import java.awt.*;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/utils/Utils.java b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/Utils.java
index 2dd0d291e..d69a29766 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/utils/Utils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/utils/Utils.java
@@ -1,16 +1,12 @@
-package com.thatgravyboat.skyblockhud.utils;
+package com.thatgravyboat.skyblockhud_2.utils;
 
-import at.lorenz.mod.LorenzMod;
 import java.math.RoundingMode;
 import java.nio.FloatBuffer;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.Locale;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.GlStateManager;
@@ -18,8 +14,6 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.BlockPos;