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

53 files changed, 3225 insertions, 2997 deletions

diff --git a/src/main/java/DefenitlyNotAJoikedInstallerFrame.java b/src/main/java/DefenitlyNotAJoikedInstallerFrame.java
index bd5e218..9d19f5f 100644
--- a/src/main/java/DefenitlyNotAJoikedInstallerFrame.java
+++ b/src/main/java/DefenitlyNotAJoikedInstallerFrame.java
@@ -80,7 +80,7 @@ public class DefenitlyNotAJoikedInstallerFrame extends JFrame implements ActionL
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
             DefenitlyNotAJoikedInstallerFrame frame = new DefenitlyNotAJoikedInstallerFrame();
             frame.centerFrame(frame);
-            frame.show();
+            frame.setVisible(true);
 
         } catch (Exception ex) {
             showErrorPopup(ex);
@@ -421,10 +421,7 @@ public class DefenitlyNotAJoikedInstallerFrame extends JFrame implements ActionL
         File thisFile = getThisFile();
 
         if (thisFile != null) {
-            boolean inSubFolder = false;
-            if (IN_MODS_SUBFOLDER.matcher(modsFolder.getPath()).find()) {
-                inSubFolder = true;
-            }
+            boolean inSubFolder = IN_MODS_SUBFOLDER.matcher(modsFolder.getPath()).find();
 
             File newFile = new File(modsFolder, "Danker's Skyblock Mod - " + DankersSkyblockMod.VERSION + ".jar");
 
@@ -627,24 +624,6 @@ public class DefenitlyNotAJoikedInstallerFrame extends JFrame implements ActionL
         JOptionPane.showMessageDialog(null, errorScrollPane, "Error", JOptionPane.ERROR_MESSAGE);
     }
 
-    private String getVersionFromMcmodInfo() {
-        String version = "";
-        try {
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(getClass().
-                    getClassLoader().getResourceAsStream("mcmod.info"), "mcmod.info not found.")));
-            while ((version = bufferedReader.readLine()) != null) {
-                if (version.contains("\"version\": \"")) {
-                    version = version.split(Pattern.quote("\"version\": \""))[1];
-                    version = version.substring(0, version.length() - 2);
-                    break;
-                }
-            }
-        } catch (Exception ex) {
-            // It's okay, I guess just don't use the version lol.
-        }
-        return version;
-    }
-
     private String getModIDFromInputStream(InputStream inputStream) {
         String version = "";
         try {
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 100db96..d9da871 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -4,14 +4,14 @@ import com.google.gson.JsonObject;
 import me.Danker.commands.*;
 import me.Danker.events.ChestSlotClickedEvent;
 import me.Danker.events.GuiChestBackgroundDrawnEvent;
-import me.Danker.events.RenderOverlay;
+import me.Danker.events.RenderOverlayEvent;
 import me.Danker.features.*;
-import me.Danker.features.loot.LootDisplay;
-import me.Danker.features.loot.LootTracker;
+import me.Danker.features.loot.*;
 import me.Danker.features.puzzlesolvers.*;
 import me.Danker.gui.*;
 import me.Danker.handlers.ConfigHandler;
 import me.Danker.handlers.PacketHandler;
+import me.Danker.utils.RenderUtils;
 import me.Danker.utils.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
@@ -64,7 +64,7 @@ import java.util.Map;
 @Mod(modid = DankersSkyblockMod.MODID, version = DankersSkyblockMod.VERSION, clientSideOnly = true)
 public class DankersSkyblockMod {
     public static final String MODID = "Danker's Skyblock Mod";
-    public static final String VERSION = "1.8.7-beta4";
+    public static final String VERSION = "1.8.7-beta5";
     public static int titleTimer = -1;
     public static boolean showTitle = false;
     public static String titleText = "";
@@ -128,8 +128,6 @@ public class DankersSkyblockMod {
         MinecraftForge.EVENT_BUS.register(new HighlightSkeletonMasters());
         MinecraftForge.EVENT_BUS.register(new IceWalkSolver());
         MinecraftForge.EVENT_BUS.register(new LividSolver());
-        MinecraftForge.EVENT_BUS.register(new LootDisplay());
-        MinecraftForge.EVENT_BUS.register(new LootTracker());
         MinecraftForge.EVENT_BUS.register(new LowHealthNotifications());
         MinecraftForge.EVENT_BUS.register(new NecronNotifications());
         MinecraftForge.EVENT_BUS.register(new NoF3Coords());
@@ -143,6 +141,7 @@ public class DankersSkyblockMod {
         MinecraftForge.EVENT_BUS.register(new SlayerESP());
         MinecraftForge.EVENT_BUS.register(new SpamHider());
         MinecraftForge.EVENT_BUS.register(new SpiritBearAlert());
+        MinecraftForge.EVENT_BUS.register(new SpiritBootsFix());
         MinecraftForge.EVENT_BUS.register(new StartsWithSolver());
         MinecraftForge.EVENT_BUS.register(new StopSalvagingStarredItems());
         MinecraftForge.EVENT_BUS.register(new SuperpairsSolver());
@@ -155,6 +154,17 @@ public class DankersSkyblockMod {
         MinecraftForge.EVENT_BUS.register(new WatcherReadyAlert());
         MinecraftForge.EVENT_BUS.register(new WaterSolver());
 
+        MinecraftForge.EVENT_BUS.register(new LootDisplay());
+        MinecraftForge.EVENT_BUS.register(new LootTracker());
+        MinecraftForge.EVENT_BUS.register(new CatacombsTracker());
+        MinecraftForge.EVENT_BUS.register(new EndermanTracker());
+        MinecraftForge.EVENT_BUS.register(new FishingTracker());
+        MinecraftForge.EVENT_BUS.register(new GhostTracker());
+        MinecraftForge.EVENT_BUS.register(new MythologicalTracker());
+        MinecraftForge.EVENT_BUS.register(new SpiderTracker());
+        MinecraftForge.EVENT_BUS.register(new WolfTracker());
+        MinecraftForge.EVENT_BUS.register(new ZombieTracker());
+
         ConfigHandler.reloadConfig();
         GoldenEnchants.init();
         TriviaSolver.init();
@@ -328,7 +338,7 @@ public class DankersSkyblockMod {
         if (event.type != RenderGameOverlayEvent.ElementType.EXPERIENCE && event.type != RenderGameOverlayEvent.ElementType.JUMPBAR)
             return;
         if (Minecraft.getMinecraft().currentScreen instanceof EditLocationsGui) return;
-        MinecraftForge.EVENT_BUS.post(new RenderOverlay());
+        MinecraftForge.EVENT_BUS.post(new RenderOverlayEvent());
     }
 
     // LabyMod Support
@@ -337,13 +347,13 @@ public class DankersSkyblockMod {
         if (!usingLabymod) return;
         if (event.type != null) return;
         if (Minecraft.getMinecraft().currentScreen instanceof EditLocationsGui) return;
-        MinecraftForge.EVENT_BUS.post(new RenderOverlay());
+        MinecraftForge.EVENT_BUS.post(new RenderOverlayEvent());
     }
 
     @SubscribeEvent
-    public void renderPlayerInfo(RenderOverlay event) {
+    public void renderPlayerInfo(RenderOverlayEvent event) {
         if (showTitle) {
-            Utils.drawTitle(titleText);
+            RenderUtils.drawTitle(titleText);
         }
     }
 
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.w