Move features into their own files

8 files changed, 640 insertions, 955 deletions

diff --git a/src/main/java/me/Danker/commands/BlockSlayerCommand.java b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
index 606b930..c0beb42 100644
--- a/src/main/java/me/Danker/commands/BlockSlayerCommand.java
+++ b/src/main/java/me/Danker/commands/BlockSlayerCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.BlockWrongSlayer;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -12,9 +13,6 @@ import net.minecraft.util.ChatComponentText;
 import java.util.List;
 
 public class BlockSlayerCommand extends CommandBase {
-	
-	public static String onlySlayerName = "";
-	public static String onlySlayerNumber = "";
 
 	@Override
 	public String getCommandName() {
@@ -52,17 +50,17 @@ public class BlockSlayerCommand extends CommandBase {
 		
 		switch (arg1[0].toLowerCase()) {
 			case "zombie":
-				onlySlayerName = "Revenant Horror";
+				BlockWrongSlayer.onlySlayerName = "Revenant Horror";
 				break;
 			case "spider":
-				onlySlayerName = "Tarantula Broodfather";
+				BlockWrongSlayer.onlySlayerName = "Tarantula Broodfather";
 				break;
 			case "wolf":
-				onlySlayerName = "Sven Packmaster";
+				BlockWrongSlayer.onlySlayerName = "Sven Packmaster";
 				break;
 			case "off":
-				onlySlayerName = "";
-				onlySlayerNumber = "";
+				BlockWrongSlayer.onlySlayerName = "";
+				BlockWrongSlayer.onlySlayerNumber = "";
 				ConfigHandler.writeStringConfig("toggles", "BlockSlayer", "");
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking turned off."));
 				return;
@@ -75,26 +73,26 @@ public class BlockSlayerCommand extends CommandBase {
 		// Just manually set to roman numeral, I don't wanna put a whole converter in here
 		switch (slayerNumber) {
 			case 1:
-				onlySlayerNumber = "I";
+				BlockWrongSlayer.onlySlayerNumber = "I";
 				break;
 			case 2:
-				onlySlayerNumber = "II";
+				BlockWrongSlayer.onlySlayerNumber = "II";
 				break;
 			case 3:
-				onlySlayerNumber = "III";
+				BlockWrongSlayer.onlySlayerNumber = "III";
 				break;
 			case 4:
-				onlySlayerNumber = "IV";
+				BlockWrongSlayer.onlySlayerNumber = "IV";
 				break;
 			default:
-				onlySlayerName = "";
-				onlySlayerNumber = "";
+				BlockWrongSlayer.onlySlayerName = "";
+				BlockWrongSlayer.onlySlayerNumber = "";
 				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 				return;
 		}
 		
-		ConfigHandler.writeStringConfig("toggles", "BlockSlayer", onlySlayerName + " " + onlySlayerNumber);
-		player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking set to " + DankersSkyblockMod.SECONDARY_COLOUR + onlySlayerName + " " + onlySlayerNumber));
+		ConfigHandler.writeStringConfig("toggles", "BlockSlayer", BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber);
+		player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Slayer blocking set to " + DankersSkyblockMod.SECONDARY_COLOUR + BlockWrongSlayer.onlySlayerName + " " + BlockWrongSlayer.onlySlayerNumber));
 	}
 
 }
diff --git a/src/main/java/me/Danker/commands/DankerGuiCommand.java b/src/main/java/me/Danker/commands/DankerGuiCommand.java
index a6b200f..deddc01 100644
--- a/src/main/java/me/Danker/commands/DankerGuiCommand.java
+++ b/src/main/java/me/Danker/commands/DankerGuiCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.SkillTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.ResourcePackRepository;
 import net.minecraft.command.CommandBase;
@@ -93,7 +94,7 @@ public class DankerGuiCommand extends CommandBase {
 			debug.append("# Other Settings\n");
 			debug.append("[Current Display][").append(DisplayCommand.display).append("]\n");
 			debug.append("[Auto Display][").append(DisplayCommand.auto).append("]\n");
-			debug.append("[Skill Tracker Visible][").append(DankersSkyblockMod.showSkillTracker).append("]\n");
+			debug.append("[Skill Tracker Visible][").append(SkillTracker.showSkillTracker).append("]\n");
 			debug.append("# Resource Packs\n");
 			if (Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries().size() == 0) {
 				debug.append("<None>\n");
diff --git a/src/main/java/me/Danker/commands/ImportFishingCommand.java b/src/main/java/me/Danker/commands/ImportFishingCommand.java
index e508ecb..c3007a0 100644
--- a/src/main/java/me/Danker/commands/ImportFishingCommand.java
+++ b/src/main/java/me/Danker/commands/ImportFishingCommand.java
@@ -2,6 +2,7 @@ package me.Danker.commands;
 
 import com.google.gson.JsonObject;
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.loot.LootTracker;
 import me.Danker.handlers.APIHandler;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
@@ -59,230 +60,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();
 			
-			LootCommand.greatCatches = 0;
-			LootCommand.goodCatches = 0;
+			LootTracker.greatCatches = 0;
+			LootTracker.goodCatches = 0;
 			if (statsObject.has("items_fished_treasure")) {
 				if (statsObject.has("items_fished_large_treasure")) {
-					LootCommand.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
-					LootCommand.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - LootCommand.greatCatches;
+					LootTracker.greatCatches = statsObject.get("items_fished_large_treasure").getAsInt();
+					LootTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt() - LootTracker.greatCatches;
 				} else {
-					LootCommand.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
+					LootTracker.goodCatches = statsObject.get("items_fished_treasure").getAsInt();
 				}
 			}
 			
-			LootCommand.seaCreatures = 0;
-			LootCommand.squids = 0;
+			LootTracker.seaCreatures = 0;
+			LootTracker.squids = 0;
 			if (statsObject.has("kills_pond_squid")) {
-				LootCommand.squids = statsObject.get("kills_pond_squid").getAsInt();
+				LootTracker.squids = statsObject.get("kills_pond_squid").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.squids;
+			LootTracker.seaCreatures += LootTracker.squids;
 			
-			LootCommand.seaWalkers = 0;
+			LootTracker.seaWalkers = 0;
 			if (statsObject.has("kills_sea_walker")) {
-				LootCommand.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
+				LootTracker.seaWalkers = statsObject.get("kills_sea_walker").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaWalkers;
+			LootTracker.seaCreatures += LootTracker.seaWalkers;
 			
-			LootCommand.nightSquids = 0;
+			LootTracker.nightSquids = 0;
 			if (statsObject.has("kills_night_squid")) {
-				LootCommand.nightSquids = statsObject.get("kills_night_squid").getAsInt();
+				LootTracker.nightSquids = statsObject.get("kills_night_squid").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.nightSquids;
+			LootTracker.seaCreatures += LootTracker.nightSquids;
 			
-			LootCommand.seaGuardians = 0;
+			LootTracker.seaGuardians = 0;
 			if (statsObject.has("kills_sea_guardian")) {
-				LootCommand.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
+				LootTracker.seaGuardians = statsObject.get("kills_sea_guardian").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaGuardians;
+			LootTracker.seaCreatures += LootTracker.seaGuardians;
 				
-			LootCommand.seaWitches = 0;
+			LootTracker.seaWitches = 0;
 			if (statsObject.has("kills_sea_witch")) {
-				LootCommand.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
+				LootTracker.seaWitches = statsObject.get("kills_sea_witch").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaWitches;
+			LootTracker.seaCreatures += LootTracker.seaWitches;
 			
-			LootCommand.seaArchers = 0;
+			LootTracker.seaArchers = 0;
 			if (statsObject.has("kills_sea_archer")) {
-				LootCommand.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
+				LootTracker.seaArchers = statsObject.get("kills_sea_archer").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaArchers;
+			LootTracker.seaCreatures += LootTracker.seaArchers;
 			
-			LootCommand.monsterOfTheDeeps = 0;
+			LootTracker.monsterOfTheDeeps = 0;
 			if (statsObject.has("kills_zombie_deep")) {
 				if (statsObject.has("kills_chicken_deep")) {
-					LootCommand.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
+					LootTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt() + statsObject.get("kills_chicken_deep").getAsInt();
 				} else {
-					LootCommand.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
+					LootTracker.monsterOfTheDeeps = statsObject.get("kills_zombie_deep").getAsInt();
 				}
 			} else if (statsObject.has("kills_chicken_deep")) {
-				LootCommand.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
+				LootTracker.monsterOfTheDeeps = statsObject.get("kills_chicken_deep").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.monsterOfTheDeeps;
+			LootTracker.seaCreatures += LootTracker.monsterOfTheDeeps;
 			
-			LootCommand.catfishes = 0;
+			LootTracker.catfishes = 0;
 			if (statsObject.has("kills_catfish")) {
-				LootCommand.catfishes = statsObject.get("kills_catfish").getAsInt();
+				LootTracker.catfishes = statsObject.get("kills_catfish").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.catfishes;
+			LootTracker.seaCreatures += LootTracker.catfishes;
 			
-			LootCommand.carrotKings = 0;
+			LootTracker.carrotKings = 0;
 			if (statsObject.has("kills_carrot_king")) {
-				LootCommand.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
+				LootTracker.carrotKings = statsObject.get("kills_carrot_king").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.carrotKings;
+			LootTracker.seaCreatures += LootTracker.carrotKings;
 			
-			LootCommand.seaLeeches = 0;
+			LootTracker.seaLeeches = 0;
 			if (statsObject.has("kills_sea_leech")) {
-				LootCommand.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
+				LootTracker.seaLeeches = statsObject.get("kills_sea_leech").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaLeeches;
+			LootTracker.seaCreatures += LootTracker.seaLeeches;
 			
-			LootCommand.guardianDefenders = 0;
+			LootTracker.guardianDefenders = 0;
 			if (statsObject.has("kills_guardian_defender")) {
-				LootCommand.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
+				LootTracker.guardianDefenders = statsObject.get("kills_guardian_defender").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.guardianDefenders;
+			LootTracker.seaCreatures += LootTracker.guardianDefenders;
 			
-			LootCommand.deepSeaProtectors = 0;
+			LootTracker.deepSeaProtectors = 0;
 			if (statsObject.has("kills_deep_sea_protector")) {
-				LootCommand.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
+				LootTracker.deepSeaProtectors = statsObject.get("kills_deep_sea_protector").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.deepSeaProtectors;
+			LootTracker.seaCreatures += LootTracker.deepSeaProtectors;
 			
-			LootCommand.hydras = 0;
+			LootTracker.hydras = 0;
 			if (statsObject.has("kills_water_hydra")) {
 				// Hydra splits
-				LootCommand.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
+				LootTracker.hydras = statsObject.get("kills_water_hydra").getAsInt() / 2;
 			}
-			LootCommand.seaCreatures += LootCommand.hydras;
+			LootTracker.seaCreatures += LootTracker.hydras;
 			
-			LootCommand.seaEmperors = 0;
+			LootTracker.seaEmperors = 0;
 			if (statsObject.has("kills_skeleton_emperor")) {
 				if (statsObject.has("kills_guardian_emperor")) {
-					LootCommand.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
+					LootTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt() + statsObject.get("kills_guardian_emperor").getAsInt();
 				} else {
-					LootCommand.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
+					LootTracker.seaEmperors = statsObject.get("kills_skeleton_emperor").getAsInt();
 				}
 			} else if (statsObject.has("kills_guardian_emperor")) {
-				LootCommand.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
+				LootTracker.seaEmperors = statsObject.get("kills_guardian_emperor").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.seaEmperors;
+			LootTracker.seaCreatures += LootTracker.seaEmperors;
 			
-			LootCommand.fishingMilestone = 0;
+			LootTracker.fishingMilestone = 0;
 			if (statsObject.has("pet_milestone_sea_creatures_killed")) {
-				LootCommand.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
+				LootTracker.fishingMilestone = statsObject.get("pet_milestone_sea_creatures_killed").getAsInt();
 			}
 			
-			LootCommand.frozenSteves = 0;
+			LootTracker.frozenSteves = 0;
 			if (statsObject.has("kills_frozen_steve")) {
-				LootCommand.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
+				LootTracker.frozenSteves = statsObject.get("kills_frozen_steve").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.frozenSteves;
+			LootTracker.seaCreatures += LootTracker.frozenSteves;
 			
-			LootCommand.frostyTheSnowmans = 0;
+			LootTracker.frostyTheSnowmans = 0;
 			if (statsObject.has("kills_frosty_the_snowman")) {
-				LootCommand.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
+				LootTracker.frostyTheSnowmans = statsObject.get("kills_frosty_the_snowman").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.frostyTheSnowmans;
+			LootTracker.seaCreatures += LootTracker.frostyTheSnowmans;
 			
-			LootCommand.grinches = 0;
+			LootTracker.grinches = 0;
 			if (statsObject.has("kills_grinch")) {
-				LootCommand.grinches = statsObject.get("kills_grinch").getAsInt();
+				LootTracker.grinches = statsObject.get("kills_grinch").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.grinches;
+			LootTracker.seaCreatures += LootTracker.grinches;
 			
-			LootCommand.yetis = 0;
+			LootTracker.yetis = 0;
 			if (statsObject.has("kills_yeti")) {
-				LootCommand.yetis = statsObject.get("kills_yeti").getAsInt();
+				LootTracker.yetis = statsObject.get("kills_yeti").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.yetis;
+			LootTracker.seaCreatures += LootTracker.yetis;
 			
-			LootCommand.nurseSharks = 0;
+			LootTracker.nurseSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
+				LootTracker.nurseSharks = statsObject.get("kills_nurse_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.nurseSharks;
+			LootTracker.seaCreatures += LootTracker.nurseSharks;
 			
-			LootCommand.blueSharks = 0;
+			LootTracker.blueSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
+				LootTracker.blueSharks = statsObject.get("kills_blue_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.blueSharks;
+			LootTracker.seaCreatures += LootTracker.blueSharks;
 			
-			LootCommand.tigerSharks = 0;
+			LootTracker.tigerSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
+				LootTracker.tigerSharks = statsObject.get("kills_tiger_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.tigerSharks;
+			LootTracker.seaCreatures += LootTracker.tigerSharks;
 			
-			LootCommand.greatWhiteSharks = 0;
+			LootTracker.greatWhiteSharks = 0;
 			if (statsObject.has("kills_nurse_shark")) {
-				LootCommand.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
+				LootTracker.greatWhiteSharks = statsObject.get("kills_great_white_shark").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.greatWhiteSharks;
+			LootTracker.seaCreatures += LootTracker.greatWhiteSharks;
 			
-			LootCommand.scarecrows = 0;
+			LootTracker.scarecrows = 0;
 			if (statsObject.has("kills_scarecrow")) {
-				LootCommand.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
+				LootTracker.scarecrows = statsObject.get("kills_scarecrow").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.scarecrows;
+			LootTracker.seaCreatures += LootTracker.scarecrows;
 			
-			LootCommand.nightmares = 0;
+			LootTracker.nightmares = 0;
 			if (statsObject.has("kills_nightmare")) {
-				LootCommand.nightmares = statsObject.get("kills_nightmare").getAsInt();
+				LootTracker.nightmares = statsObject.get("kills_nightmare").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.nightmares;
+			LootTracker.seaCreatures += LootTracker.nightmares;
 			
-			LootCommand.werewolfs = 0;
+			LootTracker.werewolfs = 0;
 			if (statsObject.has("kills_werewolf")) {
-				LootCommand.werewolfs = statsObject.get("kills_werewolf").getAsInt();
+				LootTracker.werewolfs = statsObject.get("kills_werewolf").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.werewolfs;
+			LootTracker.seaCreatures += LootTracker.werewolfs;
 			
-			LootCommand.phantomFishers = 0;
+			LootTracker.phantomFishers = 0;
 			if (statsObject.has("kills_phantom_fisherman")) {
-				LootCommand.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
+				LootTracker.phantomFishers = statsObject.get("kills_phantom_fisherman").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.phantomFishers;
+			LootTracker.seaCreatures += LootTracker.phantomFishers;
 			
-			LootCommand.grimReapers = 0;
+			LootTracker.grimReapers = 0;
 			if (statsObject.has("kills_grim_reaper")) {
-				LootCommand.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
+				LootTracker.grimReapers = statsObject.get("kills_grim_reaper").getAsInt();
 			}
-			LootCommand.seaCreatures += LootCommand.grimReapers;
+			LootTracker.seaCreatures += LootTracker.grimReapers;
 			
 			System.out.println("Writing to config...");
-			ConfigHandler.writeIntConfig("fishing", "goodCatch", LootCommand.goodCatches);
-			ConfigHandler.writeIntConfig("fishing", "greatCatch", LootCommand.greatCatches);
-			ConfigHandler.writeIntConfig("fishing", "seaCreature", LootCommand.seaCreatures);
-			ConfigHandler.writeIntConfig("fishing", "squid", LootCommand.squids);
-			ConfigHandler.writeIntConfig("fishing", "seaWalker", LootCommand.seaWalkers);
-			ConfigHandler.writeIntConfig("fishing", "nightSquid", LootCommand.nightSquids);
-			ConfigHandler.writeIntConfig("fishing", "seaGuardian", LootCommand.seaGuardians);
-			ConfigHandler.writeIntConfig("fishing", "seaWitch", LootCommand.seaWitches);
-			ConfigHandler.writeIntConfig("fishing", "seaArcher", LootCommand.seaArchers);
-			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", LootCommand.monsterOfTheDeeps);
-			ConfigHandler.writeIntConfig("fishing", "catfish", LootCommand.catfishes);
-			ConfigHandler.writeIntConfig("fishing", "carrotKing", LootCommand.carrotKings);
-			ConfigHandler.writeIntConfig("fishing", "seaLeech", LootCommand.seaLeeches);
-			ConfigHandler.writeIntConfig("fishing", "guardianDefender", LootCommand.guardianDefenders);
-			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", LootCommand.deepSeaProtectors);
-			ConfigHandler.writeIntConfig("fishing", "hydra", LootCommand.hydras);
-			ConfigHandler.writeIntConfig("fishing", "seaEmperor", LootCommand.seaEmperors);
-			ConfigHandler.writeIntConfig("fishing", "milestone", LootCommand.fishingMilestone);
-			ConfigHandler.writeIntConfig("fishing", "frozenSteve", LootCommand.frozenSteves);
-			ConfigHandler.writeIntConfig("fishing", "snowman", LootCommand.frostyTheSnowmans);
-			ConfigHandler.writeIntConfig("fishing", "grinch", LootCommand.grinches);
-			ConfigHandler.writeIntConfig("fishing", "yeti", LootCommand.yetis);
-			ConfigHandler.writeIntConfig("fishing", "nurseShark", LootCommand.nurseSharks);
-			ConfigHandler.writeIntConfig("fishing", "blueShark", LootCommand.blueSharks);
-			ConfigHandler.writeIntConfig("fishing", "tigerShark", LootCommand.tigerSharks);
-			ConfigHandler.writeIntConfig("fishing", "greatWhiteShark", LootCommand.greatWhiteSharks);
-			ConfigHandler.writeIntConfig("fishing", "scarecrow", LootCommand.scarecrows);
-			ConfigHandler.writeIntConfig("fishing", "nightmare", LootCommand.nightmares);
-			ConfigHandler.writeIntConfig("fishing", "werewolf", LootCommand.werewolfs);
-			ConfigHandler.writeIntConfig("fishing", "phantomFisher", LootCommand.phantomFishers);
-			ConfigHandler.writeIntConfig("fishing", "grimReaper", LootCommand.grimReapers);
+			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);
 			
 			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 0f38ada..3dba27d 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -1,6 +1,7 @@
 package me.Danker.commands;
 
 import me.Danker.DankersSkyblockMod;
+import me.Danker.features.loot.LootTracker;
 import me.Danker.utils.Utils;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -15,325 +16,7 @@ import java.util.List;
 import java.util.Locale;
 
 public class LootCommand extends CommandBase {
-	// Wolf
-	public static int wolfSvens;
-	public static int wolfTeeth;
-	public static int wolfWheels;
-	public static int wolfWheelsDrops;
-	public static int wolfSpirits;
-	public static int wolfBooks;
-	public static int wolfEggs;
-	public static int wolfCoutures;
-	public static int wolfBaits;
-	public static int wolfFluxes;
-	public static double wolfTime;
-	public static int wolfBosses;
-	// Spider
-	public static int spiderTarantulas;
-	public static int spiderWebs;
-	public static int spiderTAP;
-	public static int spiderTAPDrops;
-	public static int spiderBites;
-	public static int spiderCatalysts;
-	public static int spiderBooks;
-	public static int spiderSwatters;
-	public static int spiderTalismans;
-	public static int spiderMosquitos;
-	public static double spiderTime;
-	public static int spiderBosses;
-	// Zombie
-	public static int zombieRevs;
-	public static int zombieRevFlesh;
-	public static int zombieFoulFlesh;
-	public static int zombieFoulFleshDrops;
-	public static int zombiePestilences;
-	public static int zombieUndeadCatas;
-	public static int zombieBooks;
-	public static int zombieBeheadeds;
-	public static int zombieRevCatas;
-	public static int zombieSnakes;
-	public static int zombieScythes;
-	public static double zombieTime;
-	public static int zombieBosses;
-	
-	// Fishing
-	public static int seaCreatures;
-	public static int goodCatches;
-	public static int greatCatches;
-	public static int squids;
-	public static int seaWalkers;
-	public static int nightSquids;
-	public static int seaGuardians;
-	public static int seaWitches;
-	public static int seaArchers;
-	public static int monsterOfTheDeeps;
-	public static int catfishes;
-	public static int carrotKings;
-	public static int seaLeeches;
-	public static int guardianDefenders;
-	public static int deepSeaProtectors;
-	public static int hydras;
-	public static int seaEmperors;
-	public static double empTime;
-	public static int empSCs;
-	public static int fishingMilestone;
-	// Fishing Winter
-	public static int frozenSteves;
-	public static int frostyTheSnowmans;
-	public static int grinches;
-	public static int yetis;
-	public static double yetiTime;
-	public static int yetiSCs;
-	// Fishing Festival
-	public static int nurseSharks;
-	public static int blueSharks;
-	public static int tigerSharks;
-	public static int greatWhiteSharks;
-	// Spooky Fishing
-	public static int scarecrows;
-	public static int nightmares;
-	public static int werewolfs;
-	public static int phantomFishers;
-	public static int grimReapers;
-	
-	// Mythological
-	public static double mythCoins;
-	public static int griffinFeathers;
-	public static int crownOfGreeds;
-	public static int washedUpSouvenirs;
-	public static int minosHunters;
-	public static int siameseLynxes;
-	public static int minotaurs;
-	public static int gaiaConstructs;
-	public static int minosChampions;
-	public static int minosInquisitors;
-	
-	// Catacombs Dungeons
-	public static int recombobulators;
-	public static int fumingPotatoBooks;
-	// F1
-	public static int bonzoStaffs;
-	public static double f1CoinsSpent;
-	public static double f1TimeSpent;
-	// F2
-	public static int scarfStudies;
-	public static int adaptiveSwords;
-	public static double f2CoinsSpent;
-	public static double f2TimeSpent;
-	// F3
-	public static int adaptiveHelms;
-	public static int adaptiveChests;
-	public static int adaptiveLegs;
-	public static int adaptiveBoots;
-	public static double f3CoinsSpent;
-	public static double f3TimeSpent;
-	// F4
-	public static int spiritWings;
-	public static int spiritBones;
-	public static int spiritBoots;
-	public static int spiritSwords;
-	public static int spiritBows;
-	public static int epicSpiritPets;
-	public static int legSpiritPets;
-	public static double f4CoinsSpent;
-	public static double f4TimeSpent;
-	// F5
-	public static int warpedStones;
-	public static int shadowAssHelms;
-	public static int shadowAssChests;
-	public static int shadowAssLegs;
-	public static int shadowAssBoots;
-	public static int lastBreaths;
-	public static int lividDaggers;
-	public static int shadowFurys;
-	public static double f5CoinsSpent;
-	public static double f5TimeSpent;
-	// F6
-	public static int ancientRoses;
-	public static int precursorEyes;
-	public static int giantsSwords;
-	public static int necroLordHelms;
-	public static int necroLordChests;
-	public static int necroLordLegs;
-	public static int necroLordBoots;
-	public static int necroSwords;
-	public static double f6CoinsSpent;
-	public static double f6TimeSpent;
-	// F7
-	public static int witherBloods;
-	public static int witherCloaks;
-	public static int implosions;
-	public static int witherShields;
-	public static int shadowWarps;
-	public static int necronsHandles;
-	public static int autoRecombs;
-	public static int witherHelms;
-	public static int witherChests;
-	public static int witherLegs;
-	public static int witherBoots;
-	public static double f7CoinsSpent;
-	public static double f7TimeSpent;
-	
-	// Single sessions (No config saves)
-	// Wolf
-	public static int wolfSvensSession = 0;
-	public static int wolfTeethSession = 0;
-	public static int wolfWheelsSession = 0;
-	public static int wolfWheelsDropsSession = 0;
-	public static int wolfSpiritsSession = 0;
-	public static int wolfBooksSession = 0;
-	public static int wolfEggsSession = 0;
-	public static int wolfCouturesSession = 0;
-	public static int wolfBaitsSession = 0;
-	public static int wolfFluxesSession = 0;
-	public static double wolfTimeSession = -1;
-	public static int wolfBossesSession = -1;
-	// Spider
-	public static int spiderTarantulasSession = 0;
-	public static int spiderWebsSession = 0;
-	public static int spiderTAPSession = 0;
-	public static int spiderTAPDropsSession = 0;
-	public static int spiderBitesSession = 0;
-	public static int spiderCatalystsSession = 0;
-	public static int spiderBooksSession = 0;
-	public static int spiderSwattersSession = 0;
-	public static int spiderTalismansSession = 0;
-	public static int spiderMosquitosSession = 0;
-	public static double spiderTimeSession = -1;
-	public static int spiderBossesSession = -1;
-	// Zombie
-	public static int zombieRevsSession = 0;
-	public static int zombieRevFleshSession = 0;
-	public static int zombieFoulFleshSession = 0;
-	public static int zombieFoulFleshDropsSession = 0;
-	public static int zombiePestilencesSession = 0;
-	public static int zombieUndeadCatasSession = 0;
-	public static int zombieBooksSession = 0;
-	public static int zombieBeheadedsSession = 0;
-	public static int zombieRevCatasSession = 0;
-	public static int zombieSnakesSession = 0;
-	public static int zombieScythesSession = 0;
-	public static double zombieTimeSession = -1;
-	public static int zombieBossesSession = -1;
 
-	// Fishing
-	public static int seaCreaturesSession = 0;
-	public static int goodCatchesSession = 0;
-	public static int greatCatchesSession = 0;
-	public static int squidsSession = 0;
-	public static int seaWalkersSession = 0;
-	public static int nightSquidsSession = 0;
-	public static int seaGuardiansSession = 0;
-	public static int seaWitchesSession = 0;
-	public static int seaArchersSession = 0;
-	public static int monsterOfTheDeepsSession = 0;
-	public static int catfishesSession = 0;
-	public static int carrotKingsSession = 0;
-	public static int seaLeechesSession = 0;
-	public static int guardianDefendersSession = 0;
-	public static int deepSeaProtectorsSession = 0;
-	public static int hydrasSession = 0;
-	public static int seaEmperorsSession = 0;
-	public static double empTimeSession = -1;
-	public static int empSCsSession = -1;
-	public static int fishingMilestoneSession = 0;
-	// Fishing Winter
-	public static int frozenStevesSession = 0;
-	public static int frostyTheSnowmansSession = 0;
-	public static int grinchesSession = 0;
-	public static int yetisSession = 0;
-	public static double yetiTimeSession = -1;
-	public static int yetiSCsSession = -1;
-	// Fishing Festival
-	public static int nurseSharksSession = 0;
-	public static int blueSharksSession = 0;
-	public static int tigerSharksSession = 0;
-	public static int greatWhiteSharksSession = 0;
-	// Spooky Fishing
-	public static int scarecrowsSession = 0;
-	public static int nightmaresSession = 0;
-	public static int werewolfsSession = 0;
-	public static int phantomFishersSession = 0;
-	public static int grimReapersSession = 0;
-	
-	// Mythological
-	public static double mythCoinsSession = 0;
-	public static int griffinFeathersSession = 0;
-	public static int crownOfGreedsSession = 0;
-	public static int washedUpSouvenirsSession = 0;
-	public static int minosHuntersSession = 0;
-	public static int siameseLynxesSession = 0;
-	public static int minotaursSession = 0;
-	public static int gaiaConstructsSession = 0;
-	public static int minosChampionsSession = 0;
-	public static int minosInquisitorsSession = 0;
-	
-	// Catacombs Dungeons
-	public static int recombobulatorsSession = 0;
-	public static int fumingPotatoBooksSession = 0;
-	// F1
-	public static int bonzoStaffsSession = 0;
-	public static double f1CoinsSpentSession = 0;
-	public static double f1TimeSpentSession = 0;
-	// F2
-	public static int scarfStudiesSession = 0;
-	public static int adaptiveSwordsSession = 0;
-	public static double f2CoinsSpentSession = 0;
-	public static double f2TimeSpentSession = 0;
-	// F3
-	public static int adaptiveHelmsSession = 0;
-	public static int adaptiveChestsSession = 0;
-	public static int adaptiveLegsSession = 0;
-	public static int adaptiveBootsSession = 0;
-	public static double f3CoinsSpentSession = 0;
-	public static double f3TimeSpentSession = 0;
-	// F4
-	public static int spiritWingsSession = 0;
-	public static int spiritBonesSession = 0;
-	public static int spiritBootsSession = 0;
-	public static int spiritSwordsSession = 0;
-	public static int spiritBowsSession = 0;
-	public static int epicSpiritPetsSession = 0;
-	public static int legSpiritPetsSession = 0;
-	public static double f4CoinsSpentSession = 0;
-	public static double f4TimeSpentSession = 0;
-	// F5
-	public static int warpedStonesSession = 0;
-	public static int shadowAssHelmsSession = 0;
-	public static int shadowAssChestsSession = 0;
-	public static int shadowAssLegsSession = 0;
-	public static int shadowAssBootsSession = 0;
-	public static int lastBreathsSession = 0;
-	public static int lividDaggersSession = 0;
-	public static int shadowFurysSession = 0;
-	public static double f5CoinsSpentSession = 0;
-	public static double f5TimeSpentSession = 0;
-	// F6
-	public static int ancientRosesSession = 0;
-	public static int precursorEyesSession = 0;
-	public static int giantsSwordsSession = 0;
-	public static int necroLordHelmsSession = 0;
-	public static int necroLordChestsSession = 0;
-	public static int necroLordLegsSession = 0;
-	public static int necroLordBootsSession = 0;
-	public static int necroSwordsSession = 0;
-	public static double f6CoinsSpentSession = 0;
-	public static double f6TimeSpentSession = 0;
-	// F7
-	public static int witherBloodsSession = 0;
-	public static int witherCloaksSession = 0;
-	public static int implosionsSession = 0;
-	public static int witherShieldsSession = 0;
-	public static int shadowWarpsSession = 0;
-	public static int necronsHandlesSession = 0;
-	public static int autoRecombsSession = 0;