Added Mining Overlay including drill bar and heat bar

Added mana cost display
Update Location Stuff
Added new mining events
stopped scoreboard logging spam
removed missing location logging as hypixel dumb and sends the wrong thing once and a while causing it to log useless stuff.
Added DEV Commands

34 files changed, 518 insertions, 301 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
index d56fd30..dc997cb 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
@@ -5,9 +5,6 @@ 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;
@@ -20,6 +17,10 @@ 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-§?]");
@@ -45,7 +46,10 @@ public class ComponentHandler {
                                 if (formattedTabListPlayer.toLowerCase().contains("crypts:")) DungeonHandler.parseCrypts(formattedTabListPlayer);
                             } else if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.DWARVENMINES)) {
                                 if (formattedTabListPlayer.toLowerCase().contains("mithril powder:")) {
-                                    DwarvenMineHandler.parseMithril(formattedTabListPlayer);
+                                    MinesHandler.parseMithril(formattedTabListPlayer);
+                                }
+                                if (formattedTabListPlayer.toLowerCase().contains("gemstone powder:")) {
+                                    MinesHandler.parseGemstone(formattedTabListPlayer);
                                 }
                             } else if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.MUSHROOMDESERT)) {
                                 if (formattedTabListPlayer.toLowerCase().contains("pelts:")) {
@@ -64,8 +68,10 @@ public class ComponentHandler {
                                     if (i < 80) {
                                         if (players.get(i + 1).getDisplayName() != null) {
                                             String secondLine = SCOREBOARD_CHARACTERS.matcher(Utils.removeColor(players.get(i + 1).getDisplayName().getFormattedText())).replaceAll("");
-                                            SeasonDateHandler.setCurrentEvent(formattedTabListPlayer.replace("Event:", ""), secondLine);
-                                            eventPass = true;
+                                            if (!formattedTabListPlayer.contains("N/A")) {
+                                                SeasonDateHandler.setCurrentEvent(formattedTabListPlayer.replace("Event:", ""), secondLine);
+                                                eventPass = true;
+                                            }
                                         }
                                     }
                                 }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java b/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java
new file mode 100644
index 0000000..89df438
--- /dev/null
+++ b/src/main/java/com/thatgravyboat/skyblockhud/DevModeConstants.java
@@ -0,0 +1,6 @@
+package com.thatgravyboat.skyblockhud;
+
+public class DevModeConstants {
+
+    public static boolean mobDeathLogging = false;
+}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java b/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java
index 9198433..cd8c25f 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java
@@ -33,4 +33,5 @@ public class GuiTextures {
     public static final ResourceLocation playerStat = new ResourceLocation("skyblockhud", "playerstats.png");
     public static final ResourceLocation bars = new ResourceLocation("skyblockhud", "bars.png");
     public static final ResourceLocation mapOverlay = new ResourceLocation("skyblockhud", "maps/map_overlay.png");
+    public static final ResourceLocation mining = new ResourceLocation("skyblockhud", "mines.png");
 }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
index f461f6d..7352f20 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
@@ -10,20 +10,16 @@ import com.thatgravyboat.skyblockhud.config.KeyBindings;
 import com.thatgravyboat.skyblockhud.config.SBHConfig;
 import com.thatgravyboat.skyblockhud.dungeons.DungeonHandler;
 import com.thatgravyboat.skyblockhud.handlers.*;
-import com.thatgravyboat.skyblockhud.location.DwarvenMineHandler;
 import com.thatgravyboat.skyblockhud.location.FarmingIslandHandler;
 import com.thatgravyboat.skyblockhud.location.IslandHandler;
 import com.thatgravyboat.skyblockhud.location.LocationHandler;
+import com.thatgravyboat.skyblockhud.location.MinesHandler;
 import com.thatgravyboat.skyblockhud.overlay.DungeonOverlay;
+import com.thatgravyboat.skyblockhud.overlay.MiningHud;
 import com.thatgravyboat.skyblockhud.overlay.OverlayHud;
 import com.thatgravyboat.skyblockhud.overlay.RPGHud;
 import com.thatgravyboat.skyblockhud.playerstats.ActionBarParsing;
 import com.thatgravyboat.skyblockhud.seasons.SeasonDateHandler;
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.Set;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.scoreboard.ScoreObjective;
@@ -41,6 +37,12 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.lwjgl.input.Keyboard;
 
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.Set;
+
 @Mod(modid = SkyblockHud.MODID, version = SkyblockHud.VERSION)
 public class SkyblockHud {
 
@@ -68,7 +70,7 @@ public class SkyblockHud {
         MinecraftForge.EVENT_BUS.register(new CurrencyHandler());
         MinecraftForge.EVENT_BUS.register(new SlayerHandler());
         MinecraftForge.EVENT_BUS.register(new DungeonHandler());
-        MinecraftForge.EVENT_BUS.register(new DwarvenMineHandler());
+        MinecraftForge.EVENT_BUS.register(new MinesHandler());
         MinecraftForge.EVENT_BUS.register(new FarmingIslandHandler());
 
         /* DISABLE UNTIL NEW SYSTEM
@@ -119,6 +121,7 @@ public class SkyblockHud {
         MinecraftForge.EVENT_BUS.register(new DungeonOverlay());
         MinecraftForge.EVENT_BUS.register(new BossbarHandler());
         MinecraftForge.EVENT_BUS.register(new MapHandler());
+        MinecraftForge.EVENT_BUS.register(new MiningHud());
     }
 
     /* DISABLE UNTIL NEW SYSTEM
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/Utils.java b/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
index 62cf6a3..3d176c9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
@@ -1,9 +1,5 @@
 package com.thatgravyboat.skyblockhud;
 
-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.FontRenderer;
@@ -14,12 +10,19 @@ import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.fml.common.Loader;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL14;
 
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+
 public class Utils {
 
     private static LinkedList<Integer> guiScales = new LinkedList<>();
@@ -59,6 +62,18 @@ public class Utils {
         return (int) (g + f * (h - g));
     }
 
+    public static NBTTagCompound getSkyBlockTag(ItemStack stack){
+        if (stack == null) return null;
+        if (!stack.hasTagCompound()) return null;
+        if (!stack.getTagCompound().hasKey("ExtraAttributes")) return null;
+        return stack.getTagCompound().getCompoundTag("ExtraAttributes");
+    }
+
+    public static boolean isDrill(ItemStack stack){
+        NBTTagCompound tag = getSkyBlockTag(stack);
+        return tag != null && tag.hasKey("drill_fuel");
+    }
+
     public static int whatRomanNumeral(String roman) {
         switch (roman.toLowerCase()) {
             case "i":
@@ -119,17 +134,13 @@ public class Utils {
 
     public static boolean overlayShouldRender(boolean hideOnf3, RenderGameOverlayEvent.ElementType type, RenderGameOverlayEvent.ElementType checkType, boolean... booleans) {
         Minecraft mc = Minecraft.getMinecraft();
-        boolean shouldRender;
-        if (booleans.length > 1) {
-            for (boolean aBoolean : booleans) if (!aBoolean) return false;
-            shouldRender = true;
-        } else shouldRender = booleans.length != 1 || booleans[0];
+        for (boolean aBoolean : booleans) if (!aBoolean) return false;
         if (hideOnf3) {
             if (mc.gameSettings.showDebugInfo || (mc.gameSettings.keyBindPlayerList.isKeyDown() && (!mc.isIntegratedServerRunning() || mc.thePlayer.sendQueue.getPlayerInfoMap().size() > 1))) {
                 return false;
             }
         }
-        return (shouldRender && ((type == null && Loader.isModLoaded("labymod")) || type == checkType));
+        return ((type == null && Loader.isModLoaded("labymod")) || type == checkType);
     }
 
     public static void drawStringScaledMaxWidth(String str, FontRenderer fr, float x, float y, boolean shadow, int len, int colour) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java
index 5d5615f..9aad4c6 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/KillTracking.java
@@ -1,17 +1,21 @@
-package com.thatgravyboat.skyblockhud.tracker;
+package com.thatgravyboat.skyblockhud.api;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
+import com.thatgravyboat.skyblockhud.DevModeConstants;
+import com.thatgravyboat.skyblockhud.api.events.SkyBlockEntityKilled;
+import com.thatgravyboat.skyblockhud.api.sbentities.EntityTypeRegistry;
 import net.minecraft.client.Minecraft;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-public class KillTrackerHandler {
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+public class KillTracking {
 
     public static final Set<UUID> attackedEntities = new HashSet<>();
 
@@ -24,19 +28,22 @@ public class KillTrackerHandler {
 
     @SubscribeEvent
     public void onDeath(LivingDeathEvent event) {
-        if (false) {
+        if (DevModeConstants.mobDeathLogging) {
             //Used for testing
             System.out.println("----------------------------------------------------------------------------------------------------------------");
             System.out.println("Name : " + event.entity.getName());
             System.out.println("UUID : " + event.entity.getUniqueID());
-            NBTTagCompound tag = new NBTTagCompound();
-            event.entity.writeToNBT(tag);
-            System.out.println("Tag : " + tag);
+            System.out.println("Tag : " + event.entity.serializeNBT());
             System.out.println("Damage : " + getDamageSourceString(event.source));
+            System.out.println("SBH Entity ID: " + EntityTypeRegistry.getEntityId(event.entity));
             System.out.println("----------------------------------------------------------------------------------------------------------------");
         }
-
-        attackedEntities.remove(event.entity.getUniqueID());
+        if (attackedEntities.contains(event.entity.getUniqueID())) {
+            if (EntityTypeRegistry.getEntityId(event.entity) != null) {
+                MinecraftForge.EVENT_BUS.post(new SkyBlockEntityKilled(EntityTypeRegistry.getEntityId(event.entity), event.entity));
+            }
+            attackedEntities.remove(event.entity.getUniqueID());
+        }
     }
 
     public static String getDamageSourceString(DamageSource source) {
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java
new file mode 100644
index 0000000..9d02993
--- /dev/null
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java
@@ -0,0 +1,16 @@
+package com.thatgravyboat.skyblockhud.api.events;
+
+import net.minecraft.entity.Entity;
+import net.minecraftforge.fml.common.eventhandler.Event;
+
+public class SkyBlockEntityKilled extends Event {
+
+    public String id;
+    public Entity entity;
+
+    public SkyBlockEntityKilled(String id, Entity entity) {
+        this.id = id;
+        this.entity = entity;
+    }
+
+}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeHelper.java b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java
index afff109..d1ad8d2 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeHelper.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.skyblockhud.handlers.sbentities;
+package com.thatgravyboat.skyblockhud.api.sbentities;
 
 import com.thatgravyboat.skyblockhud.location.LocationHandler;
 import com.thatgravyboat.skyblockhud.location.Locations;
@@ -12,7 +12,7 @@ public class EntityTypeHelper {
         if (entity instanceof EntityEnderman) {
             EntityEnderman enderman = ((EntityEnderman) entity);
             double maxHealthBase = enderman.getAttributeMap().getAttributeInstanceByName("generic.maxHealth").getBaseValue();
-            if (maxHealthBase == 13000d || (maxHealthBase == 2000d && enderman.getHeldBlockState().getBlock().equals(Blocks.end_portal_frame))) {
+            if (maxHealthBase == 13000 || (maxHealthBase == 2000d && enderman.getHeldBlockState().getBlock().equals(Blocks.end_portal_frame))) {
                 return LocationHandler.getCurrentLocation().equals(Locations.DRAGONSNEST);
             }
         }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeRegistry.java
index 40076d9..995bc9b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeRegistry.java
@@ -1,12 +1,13 @@
-package com.thatgravyboat.skyblockhud.handlers.sbentities;
+package com.thatgravyboat.skyblockhud.api.sbentities;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
-import java.util.List;
-import java.util.Map;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.monster.EntityEnderman;
 
+import java.util.List;
+import java.util.Map;
+
 public class EntityTypeRegistry {
 
     private static final Map<Class<? extends Entity>, List<SkyBlockEntity>> entities = Maps.newHashMap();
@@ -17,7 +18,9 @@ public class EntityTypeRegistry {
 
     public static String getEntityId(Entity entity) {
         if (!entities.containsKey(entity.getClass())) return null;
-        for (SkyBlockEntity skyBlockEntity : entities.get(entity.getClass())) if (skyBlockEntity.isEntity(entity)) return skyBlockEntity.getName();
+        for (SkyBlockEntity skyBlockEntity : entities.get(entity.getClass())) {
+            if (skyBlockEntity.isEntity(entity)) return skyBlockEntity.getName();
+        }
         return null;
     }
 }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/SkyBlockEntity.java b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/SkyBlockEntity.java
index ee8c3a7..78b48df 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/SkyBlockEntity.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/SkyBlockEntity.java
@@ -1,8 +1,9 @@
-package com.thatgravyboat.skyblockhud.handlers.sbentities;
+package com.thatgravyboat.skyblockhud.api.sbentities;
 
-import java.util.function.Predicate;
 import net.minecraft.entity.Entity;
 
+import java.util.function.Predicate;
+
 public class SkyBlockEntity {
 
     private final String name;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
index 9f0a22d..ee2eb2b 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
@@ -1,6 +1,7 @@
 package com.thatgravyboat.skyblockhud.commands;
 
 import com.google.common.collect.ImmutableSet;
+import com.thatgravyboat.skyblockhud.DevModeConstants;
 import com.thatgravyboat.skyblockhud.SkyblockHud;
 import com.thatgravyboat.skyblockhud.api.LeaderboardGetter;
 import com.thatgravyboat.skyblockhud.config.SBHConfigEditor;
@@ -8,8 +9,6 @@ import com.thatgravyboat.skyblockhud.core.GuiScreenElementWrapper;
 import com.thatgravyboat.skyblockhud.handlers.MapHandler;
 import com.thatgravyboat.skyblockhud.location.LocationHandler;
 import com.thatgravyboat.skyblockhud.playerstats.ActionBarParsing;
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.boss.BossStatus;
 import net.minecraft.util.ChatComponentText;
@@ -17,6 +16,9 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.client.ClientCommandHandler;
 import org.apache.commons.lang3.StringUtils;
 
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+
 public class Commands {
 
     private static boolean devMode = false;
@@ -31,7 +33,7 @@ public class Commands {
         }
     };
 
-    private static final SimpleSubCommand devCommand = new SimpleSubCommand("sbhdev", ImmutableSet.of("copyBossBar", "copyScoreboard", "copyActionBar")) {
+    private static final SimpleSubCommand devCommand = new SimpleSubCommand("sbhdev", ImmutableSet.of("copyBossBar", "copyScoreboard", "copyActionBar", "mobDeathLogging")) {
         @Override
         void processSubCommand(ICommandSender sender, String subCommand, String[] args) {
             StringSelection clipboard = null;
@@ -47,17 +49,20 @@ public class Commands {
                 case "copyActionBar":
                     clipboard = new StringSelection(ActionBarParsing.lastLowActionBar);
                     break;
+                case "mobDeathLogging":
+                    DevModeConstants.mobDeathLogging = !DevModeConstants.mobDeathLogging;
+                    sendSBHMessage(sender,"Mob Death Logging " + (DevModeConstants.mobDeathLogging?"Enabled!":"Disabled!"));
             }
             if (clipboard != null) {
                 Toolkit.getDefaultToolkit().getSystemClipboard().setContents(clipboard, clipboard);
-                sender.addChatMessage(new ChatComponentText("[" + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "SkyBlockHud" + EnumChatFormatting.RESET + "] : " + EnumChatFormatting.GRAY + "Info copied to clipboard!"));
+                sendSBHMessage(sender,"Info copied to clipboard!");
             }
         }
 
         @Override
         void processNoSubCommand(ICommandSender sender) {
             devMode = !devMode;
-            sender.addChatMessage(new ChatComponentText("Dev Mode " + (devMode ? "Enabled" : "Disabled") + "!"));
+            sender.addChatMessage(new ChatComponentText("Dev Mode " + (devMode ? "Enabled!" : "Disabled!")));
         }
     };
 
@@ -81,4 +86,9 @@ public class Commands {
         ClientCommandHandler.instance.registerCommand(mapCommand);
         ClientCommandHandler.instance.registerCommand(devCommand);
     }
+
+
+    private static void sendSBHMessage(ICommandSender sender, String message){
+        sender.addChatMessage(new ChatComponentText("[" + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "SkyBlockHud" + EnumChatFormatting.RESET + "] : " + EnumChatFormatting.GRAY + message));
+    }
 }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
index 90f4c19..9c00a92 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
@@ -50,9 +50,9 @@ public class SBHConfig extends Config {
             case "map":
                 editOverlay(activeConfigCategory, 72, 72, map.miniMapPosition);
                 return;
-            case "tracker":
-                editOverlay(activeConfigCategory, 120, 70, trackers.trackerPosition);
-                return;
+//            case "tracker":
+//                editOverlay(activeConfigCategory, 120, 70, trackers.trackerPosition);
+//                return;
         }
     }
 
@@ -81,8 +81,13 @@ public class SBHConfig extends Config {
     public Map map = new Map();
 
     @Expose
-    @Category(name = "Tracker", desc = "All Options for the Trackers.")
-    public Trackers trackers = new Trackers();
+    @Category(name = "Mining Hud", desc = "All Options for the Mining Hud.")
+    public MiningHud miningHud = new MiningHud();
+
+//TODO ENABLED WHEN TRACKER GETS ADDED BACK
+//    @Expose
+//    @Category(name = "Tracker", desc = "All Options for the Trackers.")
+//    public Trackers trackers = new Trackers();
 
     public static class Misc {
 
@@ -304,6 +309,20 @@ public class SBHConfig extends Config {
         public boolean showQuestIcons = false;
     }
 
+    public static class MiningHud {
+
+        @Expose
+        @ConfigOption(name = "Show Drill Bar", desc = "Allows you to show or hide the Drill Bar.")
+        @ConfigEditorBoolean
+        public boolean showDrillBar = true;
+
+        @Expose
+        @ConfigOption(name = "Show Heat Bar", desc = "Allows you to show or hide the Heat Bar.")
+        @ConfigEditorBoolean
+        public boolean showHeatBar = true;
+
+    }
+
     public static class Trackers {
 
         @Expose
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
index 0496a8f..58a9f24 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
@@ -1,7 +1,5 @@
 package com.thatgravyboat.skyblockhud.config;
 
-import static com.thatgravyboat.skyblockhud.GuiTextures.*;
-
 import com.google.common.collect.Lists;
 import com.thatgravyboat.skyblockhud.core.GlScissorStack;
 import com.thatgravyboat.skyblockhud.core.GuiElement;
@@ -13,10 +11,6 @@ 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 java.awt.*;
-import java.net.URI;
-import java.util.*;
-import java.util.List;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
@@ -27,10 +21,18 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
+import java.awt.*;
+import java.net.URI;
+import java.util.List;
+import java.util.*;
+
+import static com.thatgravyboat.skyblockhud.GuiTextures.DISCORD;
+import static com.thatgravyboat.skyblockhud.GuiTextures.TWITTER;
+
 public class SBHConfigEditor extends GuiElement {
 
     private static final ResourceLocation[] socialsIco = new ResourceLocation[] { DISCORD, TWITTER };
-    private static final String[] socialsLink = new String[] { "https://discord.gg/moulberry", "https://twitter.com/thatgravytboat/" };
+    private static final String[] socialsLink = new String[] { "https://discord.gg/moulberry", "https://twitter.com/thatgravyboat/" };
 
     private final long openedMillis;
 
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java
index b2a148d..7cc6061 100644
--- a/