A lot of internal changes

Rename RenderOverlay -> RenderOverlayEvent
Split loot trackers into own classes
Add packet read and write events
Move render functions form Utils to RenderUtils
Fix warnings in installer frame
Move spirit boots fix to own class

3 files changed, 660 insertions, 660 deletions

diff --git a/src/main/java/me/Danker/commands/ImportFishingCommand.java b/src/main/java/me/Danker/commands/ImportFishingCommand.java
index 8d40c0c..f27aa8a 100644
--- a/src/main/java/me/Danker/commands/ImportFishingCommand.java
+++ b/src/main/java/me/Danker/commands/ImportFishingCommand.java
@@ -2,7 +2,7 @@ package me.Danker.commands;
 
 import com.google.gson.JsonObject;
 import me.Danker.DankersSkyblockMod;
-import me.Danker.features.loot.LootTracker;
+import me.Danker.features.loot.FishingTracker;
 import me.Danker.handlers.APIHandler;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
@@ -64,230 +64,230 @@ public class ImportFishingCommand extends CommandBase {
 			System.out.println("Fetching fishing stats...");
 			JsonObject statsObject = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("stats").getAsJsonObject();
 			
-			LootTracker.greatCatches = 0;
-			LootTracker.goodCatches = 0;
+			FishingTracker.greatCatches = 0;
+			FishingTracker.goodCatches = 0;
 			if (statsObject.has("items_fished_treasure")) {
 				if (statsObject.has("items_fished_large_treasure")) {
-					LootTracker.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
-					LootTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - LootTracker.greatCatches;
+					FishingTracker.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
+					FishingTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - FishingTracker.greatCatches;
 				} else {
-					LootTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
+					FishingTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
 				}
 			}
 			
-			LootTracker.seaCreatures = 0;
-			LootTracker.squids = 0;
+			FishingTracker.seaCreatures = 0;
+			FishingTracker.squids = 0;
 			if (statsObject.has("kills_pond_squid")) {
-				LootTracker.squids = statsObject.get("kills_pond_squid").getAsInt();
+				FishingTracker.squids = statsObject.get("kills_pond_squid").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.squids;
+			FishingTracker.seaCreatures += FishingTracker.squids;
 			
-			LootTracker.seaWalkers = 0;
+			FishingTracker.seaWalkers = 0;
 			if (statsObject.has("kills_sea_walker")) {
-				LootTracker.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
+				FishingTracker.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.seaWalkers;
+			FishingTracker.seaCreatures += FishingTracker.seaWalkers;
 			
-			LootTracker.nightSquids = 0;
+			FishingTracker.nightSquids = 0;
 			if (statsObject.has("kills_night_squid")) {
-				LootTracker.nightSquids = statsObject.get("kills_night_squid").getAsInt();
+				FishingTracker.nightSquids = statsObject.get("kills_night_squid").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.nightSquids;
+			FishingTracker.seaCreatures += FishingTracker.nightSquids;
 			
-			LootTracker.seaGuardians = 0;
+			FishingTracker.seaGuardians = 0;
 			if (statsObject.has("kills_sea_guardian")) {
-				LootTracker.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
+				FishingTracker.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.seaGuardians;
+			FishingTracker.seaCreatures += FishingTracker.seaGuardians;
 				
-			LootTracker.seaWitches = 0;
+			FishingTracker.seaWitches = 0;
 			if (statsObject.has("kills_sea_witch")) {
-				LootTracker.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
+				FishingTracker.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.seaWitches;
+			FishingTracker.seaCreatures += FishingTracker.seaWitches;
 			
-			LootTracker.seaArchers = 0;
+			FishingTracker.seaArchers = 0;
 			if (statsObject.has("kills_sea_archer")) {
-				LootTracker.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
+				FishingTracker.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.seaArchers;
+			FishingTracker.seaCreatures += FishingTracker.seaArchers;
 			
-			LootTracker.monsterOfTheDeeps = 0;
+			FishingTracker.monsterOfTheDeeps = 0;
 			if (statsObject.has("kills_zombie_deep")) {
 				if (statsObject.has("kills_chicken_deep")) {
-					LootTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
+					FishingTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
 				} else {
-					LootTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
+					FishingTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
 				}
 			} else if (statsObject.has("kills_chicken_deep")) {
-				LootTracker.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
+				FishingTracker.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.monsterOfTheDeeps;
+			FishingTracker.seaCreatures += FishingTracker.monsterOfTheDeeps;
 			
-			LootTracker.catfishes = 0;
+			FishingTracker.catfishes = 0;
 			if (statsObject.has("kills_catfish")) {
-				LootTracker.catfishes = statsObject.get("kills_catfish").getAsInt();
+				FishingTracker.catfishes = statsObject.get("kills_catfish").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.catfishes;
+			FishingTracker.seaCreatures += FishingTracker.catfishes;
 			
-			LootTracker.carrotKings = 0;
+			FishingTracker.carrotKings = 0;
 			if (statsObject.has("kills_carrot_king")) {
-				LootTracker.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
+				FishingTracker.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.carrotKings;
+			FishingTracker.seaCreatures += FishingTracker.carrotKings;
 			
-			LootTracker.seaLeeches = 0;
+			FishingTracker.seaLeeches = 0;
 			if (statsObject.has("kills_sea_leech")) {
-				LootTracker.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
+				FishingTracker.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.seaLeeches;
+			FishingTracker.seaCreatures += FishingTracker.seaLeeches;
 			
-			LootTracker.guardianDefenders = 0;
+			FishingTracker.guardianDefenders = 0;
 			if (statsObject.has("kills_guardian_defender")) {
-				LootTracker.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
+				FishingTracker.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.guardianDefenders;
+			FishingTracker.seaCreatures += FishingTracker.guardianDefenders;
 			
-			LootTracker.deepSeaProtectors = 0;
+			FishingTracker.deepSeaProtectors = 0;
 			if (statsObject.has("kills_deep_sea_protector")) {
-				LootTracker.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
+				FishingTracker.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.deepSeaProtectors;
+			FishingTracker.seaCreatures += FishingTracker.deepSeaProtectors;
 			
-			LootTracker.hydras = 0;
+			FishingTracker.hydras = 0;
 			if (statsObject.has("kills_water_hydra")) {
 				// Hydra splits
-				LootTracker.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
+				FishingTracker.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
 			}
-			LootTracker.seaCreatures += LootTracker.hydras;
+			FishingTracker.seaCreatures += FishingTracker.hydras;
 			
-			LootTracker.seaEmperors = 0;
+			FishingTracker.seaEmperors = 0;
 			if (statsObject.has("kills_skeleton_emperor")) {
 				if (statsObject.has("kills_guardian_emperor")) {
-					LootTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
+					FishingTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
 				} else {
-					LootTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
+					FishingTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
 				}
 			} else if (statsObject.has("kills_guardian_emperor")) {
-				LootTracker.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
+				FishingTracker.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.seaEmperors;
+			FishingTracker.seaCreatures += FishingTracker.seaEmperors;
 			
-			LootTracker.fishingMilestone = 0;
+			FishingTracker.fishingMilestone = 0;
 			if (statsObject.has("pet_milestone_sea_creatures_killed")) {
-				LootTracker.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
+				FishingTracker.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
 			}
 			
-			LootTracker.frozenSteves = 0;
+			FishingTracker.frozenSteves = 0;
 			if (statsObject.has("kills_frozen_steve")) {
-				LootTracker.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
+				FishingTracker.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.frozenSteves;
+			FishingTracker.seaCreatures += FishingTracker.frozenSteves;
 			
-			LootTracker.frostyTheSnowmans = 0;
+			FishingTracker.frostyTheSnowmans = 0;
 			if (statsObject.has("kills_frosty_the_snowman")) {
-				LootTracker.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
+				FishingTracker.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.frostyTheSnowmans;
+			FishingTracker.seaCreatures += FishingTracker.frostyTheSnowmans;
 			
-			LootTracker.grinches = 0;
+			FishingTracker.grinches = 0;
 			if (statsObject.has("kills_grinch")) {
-				LootTracker.grinches = statsObject.get("kills_grinch").getAsInt();
+				FishingTracker.grinches = statsObject.get("kills_grinch").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.grinches;
+			FishingTracker.seaCreatures += FishingTracker.grinches;
 			
-			LootTracker.yetis = 0;
+			FishingTracker.yetis = 0;
 			if (statsObject.has("kills_yeti")) {
-				LootTracker.yetis = statsObject.get("kills_yeti").getAsInt();
+				FishingTracker.yetis = statsObject.get("kills_yeti").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.yetis;
+			FishingTracker.seaCreatures += FishingTracker.yetis;
 			
-			LootTracker.nurseSharks = 0;
+			FishingTracker.nurseSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootTracker.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
+				FishingTracker.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.nurseSharks;
+			FishingTracker.seaCreatures += FishingTracker.nurseSharks;
 			
-			LootTracker.blueSharks = 0;
+			FishingTracker.blueSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootTracker.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
+				FishingTracker.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.blueSharks;
+			FishingTracker.seaCreatures += FishingTracker.blueSharks;
 			
-			LootTracker.tigerSharks = 0;
+			FishingTracker.tigerSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootTracker.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
+				FishingTracker.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.tigerSharks;
+			FishingTracker.seaCreatures += FishingTracker.tigerSharks;
 			
-			LootTracker.greatWhiteSharks = 0;
+			FishingTracker.greatWhiteSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootTracker.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
+				FishingTracker.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.greatWhiteSharks;
+			FishingTracker.seaCreatures += FishingTracker.greatWhiteSharks;
 			
-			LootTracker.scarecrows = 0;
+			FishingTracker.scarecrows = 0;
 			if (statsObject.has("kills_scarecrow")) {
-				LootTracker.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
+				FishingTracker.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.scarecrows;
+			FishingTracker.seaCreatures += FishingTracker.scarecrows;
 			
-			LootTracker.nightmares = 0;
+			FishingTracker.nightmares = 0;
 			if (statsObject.has("kills_nightmare")) {
-				LootTracker.nightmares = statsObject.get("kills_nightmare").getAsInt();
+				FishingTracker.nightmares = statsObject.get("kills_nightmare").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.nightmares;
+			FishingTracker.seaCreatures += FishingTracker.nightmares;
 			
-			LootTracker.werewolfs = 0;
+			FishingTracker.werewolfs = 0;
 			if (statsObject.has("kills_werewolf")) {
-				LootTracker.werewolfs = statsObject.get("kills_werewolf").getAsInt();
+				FishingTracker.werewolfs = statsObject.get("kills_werewolf").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.werewolfs;
+			FishingTracker.seaCreatures += FishingTracker.werewolfs;
 			
-			LootTracker.phantomFishers = 0;
+			FishingTracker.phantomFishers = 0;
 			if (statsObject.has("kills_phantom_fisherman")) {
-				LootTracker.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
+				FishingTracker.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.phantomFishers;
+			FishingTracker.seaCreatures += FishingTracker.phantomFishers;
 			
-			LootTracker.grimReapers = 0;
+			FishingTracker.grimReapers = 0;
 			if (statsObject.has("kills_grim_reaper")) {
-				LootTracker.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
+				FishingTracker.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
 			}
-			LootTracker.seaCreatures += LootTracker.grimReapers;
+			FishingTracker.seaCreatures += FishingTracker.grimReapers;
 			
 			System.out.println("Writing to config...");
-			ConfigHandler.writeIntConfig("fishing", "goodCatch", LootTracker.goodCatches);
-			ConfigHandler.writeIntConfig("fishing", "greatCatch", LootTracker.greatCatches);
-			ConfigHandler.writeIntConfig("fishing", "seaCreature", LootTracker.seaCreatures);
-			ConfigHandler.writeIntConfig("fishing", "squid", LootTracker.squids);
-			ConfigHandler.writeIntConfig("fishing", "seaWalker", LootTracker.seaWalkers);
-			ConfigHandler.writeIntConfig("fishing", "nightSquid", LootTracker.nightSquids);
-			ConfigHandler.writeIntConfig("fishing", "seaGuardian", LootTracker.seaGuardians);
-			ConfigHandler.writeIntConfig("fishing", "seaWitch", LootTracker.seaWitches);
-			ConfigHandler.writeIntConfig("fishing", "seaArcher", LootTracker.seaArchers);
-			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", LootTracker.monsterOfTheDeeps);
-			ConfigHandler.writeIntConfig("fishing", "catfish", LootTracker.catfishes);
-			ConfigHandler.writeIntConfig("fishing", "carrotKing", LootTracker.carrotKings);
-			ConfigHandler.writeIntConfig("fishing", "seaLeech", LootTracker.seaLeeches);
-			ConfigHandler.writeIntConfig("fishing", "guardianDefender", LootTracker.guardianDefenders);
-			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", LootTracker.deepSeaProtectors);
-			ConfigHandler.writeIntConfig("fishing", "hydra", LootTracker.hydras);
-			ConfigHandler.writeIntConfig("fishing", "seaEmperor", LootTracker.seaEmperors);
-			ConfigHandler.writeIntConfig("fishing", "milestone", LootTracker.fishingMilestone);
-			ConfigHandler.writeIntConfig("fishing", "frozenSteve", LootTracker.frozenSteves);
-			ConfigHandler.writeIntConfig("fishing", "snowman", LootTracker.frostyTheSnowmans);
-			ConfigHandler.writeIntConfig("fishing", "grinch", LootTracker.grinches);
-			ConfigHandler.writeIntConfig("fishing", "yeti", LootTracker.yetis);
-			ConfigHandler.writeIntConfig("fishing", "nurseShark", LootTracker.nurseSharks);
-			ConfigHandler.writeIntConfig("fishing", "blueShark", LootTracker.blueSharks);
-			ConfigHandler.writeIntConfig("fishing", "tigerShark", LootTracker.tigerSharks);
-			ConfigHandler.writeIntConfig("fishing", "greatWhiteShark", LootTracker.greatWhiteSharks);
-			ConfigHandler.writeIntConfig("fishing", "scarecrow", LootTracker.scarecrows);
-			ConfigHandler.writeIntConfig("fishing", "nightmare", LootTracker.nightmares);
-			ConfigHandler.writeIntConfig("fishing", "werewolf", LootTracker.werewolfs);
-			ConfigHandler.writeIntConfig("fishing", "phantomFisher", LootTracker.phantomFishers);
-			ConfigHandler.writeIntConfig("fishing", "grimReaper", LootTracker.grimReapers);
+			ConfigHandler.writeIntConfig("fishing", "goodCatch", FishingTracker.goodCatches);
+			ConfigHandler.writeIntConfig("fishing", "greatCatch", FishingTracker.greatCatches);
+			ConfigHandler.writeIntConfig("fishing", "seaCreature", FishingTracker.seaCreatures);
+			ConfigHandler.writeIntConfig("fishing", "squid", FishingTracker.squids);
+			ConfigHandler.writeIntConfig("fishing", "seaWalker", FishingTracker.seaWalkers);
+			ConfigHandler.writeIntConfig("fishing", "nightSquid", FishingTracker.nightSquids);
+			ConfigHandler.writeIntConfig("fishing", "seaGuardian", FishingTracker.seaGuardians);
+			ConfigHandler.writeIntConfig("fishing", "seaWitch", FishingTracker.seaWitches);
+			ConfigHandler.writeIntConfig("fishing", "seaArcher", FishingTracker.seaArchers);
+			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", FishingTracker.monsterOfTheDeeps);
+			ConfigHandler.writeIntConfig("fishing", "catfish", FishingTracker.catfishes);
+			ConfigHandler.writeIntConfig("fishing", "carrotKing", FishingTracker.carrotKings);
+			ConfigHandler.writeIntConfig("fishing", "seaLeech", FishingTracker.seaLeeches);
+			ConfigHandler.writeIntConfig("fishing", "guardianDefender", FishingTracker.guardianDefenders);
+			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", FishingTracker.deepSeaProtectors);
+			ConfigHandler.writeIntConfig("fishing", "hydra", FishingTracker.hydras);
+			ConfigHandler.writeIntConfig("fishing", "seaEmperor", FishingTracker.seaEmperors);
+			ConfigHandler.writeIntConfig("fishing", "milestone", FishingTracker.fishingMilestone);
+			ConfigHandler.writeIntConfig("fishing", "frozenSteve", FishingTracker.frozenSteves);
+			ConfigHandler.writeIntConfig("fishing", "snowman", FishingTracker.frostyTheSnowmans);
+			ConfigHandler.writeIntConfig("fishing", "grinch", FishingTracker.grinches);
+			ConfigHandler.writeIntConfig("fishing", "yeti", FishingTracker.yetis);
+			ConfigHandler.writeIntConfig("fishing", "nurseShark", FishingTracker.nurseSharks);
+			ConfigHandler.writeIntConfig("fishing", "blueShark", FishingTracker.blueSharks);
+			ConfigHandler.writeIntConfig("fishing", "tigerShark", FishingTracker.tigerSharks);
+			ConfigHandler.writeIntConfig("fishing", "greatWhiteShark", FishingTracker.greatWhiteSharks);
+			ConfigHandler.writeIntConfig("fishing", "scarecrow", FishingTracker.scarecrows);
+			ConfigHandler.writeIntConfig("fishing", "nightmare", FishingTracker.nightmares);
+			ConfigHandler.writeIntConfig("fishing", "werewolf", FishingTracker.werewolfs);
+			ConfigHandler.writeIntConfig("fishing", "phantomFisher", FishingTracker.phantomFishers);
+			ConfigHandler.writeIntConfig("fishing", "grimReaper", FishingTracker.grimReapers);
 			
 			player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Fishing stats imported."));
 		}).start();
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index d0b4272..40b215d 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -1,7 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
-import me.Danker.features.loot.LootTracker;
+import me.Danker.features.loot.*;
 import me.Danker.utils.Utils;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -71,292 +71,292 @@ public class LootCommand extends CommandBase {
 		switch (arg1[0].toLowerCase()) {
 			case "wolf":
 				if (showSession) {
-					if (LootTracker.wolfTimeSession == -1) {
+					if (WolfTracker.wolfTimeSession == -1) {
 						timeBetween = "Never";
 					} else {
-						timeBetween = Utils.getTimeBetween(LootTracker.wolfTimeSession, timeNow);
+						timeBetween = Utils.getTimeBetween(WolfTracker.wolfTimeSession, timeNow);
 					}
-					if (LootTracker.wolfBossesSession == -1) {
+					if (WolfTracker.wolfBossesSession == -1) {
 						bossesBetween = "Never";
 					} else {
-						bossesBetween = nf.format(LootTracker.wolfBossesSession);
+						bossesBetween = nf.format(WolfTracker.wolfBossesSession);
 					}
 					if (ToggleCommand.slayerCountTotal) {
-						drop20 = nf.format(LootTracker.wolfWheelsSession);
+						drop20 = nf.format(WolfTracker.wolfWheelsSession);
 					} else {
-						drop20 = nf.format(LootTracker.wolfWheelsDropsSession) + " times";
+						drop20 = nf.format(WolfTracker.wolfWheelsDropsSession) + " times";
 					}
 
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary (Current Session):\n" +
-																EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(LootTracker.wolfSvensSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(LootTracker.wolfTeethSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(WolfTracker.wolfSvensSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(WolfTracker.wolfTeethSession) + "\n" +
 																EnumChatFormatting.BLUE + "    Hamster Wheels: " + drop20 + "\n" +
-																EnumChatFormatting.AQUA + "    Spirit Runes: " + LootTracker.wolfSpiritsSession + "\n" +
-																EnumChatFormatting.WHITE + "    Critical VI Books: " + LootTracker.wolfBooksSession + "\n" +
-																EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + LootTracker.wolfEggsSession + "\n" +
-																EnumChatFormatting.GOLD + "    Couture Runes: " + LootTracker.wolfCouturesSession + "\n" +
-																EnumChatFormatting.AQUA + "    Grizzly Baits: " + LootTracker.wolfBaitsSession + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + LootTracker.wolfFluxesSession + "\n" +
+																EnumChatFormatting.AQUA + "    Spirit Runes: " + WolfTracker.wolfSpiritsSession + "\n" +
+																EnumChatFormatting.WHITE + "    Critical VI Books: " + WolfTracker.wolfBooksSession + "\n" +
+																EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + WolfTracker.wolfEggsSession + "\n" +
+																EnumChatFormatting.GOLD + "    Couture Runes: " + WolfTracker.wolfCouturesSession + "\n" +
+																EnumChatFormatting.AQUA + "    Grizzly Baits: " + WolfTracker.wolfBaitsSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + WolfTracker.wolfFluxesSession + "\n" +
 																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 																EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
 
-				if (LootTracker.wolfTime == -1) {
+				if (WolfTracker.wolfTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(LootTracker.wolfTime, timeNow);
+					timeBetween = Utils.getTimeBetween(WolfTracker.wolfTime, timeNow);
 				}
-				if (LootTracker.wolfBosses == -1) {
+				if (WolfTracker.wolfBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(LootTracker.wolfBosses);
+					bossesBetween = nf.format(WolfTracker.wolfBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(LootTracker.wolfWheels);
+					drop20 = nf.format(WolfTracker.wolfWheels);
 				} else {
-					drop20 = nf.format(LootTracker.wolfWheelsDrops) + " times";
+					drop20 = nf.format(WolfTracker.wolfWheelsDrops) + " times";
 				}
 
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + "  Sven Loot Summary:\n" +
-															EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(LootTracker.wolfSvens) + "\n" +
-															EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(LootTracker.wolfTeeth) + "\n" +
+															EnumChatFormatting.GOLD + "    Svens Killed: " + nf.format(WolfTracker.wolfSvens) + "\n" +
+															EnumChatFormatting.GREEN + "    Wolf Teeth: " + nf.format(WolfTracker.wolfTeeth) + "\n" +
 															EnumChatFormatting.BLUE + "    Hamster Wheels: " + drop20 + "\n" +
-															EnumChatFormatting.AQUA + "    Spirit Runes: " + LootTracker.wolfSpirits + "\n" +
-															EnumChatFormatting.WHITE + "    Critical VI Books: " + LootTracker.wolfBooks + "\n" +
-															EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + LootTracker.wolfEggs + "\n" +
-															EnumChatFormatting.GOLD + "    Couture Runes: " + LootTracker.wolfCoutures + "\n" +
-															EnumChatFormatting.AQUA + "    Grizzly Baits: " + LootTracker.wolfBaits + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + LootTracker.wolfFluxes + "\n" +
+															EnumChatFormatting.AQUA + "    Spirit Runes: " + WolfTracker.wolfSpirits + "\n" +
+															EnumChatFormatting.WHITE + "    Critical VI Books: " + WolfTracker.wolfBooks + "\n" +
+															EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + WolfTracker.wolfEggs + "\n" +
+															EnumChatFormatting.GOLD + "    Couture Runes: " + WolfTracker.wolfCoutures + "\n" +
+															EnumChatFormatting.AQUA + "    Grizzly Baits: " + WolfTracker.wolfBaits + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + WolfTracker.wolfFluxes + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + " -------------------"));
 				break;
 			case "spider":
 				if (showSession) {
-					if (LootTracker.spiderTimeSession == -1) {
+					if (SpiderTracker.spiderTimeSession == -1) {
 						timeBetween = "Never";
 					} else {
-						timeBetween = Utils.getTimeBetween(LootTracker.spiderTimeSession, timeNow);
+						timeBetween = Utils.getTimeBetween(SpiderTracker.spiderTimeSession, timeNow);
 					}
-					if (LootTracker.spiderBossesSession == -1) {
+					if (SpiderTracker.spiderBossesSession == -1) {
 						bossesBetween = "Never";
 					} else {
-						bossesBetween = nf.format(LootTracker.spiderBossesSession);
+						bossesBetween = nf.format(SpiderTracker.spiderBossesSession);
 					}
 					if (ToggleCommand.slayerCountTotal) {
-						drop20 = nf.format(LootTracker.spiderTAPSession);
+						drop20 = nf.format(SpiderTracker.spiderTAPSession);
 					} else {
-						drop20 = nf.format(LootTracker.spiderTAPDropsSession) + " times";
+						drop20 = nf.format(SpiderTracker.spiderTAPDropsSession) + " times";
 					}
 
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary (Current Session):\n" +
-																EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(LootTracker.spiderTarantulasSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(LootTracker.spiderWebsSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(SpiderTracker.spiderTarantulasSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(SpiderTracker.spiderWebsSession) + "\n" +
 																EnumChatFormatting.DARK_GREEN + "    Arrow Poison: " + drop20 + "\n" +
-																EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + LootTracker.spiderBitesSession + "\n" +
-																EnumChatFormatting.WHITE + "    Bane VI Books: " + LootTracker.spiderBooksSession + "\n" +
-																EnumChatFormatting.AQUA + "    Spider Catalysts: " + LootTracker.spiderCatalystsSession + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + LootTracker.spiderTalismansSession + "\n" +
-																EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + LootTracker.spiderSwattersSession + "\n" +
-																EnumChatFormatting.GOLD + "    Digested Mosquitos: " + LootTracker.spiderMosquitosSession + "\n" +
+																EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + SpiderTracker.spiderBitesSession + "\n" +
+																EnumChatFormatting.WHITE + "    Bane VI Books: " + SpiderTracker.spiderBooksSession + "\n" +
+																EnumChatFormatting.AQUA + "    Spider Catalysts: " + SpiderTracker.spiderCatalystsSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + SpiderTracker.spiderTalismansSession + "\n" +
+																EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + SpiderTracker.spiderSwattersSession + "\n" +
+																EnumChatFormatting.GOLD + "    Digested Mosquitos: " + SpiderTracker.spiderMosquitosSession + "\n" +
 																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 																EnumChatFormatting.RED + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
 
-				if (LootTracker.spiderTime == -1) {
+				if (SpiderTracker.spiderTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(LootTracker.spiderTime, timeNow);
+					timeBetween = Utils.getTimeBetween(SpiderTracker.spiderTime, timeNow);
 				}
-				if (LootTracker.spiderBosses == -1) {
+				if (SpiderTracker.spiderBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(LootTracker.spiderBosses);
+					bossesBetween = nf.format(SpiderTracker.spiderBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(LootTracker.spiderTAP);
+					drop20 = nf.format(SpiderTracker.spiderTAP);
 				} else {
-					drop20 = nf.format(LootTracker.spiderTAPDrops) + " times";
+					drop20 = nf.format(SpiderTracker.spiderTAPDrops) + " times";
 				}
 
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "  Spider Loot Summary:\n" +
-															EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(LootTracker.spiderTarantulas) + "\n" +
-															EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(LootTracker.spiderWebs) + "\n" +
+															EnumChatFormatting.GOLD + "    Tarantulas Killed: " + nf.format(SpiderTracker.spiderTarantulas) + "\n" +
+															EnumChatFormatting.GREEN + "    Tarantula Webs: " + nf.format(SpiderTracker.spiderWebs) + "\n" +
 															EnumChatFormatting.DARK_GREEN + "    Arrow Poison: " + drop20 + "\n" +
-															EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + LootTracker.spiderBites + "\n" +
-															EnumChatFormatting.WHITE + "    Bane VI Books: " + LootTracker.spiderBooks + "\n" +
-															EnumChatFormatting.AQUA + "    Spider Catalysts: " + LootTracker.spiderCatalysts + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + LootTracker.spiderTalismans + "\n" +
-															EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + LootTracker.spiderSwatters + "\n" +
-															EnumChatFormatting.GOLD + "    Digested Mosquitos: " + LootTracker.spiderMosquitos + "\n" +
+															EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + SpiderTracker.spiderBites + "\n" +
+															EnumChatFormatting.WHITE + "    Bane VI Books: " + SpiderTracker.spiderBooks + "\n" +
+															EnumChatFormatting.AQUA + "    Spider Catalysts: " + SpiderTracker.spiderCatalysts + "\n" +
+															EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + SpiderTracker.spiderTalismans + "\n" +
+															EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + SpiderTracker.spiderSwatters + "\n" +
+															EnumChatFormatting.GOLD + "    Digested Mosquitos: " + SpiderTracker.spiderMosquitos + "\n" +
 															EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 															EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 															EnumChatFormatting.RED + EnumChatFormatting.BOLD + " -------------------"));
 				break;
 			case "zombie":
 				if (showSession) {
-					if (LootTracker.zombieTimeSession == -1) {
+					if (ZombieTracker.zombieTimeSession == -1) {
 						timeBetween = "Never";
 					} else {
-						timeBetween = Utils.getTimeBetween(LootTracker.zombieTimeSession, timeNow);
+						timeBetween = Utils.getTimeBetween(ZombieTracker.zombieTimeSession, timeNow);
 					}
-					if (LootTracker.zombieBossesSession == -1) {
+					if (ZombieTracker.zombieBossesSession == -1) {
 						bossesBetween = "Never";
 					} else {
-						bossesBetween = nf.format(LootTracker.zombieBossesSession);
+						bossesBetween = nf.format(ZombieTracker.zombieBossesSession);
 					}
 					if (ToggleCommand.slayerCountTotal) {
-						drop20 = nf.format(LootTracker.zombieFoulFleshSession);
+						drop20 = nf.format(ZombieTracker.zombieFoulFleshSession);
 					} else {
-						drop20 = nf.format(LootTracker.zombieFoulFleshDropsSession) + " times";
+						drop20 = nf.format(ZombieTracker.zombieFoulFleshDropsSession) + " times";
 					}
 
 					player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 																EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary (Current Session):\n" +
-																EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(LootTracker.zombieRevsSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(LootTracker.zombieRevFleshSession) + "\n" +
-																EnumChatFormatting.GREEN + "    Revenant Viscera: " + nf.format(LootTracker.zombieRevVisceraSession) + "\n" +
+																EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(ZombieTracker.zombieRevsSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(ZombieTracker.zombieRevFleshSession) + "\n" +
+																EnumChatFormatting.GREEN + "    Revenant Viscera: " + nf.format(ZombieTracker.zombieRevVisceraSession) + "\n" +
 																EnumChatFormatting.BLUE + "    Foul Flesh: " + drop20 + "\n" +
-																EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " +LootTracker.zombiePestilencesSession + "\n" +
-																EnumChatFormatting.WHITE + "    Smite VI Books: " + LootTracker.zombieBooksSession + "\n" +
-																EnumChatFormatting.AQUA + "    Undead Catalysts: " + LootTracker.zombieUndeadCatasSession + "\n" +
-																EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + LootTracker.zombieBeheadedsSession + "\n" +
-																EnumChatFormatting.RED + "    Revenant Catalysts: " + LootTracker.zombieRevCatasSession + "\n" +
-																EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + LootTracker.zombieSnakesSession + "\n" +
-																EnumChatFormatting.GOLD + "    Scythe Blades: " + LootTracker.zombieScythesSession + "\n" +
-																EnumChatFormatting.RED + "    Shard of the Shreddeds: " + LootTracker.zombieShardsSession + "\n" +
-																EnumChatFormatting.RED + "    Warden Hearts: " + LootTracker.zombieWardenHeartsSession + "\n" +
+																EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " +ZombieTracker.zombiePestilencesSession + "\n" +
+																EnumChatFormatting.WHITE + "    Smite VI Books: " + ZombieTracker.zombieBooksSession + "\n" +
+																EnumChatFormatting.AQUA + "    Undead Catalysts: " + ZombieTracker.zombieUndeadCatasSession + "\n" +
+																EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + ZombieTracker.zombieBeheadedsSession + "\n" +
+																EnumChatFormatting.RED + "    Revenant Catalysts: " + ZombieTracker.zombieRevCatasSession + "\n" +
+																EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + ZombieTracker.zombieSnakesSession + "\n" +
+																EnumChatFormatting.GOLD + "    Scythe Blades: " + ZombieTracker.zombieScythesSession + "\n" +
+																EnumChatFormatting.RED + "    Shard of the Shreddeds: " + ZombieTracker.zombieShardsSession + "\n" +
+																EnumChatFormatting.RED + "    Warden Hearts: " + ZombieTracker.zombieWardenHeartsSession + "\n" +
 																EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +
 																EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +
 																EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + " -------------------"));
 					return;
 				}
 
-				if (LootTracker.zombieTime == -1) {
+				if (ZombieTracker.zombieTime == -1) {
 					timeBetween = "Never";
 				} else {
-					timeBetween = Utils.getTimeBetween(LootTracker.zombieTime, timeNow);
+					timeBetween = Utils.getTimeBetween(ZombieTracker.zombieTime, timeNow);
 				}
-				if (LootTracker.zombieBosses == -1) {
+				if (ZombieTracker.zombieBosses == -1) {
 					bossesBetween = "Never";
 				} else {
-					bossesBetween = nf.format(LootTracker.zombieBosses);
+					bossesBetween = nf.format(ZombieTracker.zombieBosses);
 				}
 				if (ToggleCommand.slayerCountTotal) {
-					drop20 = nf.format(LootTracker.zombieFoulFlesh);
+					drop20 = nf.format(ZombieTracker.zombieFoulFlesh);
 				} else {
-					drop20 = nf.format(LootTracker.zombieFoulFleshDrops) + " times";
+					drop20 = nf.format(ZombieTracker.zombieFoulFleshDrops) + " times";
 				}
 
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +
 															EnumChatFormatting.DARK_GREEN + EnumChatFormatting.BOLD + "  Zombie Loot Summary:\n" +
-															EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(LootTracker.zombieRevs) + "\n" +
-															EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(LootTracker.zombieRevFlesh) + "\n" +
-															EnumChatFormatting.GREEN + "    Revenant Viscera: " + nf.format(LootTracker.zombieRevViscera) + "\n" +
+															EnumChatFormatting.GOLD + "    Revs Killed: " + nf.format(ZombieTracker.zombieRevs) + "\n" +
+															EnumChatFormatting.GREEN + "    Revenant Flesh: " + nf.format(ZombieTracker.zombieRevFlesh) + "\n" +
+															EnumChatFormatting.GREEN + "    Revenant Viscera: " + nf.format(ZombieTracker.zombieRevViscera) + "\n" +
 															EnumChatFormatting.BLUE + "    Foul Flesh: " + drop20 + "\n" +
-															EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + LootTracker.zombiePestilences + "\n" +
-															EnumChatFormatting.WHITE + "    Smite VI Books: " + LootTracker.zombieBooks + "\n" +
-															EnumChatFormatting.AQUA + "    Undead Catalysts: " + LootTracker.zombieUndeadCatas + "\n" +
-															EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + LootTracker.zombieBeheadeds + "\n" +
-															EnumChatFormatting.RED + "    Revenant Catalysts: " + LootTracker.zombieRevCatas + "\n" +
-															EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + LootTracker.zombieSnakes + "\n" +
-															EnumChatFormatting.GOLD + "    Scythe Blades: " + LootTracker.zombieScythes + "\n" +
-															EnumChatFormatting.RED + "    Shard of the Shreddeds: " + LootTracker.zombieShards + "\n" +
-															EnumChatFormatting.RED + "    Warden Hearts: " + LootTracker.zombieWardenHearts + "\n" +
+															EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + ZombieTracker.zombiePestilences + "\n" +
+															EnumChatFormatting.WHITE + "    Smite VI Books: " + ZombieTracker.zombieBooks + "\n" +
+															EnumC