Access static methods in static ways and remove unused imports

25 files changed, 1247 insertions, 1336 deletions

diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index 65372cc..8cb1203 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -91,7 +91,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -173,12 +172,10 @@ public class TheMod
     
     @EventHandler
     public void init(FMLInitializationEvent event) {
-		FMLCommonHandler.instance().bus().register(this);
 		MinecraftForge.EVENT_BUS.register(this);
 		MinecraftForge.EVENT_BUS.register(new PacketHandler());
 		
-		final ConfigHandler cf = new ConfigHandler();
-		cf.reloadConfig();
+		ConfigHandler.reloadConfig();
 		
 		// For golden enchants
 		t6Enchants.put("9Angler VI", "6Angler VI");
@@ -299,11 +296,10 @@ public class TheMod
 			
     		// MULTI THREAD DRIFTING
     		new Thread(() -> {
-    			APIHandler ah = new APIHandler();
     			EntityPlayer player = Minecraft.getMinecraft().thePlayer;	
     			
     			System.err.println("Checking for updates...");
-    			JsonObject latestRelease = ah.getResponse("https://api.github.com/repos/bowser0000/SkyblockMod/releases/latest");
+    			JsonObject latestRelease = APIHandler.getResponse("https://api.github.com/repos/bowser0000/SkyblockMod/releases/latest");
     			
     			String latestTag = latestRelease.get("tag_name").getAsString();
     			DefaultArtifactVersion currentVersion = new DefaultArtifactVersion(VERSION);
@@ -335,7 +331,6 @@ public class TheMod
     // It randomly broke, so I had to make it the highest priority
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void onChat(ClientChatReceivedEvent event) {
-    	final ToggleCommand tc = new ToggleCommand();
     	String message = StringUtils.stripControlCodes(event.message.getUnformattedText());
     	
     	if (!Utils.inSkyblock) return;
@@ -344,7 +339,7 @@ public class TheMod
     	if (event.type == 2) {
     		String[] actionBarSections = event.message.getUnformattedText().split(" {3,}");
     		for (String section : actionBarSections) {
-    			if (tc.skill50DisplayToggled) {
+    			if (ToggleCommand.skill50DisplayToggled) {
     				if (section.contains("+") && section.contains("/") && section.contains("(")) {
     					if (section.contains("Runecrafting")) return;
     					
@@ -393,17 +388,17 @@ public class TheMod
     	if (message.contains(":")) return;
     	
 		// Spirit Sceptre
-		if (!tc.sceptreMessages && message.contains("Your Spirit Sceptre hit ")) {
+		if (!ToggleCommand.sceptreMessages && message.contains("Your Spirit Sceptre hit ")) {
 			event.setCanceled(true);
 			return;
 		}
 		// Midas Staff
-		if (!tc.midasStaffMessages && message.contains("Your Molten Wave hit ")) {
+		if (!ToggleCommand.midasStaffMessages && message.contains("Your Molten Wave hit ")) {
 			event.setCanceled(true);
 			return;
 		}
 		// Heals
-		if (!tc.healMessages && message.contains(" health!") && (message.contains("You healed ") || message.contains(" healed you for "))) {
+		if (!ToggleCommand.healMessages && message.contains(" health!") && (message.contains("You healed ") || message.contains(" healed you for "))) {
 			event.setCanceled(true);
 			return;
 		}
@@ -436,7 +431,7 @@ public class TheMod
         	}
         }
     	
-		if (tc.gpartyToggled) {
+		if (ToggleCommand.gpartyToggled) {
 			if (message.contains(" has invited all members of ")) {
 				try {
 					final SystemTray tray = SystemTray.getSystemTray();
@@ -453,7 +448,7 @@ public class TheMod
 			}
 		}
 		
-		if (tc.golemAlertToggled) {
+		if (ToggleCommand.golemAlertToggled) {
 			if (message.contains("The ground begins to shake as an Endstone Protector rises from below!")) {
 				Utils.createTitle(EnumChatFormatting.RED + "GOLEM SPAWNING!", 3);
 			}
@@ -464,8 +459,6 @@ public class TheMod
 			ConfigHandler.writeDoubleConfig("misc", "cakeTime", cakeTime);
 		}
 		
-		final LootCommand lc = new LootCommand();
-		final ConfigHandler cf = new ConfigHandler();
 		boolean wolfRNG = false;
 		boolean spiderRNG = false;
 		boolean zombieRNG = false;
@@ -476,304 +469,303 @@ public class TheMod
 			for (String s : scoreboard) {
 				String sCleaned = ScoreboardHandler.cleanSB(s);
 				if (sCleaned.contains("Sven Packmaster")) {
-					lc.wolfBooks++;
-					cf.writeIntConfig("wolf", "book", lc.wolfBooks);
+					LootCommand.wolfBooks++;
+					ConfigHandler.writeIntConfig("wolf", "book", LootCommand.wolfBooks);
 				} else if (sCleaned.contains("Tarantula Broodfather")) {
-					lc.spiderBooks++;
-					cf.writeIntConfig("spider", "book", lc.spiderBooks);
+					LootCommand.spiderBooks++;
+					ConfigHandler.writeIntConfig("spider", "book", LootCommand.spiderBooks);
 				} else if (sCleaned.contains("Revenant Horror")) {
-					lc.zombieBooks++;
-					cf.writeIntConfig("zombie", "book", lc.zombieBooks);
+					LootCommand.zombieBooks++;
+					ConfigHandler.writeIntConfig("zombie", "book", LootCommand.zombieBooks);
 				}
 			}
 		}
 
 		// Wolf
 		if (message.contains("Talk to Maddox to claim your Wolf Slayer XP!")) {
-			lc.wolfSvens++;
-			lc.wolfSvensSession++;
-			if (lc.wolfBosses != -1) {
-				lc.wolfBosses++;
+			LootCommand.wolfSvens++;
+			LootCommand.wolfSvensSession++;
+			if (LootCommand.wolfBosses != -1) {
+				LootCommand.wolfBosses++;
 			}
-			if (lc.wolfBossesSession != -1) {
-				lc.wolfBossesSession++;
+			if (LootCommand.wolfBossesSession != -1) {
+				LootCommand.wolfBossesSession++;
 			}
-			cf.writeIntConfig("wolf", "svens", lc.wolfSvens);
-			cf.writeIntConfig("wolf", "bossRNG", lc.wolfBosses);
+			ConfigHandler.writeIntConfig("wolf", "svens", LootCommand.wolfSvens);
+			ConfigHandler.writeIntConfig("wolf", "bossRNG", LootCommand.wolfBosses);
 		} else if (message.contains("RARE DROP! (Hamster Wheel)")) {
-			lc.wolfWheelsDrops++;
-			lc.wolfWheelsDropsSession++;
-			cf.writeIntConfig("wolf", "wheelDrops", lc.wolfWheelsDrops);
+			LootCommand.wolfWheelsDrops++;
+			LootCommand.wolfWheelsDropsSession++;
+			ConfigHandler.writeIntConfig("wolf", "wheelDrops", LootCommand.wolfWheelsDrops);
 		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Spirit Rune I)")) { // Removing the unicode here *should* fix rune drops not counting
-			lc.wolfSpirits++;
-			lc.wolfSpiritsSession++;
-			cf.writeIntConfig("wolf", "spirit", lc.wolfSpirits);
+			LootCommand.wolfSpirits++;
+			LootCommand.wolfSpiritsSession++;
+			ConfigHandler.writeIntConfig("wolf", "spirit", LootCommand.wolfSpirits);
 		} else if (message.contains("CRAZY RARE DROP!  (Red Claw Egg)")) {
 			wolfRNG = true;
-			lc.wolfEggs++;
-			lc.wolfEggsSession++;
-			cf.writeIntConfig("wolf", "egg", lc.wolfEggs);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_RED + "RED CLAW EGG!", 3);
+			LootCommand.wolfEggs++;
+			LootCommand.wolfEggsSession++;
+			ConfigHandler.writeIntConfig("wolf", "egg", LootCommand.wolfEggs);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_RED + "RED CLAW EGG!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Couture Rune I)")) {
 			wolfRNG = true;
-			lc.wolfCoutures++;
-			lc.wolfCouturesSession++;
-			cf.writeIntConfig("wolf", "couture", lc.wolfCoutures);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "COUTURE RUNE!", 3);
+			LootCommand.wolfCoutures++;
+			LootCommand.wolfCouturesSession++;
+			ConfigHandler.writeIntConfig("wolf", "couture", LootCommand.wolfCoutures);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "COUTURE RUNE!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Grizzly Bait)") || message.contains("CRAZY RARE DROP! (Rename Me)")) { // How did Skyblock devs even manage to make this item Rename Me
 			wolfRNG = true;
-			lc.wolfBaits++;
-			lc.wolfBaitsSession++;
-			cf.writeIntConfig("wolf", "bait", lc.wolfBaits);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.AQUA + "GRIZZLY BAIT!", 3);
+			LootCommand.wolfBaits++;
+			LootCommand.wolfBaitsSession++;
+			ConfigHandler.writeIntConfig("wolf", "bait", LootCommand.wolfBaits);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.AQUA + "GRIZZLY BAIT!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Overflux Capacitor)")) {
 			wolfRNG = true;
-			lc.wolfFluxes++;
-			lc.wolfFluxesSession++;
-			cf.writeIntConfig("wolf", "flux", lc.wolfFluxes);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
+			LootCommand.wolfFluxes++;
+			LootCommand.wolfFluxesSession++;
+			ConfigHandler.writeIntConfig("wolf", "flux", LootCommand.wolfFluxes);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
 		} else if (message.contains("Talk to Maddox to claim your Spider Slayer XP!")) { // Spider
-			lc.spiderTarantulas++;
-			lc.spiderTarantulasSession++;
-			if (lc.spiderBosses != -1) {
-				lc.spiderBosses++;
+			LootCommand.spiderTarantulas++;
+			LootCommand.spiderTarantulasSession++;
+			if (LootCommand.spiderBosses != -1) {
+				LootCommand.spiderBosses++;
 			}
-			if (lc.spiderBossesSession != -1) {
-				lc.spiderBossesSession++;
+			if (LootCommand.spiderBossesSession != -1) {
+				LootCommand.spiderBossesSession++;
 			}
-			cf.writeIntConfig("spider", "tarantulas", lc.spiderTarantulas);
-			cf.writeIntConfig("spider", "bossRNG", lc.spiderBosses);
+			ConfigHandler.writeIntConfig("spider", "tarantulas", LootCommand.spiderTarantulas);
+			ConfigHandler.writeIntConfig("spider", "bossRNG", LootCommand.spiderBosses);
 		} else if (message.contains("RARE DROP! (Toxic Arrow Poison)")) {
-			lc.spiderTAPDrops++;
-			lc.spiderTAPDropsSession++;
-			cf.writeIntConfig("spider", "tapDrops", lc.spiderTAPDrops);
+			LootCommand.spiderTAPDrops++;
+			LootCommand.spiderTAPDropsSession++;
+			ConfigHandler.writeIntConfig("spider", "tapDrops", LootCommand.spiderTAPDrops);
 		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Bite Rune I)")) {
-			lc.spiderBites++;
-			lc.spiderBitesSession++;
-			cf.writeIntConfig("spider", "bite", lc.spiderBites);
+			LootCommand.spiderBites++;
+			LootCommand.spiderBitesSession++;
+			ConfigHandler.writeIntConfig("spider", "bite", LootCommand.spiderBites);
 		} else if (message.contains("VERY RARE DROP!  (Spider Catalyst)")) {
-			lc.spiderCatalysts++;
-			lc.spiderCatalystsSession++;
-			cf.writeIntConfig("spider", "catalyst", lc.spiderCatalysts);
+			LootCommand.spiderCatalysts++;
+			LootCommand.spiderCatalystsSession++;
+			ConfigHandler.writeIntConfig("spider", "catalyst", LootCommand.spiderCatalysts);
 		} else if (message.contains("CRAZY RARE DROP!  (Fly Swatter)")) {
 			spiderRNG = true;
-			lc.spiderSwatters++;
-			lc.spiderSwattersSession++;
-			cf.writeIntConfig("spider", "swatter", lc.spiderSwatters);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.LIGHT_PURPLE + "FLY SWATTER!", 3);
+			LootCommand.spiderSwatters++;
+			LootCommand.spiderSwattersSession++;
+			ConfigHandler.writeIntConfig("spider", "swatter", LootCommand.spiderSwatters);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.LIGHT_PURPLE + "FLY SWATTER!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Tarantula Talisman")) {
 			spiderRNG = true;
-			lc.spiderTalismans++;
-			lc.spiderTalismansSession++;
-			cf.writeIntConfig("spider", "talisman", lc.spiderTalismans);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "TARANTULA TALISMAN!", 3);
+			LootCommand.spiderTalismans++;
+			LootCommand.spiderTalismansSession++;
+			ConfigHandler.writeIntConfig("spider", "talisman", LootCommand.spiderTalismans);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "TARANTULA TALISMAN!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Digested Mosquito)")) {
 			spiderRNG = true;
-			lc.spiderMosquitos++;
-			lc.spiderMosquitosSession++;
-			cf.writeIntConfig("spider", "mosquito", lc.spiderMosquitos);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
+			LootCommand.spiderMosquitos++;
+			LootCommand.spiderMosquitosSession++;
+			ConfigHandler.writeIntConfig("spider", "mosquito", LootCommand.spiderMosquitos);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
 		} else if (message.contains("Talk to Maddox to claim your Zombie Slayer XP!")) { // Zombie
-			lc.zombieRevs++;
-			lc.zombieRevsSession++;
-			if (lc.zombieBosses != -1) {
-				lc.zombieBosses++;
+			LootCommand.zombieRevs++;
+			LootCommand.zombieRevsSession++;
+			if (LootCommand.zombieBosses != -1) {
+				LootCommand.zombieBosses++;
 			}
-			if (lc.zombieBossesSession != 1) {
-				lc.zombieBossesSession++;
+			if (LootCommand.zombieBossesSession != 1) {
+				LootCommand.zombieBossesSession++;
 			}
-			cf.writeIntConfig("zombie", "revs", lc.zombieRevs);
-			cf.writeIntConfig("zombie", "bossRNG", lc.zombieBosses);
+			ConfigHandler.writeIntConfig("zombie", "revs", LootCommand.zombieRevs);
+			ConfigHandler.writeIntConfig("zombie", "bossRNG", LootCommand.zombieBosses);
 		} else if (message.contains("RARE DROP! (Foul Flesh)")) {
-			lc.zombieFoulFleshDrops++;
-			lc.zombieFoulFleshDropsSession++;
-			cf.writeIntConfig("zombie", "foulFleshDrops", lc.zombieFoulFleshDrops);
+			LootCommand.zombieFoulFleshDrops++;
+			LootCommand.zombieFoulFleshDropsSession++;
+			ConfigHandler.writeIntConfig("zombie", "foulFleshDrops", LootCommand.zombieFoulFleshDrops);
 		} else if (message.contains("VERY RARE DROP!  (Revenant Catalyst)")) {
-			lc.zombieRevCatas++;
-			lc.zombieRevCatasSession++;
-			cf.writeIntConfig("zombie", "revCatalyst", lc.zombieRevCatas);
+			LootCommand.zombieRevCatas++;
+			LootCommand.zombieRevCatasSession++;
+			ConfigHandler.writeIntConfig("zombie", "revCatalyst", LootCommand.zombieRevCatas);
 		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Pestilence Rune I)")) {
-			lc.zombiePestilences++;
-			lc.zombiePestilencesSession++;
-			cf.writeIntConfig("zombie", "pestilence", lc.zombiePestilences);
+			LootCommand.zombiePestilences++;
+			LootCommand.zombiePestilencesSession++;
+			ConfigHandler.writeIntConfig("zombie", "pestilence", LootCommand.zombiePestilences);
 		} else if (message.contains("VERY RARE DROP!  (Undead Catalyst)")) {
-			lc.zombieUndeadCatas++;
-			lc.zombieUndeadCatasSession++;
-			cf.writeIntConfig("zombie", "undeadCatalyst", lc.zombieUndeadCatas);
+			LootCommand.zombieUndeadCatas++;
+			LootCommand.zombieUndeadCatasSession++;
+			ConfigHandler.writeIntConfig("zombie", "undeadCatalyst", LootCommand.zombieUndeadCatas);
 		} else if (message.contains("CRAZY RARE DROP!  (Beheaded Horror)")) {
 			zombieRNG = true;
-			lc.zombieBeheadeds++;
-			lc.zombieBeheadedsSession++;
-			cf.writeIntConfig("zombie", "beheaded", lc.zombieBeheadeds);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "BEHEADED HORROR!", 3);
+			LootCommand.zombieBeheadeds++;
+			LootCommand.zombieBeheadedsSession++;
+			ConfigHandler.writeIntConfig("zombie", "beheaded", LootCommand.zombieBeheadeds);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "BEHEADED HORROR!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Snake Rune I)")) {
 			zombieRNG = true;
-			lc.zombieSnakes++;
-			lc.zombieSnakesSession++;
-			cf.writeIntConfig("zombie", "snake", lc.zombieSnakes);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_GREEN + "SNAKE RUNE!", 3);
+			LootCommand.zombieSnakes++;
+			LootCommand.zombieSnakesSession++;
+			ConfigHandler.writeIntConfig("zombie", "snake", LootCommand.zombieSnakes);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_GREEN + "SNAKE RUNE!", 3);
 		} else if (message.contains("CRAZY RARE DROP!  (Scythe Blade)")) {
 			zombieRNG = true;
-			lc.zombieScythes++;
-			lc.zombieScythesSession++;
-			cf.writeIntConfig("zombie", "scythe", lc.zombieScythes);
-			if (tc.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
+			LootCommand.zombieScythes++;
+			LootCommand.zombieScythesSession++;
+			ConfigHandler.writeIntConfig("zombie", "scythe", LootCommand.zombieScythes);
+			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
 		} else if (message.contains("GOOD CATCH!")) { // Fishing
-			lc.goodCatches++;
-			lc.goodCatchesSession++;
-			cf.writeIntConfig("fishing", "goodCatch", lc.goodCatches);
+			LootCommand.goodCatches++;
+			LootCommand.goodCatchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "goodCatch", LootCommand.goodCatches);
 		} else if (message.contains("GREAT CATCH!")) {
-			lc.greatCatches++;
-			lc.greatCatchesSession++;
-			cf.writeIntConfig("fishing", "greatCatch", lc.greatCatches);
+			LootCommand.greatCatches++;
+			LootCommand.greatCatchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "greatCatch", LootCommand.greatCatches);
 		} else if (message.contains("A Squid appeared")) {
-			lc.squids++;
-			lc.squidsSession++;
-			cf.writeIntConfig("fishing", "squid", lc.squids);
+			LootCommand.squids++;
+			LootCommand.squidsSession++;
+			ConfigHandler.writeIntConfig("fishing", "squid", LootCommand.squids);
 			increaseSeaCreatures();
 		} else if (message.contains("You caught a Sea Walker")) {
-			lc.seaWalkers++;
-			lc.seaWalkersSession++;
-			cf.writeIntConfig("fishing", "seaWalker", lc.seaWalkers);
+			LootCommand.seaWalkers++;
+			LootCommand.seaWalkersSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaWalker", LootCommand.seaWalkers);
 			increaseSeaCreatures();
 		} else if (message.contains("Pitch darkness reveals a Night Squid")) {
-			lc.nightSquids++;
-			lc.nightSquidsSession++;
-			cf.writeIntConfig("fishing", "nightSquid", lc.nightSquids);
+			LootCommand.nightSquids++;
+			LootCommand.nightSquidsSession++;
+			ConfigHandler.writeIntConfig("fishing", "nightSquid", LootCommand.nightSquids);
 			increaseSeaCreatures();
 		} else if (message.contains("You stumbled upon a Sea Guardian")) {
-			lc.seaGuardians++;
-			lc.seaGuardiansSession++;
-			cf.writeIntConfig("fishing", "seaGuardian", lc.seaGuardians);
+			LootCommand.seaGuardians++;
+			LootCommand.seaGuardiansSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaGuardian", LootCommand.seaGuardians);
 			increaseSeaCreatures();
 		} else if (message.contains("It looks like you've disrupted the Sea Witch's brewing session. Watch out, she's furious")) {
-			lc.seaWitches++;
-			lc.seaWitchesSession++;
-			cf.writeIntConfig("fishing", "seaWitch", lc.seaWitches);
+			LootCommand.seaWitches++;
+			LootCommand.seaWitchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaWitch", LootCommand.seaWitches);
 			increaseSeaCreatures();
 		} else if (message.contains("You reeled in a Sea Archer")) {
-			lc.seaArchers++;
-			lc.seaArchersSession++;
-			cf.writeIntConfig("fishing", "seaArcher", lc.seaArchers);
+			LootCommand.seaArchers++;
+			LootCommand.seaArchersSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaArcher", LootCommand.seaArchers);
 			increaseSeaCreatures();
 		} else if (message.contains("The Monster of the Deep has emerged")) {
-			lc.monsterOfTheDeeps++;
-			lc.monsterOfTheDeepsSession++;
-			cf.writeIntConfig("fishing", "monsterOfDeep", lc.monsterOfTheDeeps);
+			LootCommand.monsterOfTheDeeps++;
+			LootCommand.monsterOfTheDeepsSession++;
+			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", LootCommand.monsterOfTheDeeps);
 			increaseSeaCreatures();
 		} else if (message.contains("Huh? A Catfish")) {
-			lc.catfishes++;
-			lc.catfishesSession++;
-			cf.writeIntConfig("fishing", "catfish", lc.catfishes);
+			LootCommand.catfishes++;
+			LootCommand.catfishesSession++;
+			ConfigHandler.writeIntConfig("fishing", "catfish", LootCommand.catfishes);
 			increaseSeaCreatures();
 		} else if (message.contains("Is this even a fish? It's the Carrot King")) {
-			lc.carrotKings++;
-			lc.carrotKingsSession++;
-			cf.writeIntConfig("fishing", "carrotKing", lc.carrotKings);
+			LootCommand.carrotKings++;
+			LootCommand.carrotKingsSession++;
+			ConfigHandler.writeIntConfig("fishing", "carrotKing", LootCommand.carrotKings);
 			increaseSeaCreatures();
 		} else if (message.contains("Gross! A Sea Leech")) {
-			lc.seaLeeches++;
-			lc.seaLeechesSession++;
-			cf.writeIntConfig("fishing", "seaLeech", lc.seaLeeches);
+			LootCommand.seaLeeches++;
+			LootCommand.seaLeechesSession++;
+			ConfigHandler.writeIntConfig("fishing", "seaLeech", LootCommand.seaLeeches);
 			increaseSeaCreatures();
 		} else if (message.contains("You've discovered a Guardian Defender of the sea")) {
-			lc.guardianDefenders++;
-			lc.guardianDefendersSession++;
-			cf.writeIntConfig("fishing", "guardianDefender", lc.guardianDefenders);
+			LootCommand.guardianDefenders++;
+			LootCommand.guardianDefendersSession++;
+			ConfigHandler.writeIntConfig("fishing", "guardianDefender", LootCommand.guardianDefenders);
 			increaseSeaCreatures();
 		} else if (message.contains("You have awoken the Deep Sea Protector, prepare for a battle")) {
-			lc.deepSeaProtectors++;
-			lc.deepSeaProtectorsSession++;
-			cf.writeIntConfig("fishing", "deepSeaProtector", lc.deepSeaProtectors);
+			LootCommand.deepSeaProtectors++;
+			LootCommand.deepSeaProtectorsSession++;
+			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", LootCommand.deepSeaProtectors);
 			increaseSeaCreatures();
 		} else if (message.contains("The Water Hydra has come to test your strength")) {
-			lc.hydras++;
-			lc.hydrasSession++;
-			cf.writeIntConfig("fishing", "hydra", lc.hydras);
+			LootCommand.hydras++;
+			LootCommand.hydrasSession++;
+			ConfigHandler.writeIntConfig("fishing", "hydra", LootCommand.hydras);
 			increaseSeaCreatures();
 		} else if (message.contains("The Sea Emperor arises from the depths")) {
 			increaseSeaCreatures();
 			
-			lc.seaEmperors++;
-			lc.empTime = System.currentTimeMillis() / 1000;
-			lc.empSCs = 0;
-			lc.seaEmperorsSession++;
-			lc.empTimeSession = System.currentTimeMillis() / 1000;
-			lc.empSCsSession = 0;
-			cf.writeIntConfig("fishing", "seaEmperor", lc.seaEmperors);
-			cf.writeDoubleConfig("fishing", "empTime", lc.empTime);
-			cf.writeIntConfig("fishing", "empSC", lc.empSCs);
+			LootCommand.seaEmperors++;
+			LootCommand.empTime = System.currentTimeMillis() / 1000;
+			LootCommand.empSCs = 0;
+			LootCommand.seaEmperorsSession++;
+			LootCommand.empTimeSession = System.currentTimeMillis() / 1000;
+			LootCommand.empSCsSession = 0;
+			ConfigHandler.writeIntConfig("fishing", "seaEmperor", LootCommand.seaEmperors);
+			ConfigHandler.writeDoubleConfig("fishing", "empTime", LootCommand.empTime);
+			ConfigHandler.writeIntConfig("fishing", "empSC", LootCommand.empSCs);
 		} else if (message.contains("Frozen Steve fell into the pond long ago")) { // Fishing Winter
-			lc.frozenSteves++;
-			lc.frozenStevesSession++;
-			cf.writeIntConfig("fishing", "frozenSteve", lc.frozenSteves);
+			LootCommand.frozenSteves++;
+			LootCommand.frozenStevesSession++;
+			ConfigHandler.writeIntConfig("fishing", "frozenSteve", LootCommand.frozenSteves);
 			increaseSeaCreatures();
 		} else if (message.contains("It's a snowman! He looks harmless")) {
-			lc.frostyTheSnowmans++;
-			lc.frostyTheSnowmansSession++;
-			cf.writeIntConfig("fishing", "snowman", lc.frostyTheSnowmans);
+			LootCommand.frostyTheSnowmans++;
+			LootCommand.frostyTheSnowmansSession++;
+			ConfigHandler.writeIntConfig("fishing", "snowman", LootCommand.frostyTheSnowmans);
 			increaseSeaCreatures();
 		} else if (message.contains("stole Jerry's Gifts...get them back")) {
-			lc.grinches++;
-			lc.grinchesSession++;
-			cf.writeIntConfig("fishing", "grinch", lc.grinches);
+			LootCommand.grinches++;
+			LootCommand.grinchesSession++;
+			ConfigHandler.writeIntConfig("fishing", "grinch", LootCommand.grinches);
 			increaseSeaCreatures();
 		} else if (message.contains("What is this creature")) {
+			LootCommand.yetis++;
+			LootCommand.yetiTime = System.currentTimeMillis() / 1000;
+			LootCommand.yetiSCs = 0;
+			LootCommand.yetisSession++;
+			LootCommand.yetiTimeSession = System.currentTimeMillis() / 1000;
+			LootCommand.yetiSCsSession = 0;
+			ConfigHandler.writeIntConfig("fishing", "yeti", LootCommand.yetis);
+			ConfigHandler.writeDoubleConfig("fishing", "yetiTime", LootCommand.yetiTime);
+			ConfigHandler.writeIntConfig("fishing", "yetiSC", LootCommand.yetiSCs);
 			increaseSeaCreatures();
-			
-			lc.yetis++;
-			lc.yetiTime = System.currentTimeMillis() / 1000;
-			lc.yetiSCs = 0;
-			lc.yetisSession++;
-			lc.yetiTimeSession = System.currentTimeMillis() / 1000;
-			lc.yetiSCsSession = 0;
-			cf.writeIntConfig("fishing", "yeti", lc.yetis);
-			cf.writeDoubleConfig("fishing", "yetiTime", lc.yetiTime);
-			cf.writeIntConfig("fishing", "yetiSC", lc.yetiSCs);
 		} else if (message.contains("A tiny fin emerges from the water, you've caught a Nurse Shark")) { // Fishing Festival
-			lc.nurseSharks++;
-			lc.nurseSharksSession++;
-			cf.writeIntConfig("fishing", "nurseShark", lc.nurseSharks);
+			LootCommand.nurseSharks++;
+			LootCommand.nurseSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "nurseShark", LootCommand.nurseSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("You spot a fin as blue as the water it came from, it's a Blue Shark")) {
-			lc.blueSharks++;
-			lc.blueSharksSession++;
-			cf.writeIntConfig("fishing", "blueShark", lc.blueSharks);
+			LootCommand.blueSharks++;
+			LootCommand.blueSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "blueShark", LootCommand.blueSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("A striped beast bounds from the depths, the wild Tiger Shark")) {
-			lc.tigerSharks++;
-			lc.tigerSharksSession++;
-			cf.writeIntConfig("fishing", "tigerShark", lc.tigerSharks);
+			LootCommand.tigerSharks++;
+			LootCommand.tigerSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "tigerShark", LootCommand.tigerSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("Hide no longer, a Great White Shark has tracked your scent and thirsts for your blood")) {
-			lc.greatWhiteSharks++;
-			lc.greatWhiteSharksSession++;
-			cf.writeIntConfig("fishing", "greatWhiteShark", lc.greatWhiteSharks);
+			LootCommand.greatWhiteSharks++;
+			LootCommand.greatWhiteSharksSession++;
+			ConfigHandler.writeIntConfig("fishing", "greatWhiteShark", LootCommand.greatWhiteSharks);
 			increaseSeaCreatures();
 		} else if (message.contains("Phew! It's only a Scarecrow")) {
-			lc.scarecrows++;
-			lc.scarecrowsSession++;
-			cf.writeIntConfig("fishing", "scarecrow", lc.scarecrows);
+			LootCommand.scarecrows++;
+			LootCommand.scarecrowsSession++;
+			ConfigHandler.writeIntConfig("fishing", "scarecrow", LootCommand.scarecrows);
 			increaseSeaCreatures();
 		} else if (message.contains("You hear trotting from beneath the waves, you caught a Nightmare")) {
-			lc.nightmares++;
-			lc.nightmaresSession++;
-			cf.writeIntConfig("fishing", "nightmare", lc.nightmares);
+			LootCommand.nightmares++;
+			LootCommand.nightmaresSession++;
+			ConfigHandler.writeIntConfig("fishing", "nightmare", LootCommand.nightmares);
 			increaseSeaCreatures();
 		} else if (message.contains("It must be a full moon, a Werewolf appears")) {
-			lc.werewolfs++;
-			lc.werewolfsSession++;
-			cf.writeIntConfig("fishing", "werewolf", lc.werewolfs);
+			LootCommand.werewolfs++;
+			LootCommand.werewolfsSession++;
+			ConfigHandler.writeIntConfig("fishing", "werewolf", LootCommand.werewolfs);
 			increaseSeaCreatures();
 		} else if (message.contains("The spirit of a long lost Phantom Fisher has come to haunt you")) {
-			lc.phantomFishers++;
-			lc.phantomFishersSession++;
-			cf.writeIntConfig("fishing", "phantomFisher", lc.phantomFishers);
+			LootCommand.phantomFishers++;
+			LootCommand.phantomFishersSession++;
+			ConfigHandler.writeIntConfig("fishing", "phantomFisher", LootCommand.phantomFishers);
 			increaseSeaCreatures();
 		} else if (message.contains("This can't be! The manifestation of death himself")) {
-			lc.grimReapers++;
-			lc.grimReapersSession++;
-			cf.writeIntConfig("fishing", "grimReaper", lc.grimReapers);
+			LootCommand.grimReapers++;
+			LootCommand.grimReapersSession++;
+			ConfigHandler.writeIntConfig("fishing", "grimReaper", LootCommand.grimReapers);
 			increaseSeaCreatures();
 		} else if (message.contains("Dungeon starts in 1 second.")) { // Dungeons Stuff
 		    dungeonStartTime = System.currentTimeMillis() / 1000 + 1;
@@ -799,29 +791,29 @@ public class TheMod
 				if (sCleaned.contains("The Catacombs (")) {
 					// Add time to floor
 					if (sCleaned.contains("F1")) {
-						lc.f1TimeSpent = Math.floor(lc.f1TimeSpent + timeToAdd);
-						lc.f1TimeSpentSession = Math.floor(lc.f1TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorOneTime", lc.f1TimeSpent);
+						LootCommand.f1TimeSpent = Math.floor(LootCommand.f1TimeSpent + timeToAdd);
+						LootCommand.f1TimeSpentSession = Math.floor(LootCommand.f1TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorOneTime", LootCommand.f1TimeSpent);
 					} else if (sCleaned.contains("F2")) {
-						lc.f2TimeSpent = Math.floor(lc.f2TimeSpent + timeToAdd);
-						lc.f2TimeSpentSession = Math.floor(lc.f2TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorTwoTime", lc.f2TimeSpent);
+						LootCommand.f2TimeSpent = Math.floor(LootCommand.f2TimeSpent + timeToAdd);
+						LootCommand.f2TimeSpentSession = Math.floor(LootCommand.f2TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorTwoTime", LootCommand.f2TimeSpent);
 					} else if (sCleaned.contains("F3")) {
-						lc.f3TimeSpent = Math.floor(lc.f3TimeSpent + timeToAdd);
-						lc.f3TimeSpentSession = Math.floor(lc.f3TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorThreeTime", lc.f3TimeSpent);
+						LootCommand.f3TimeSpent = Math.floor(LootCommand.f3TimeSpent + timeToAdd);
+						LootCommand.f3TimeSpentSession = Math.floor(LootCommand.f3TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorThreeTime", LootCommand.f3TimeSpent);
 					} else if (sCleaned.contains("F4")) {
-						lc.f4TimeSpent = Math.floor(lc.f4TimeSpent + timeToAdd);
-						lc.f4TimeSpentSession = Math.floor(lc.f4TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorFourTime", lc.f4TimeSpent);
+						LootCommand.f4TimeSpent = Math.floor(LootCommand.f4TimeSpent + timeToAdd);
+						LootCommand.f4TimeSpentSession = Math.floor(LootCommand.f4TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorFourTime", LootCommand.f4TimeSpent);
 					} else if (sCleaned.contains("F5")) {
-						lc.f5TimeSpent = Math.floor(lc.f5TimeSpent + timeToAdd);
-						lc.f5TimeSpentSession = Math.floor(lc.f5TimeSpentSession + timeToAdd);
-						cf.writeDoubleConfig("catacombs", "floorFiveTime", lc.f5TimeSpent);
+						LootCommand.f5TimeSpent = Math.floor(LootCommand.f5TimeSpent + timeToAdd);
+						LootCommand.f5TimeSpentSession = Math.floor(LootCommand.f5TimeSpentSession + timeToAdd);
+						ConfigHandler.writeDoubleConfig("catacombs", "floorFiveTime", LootCommand.f5TimeSpent);
 					} else if (sCleaned.contains("F6")) {
-						lc.f6TimeSpent = Math.floor(lc.f6TimeSpent + timeToAdd);
-						lc.f6TimeSpentSession = Math.floor(lc.f6TimeSpentSession + timeToAdd);
-						c