Merge pull request #91 from bowser0000/developmentv1.8.6

1.8.6

2 files changed, 339 insertions, 584 deletions

diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index d5ab40b..d3b7464 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -1,7 +1,13 @@
 package me.Danker.handlers;
 
 import me.Danker.DankersSkyblockMod;
-import me.Danker.commands.*;
+import me.Danker.commands.MoveCommand;
+import me.Danker.commands.ScaleCommand;
+import me.Danker.commands.ToggleCommand;
+import me.Danker.features.*;
+import me.Danker.features.loot.LootDisplay;
+import me.Danker.features.loot.LootTracker;
+import me.Danker.features.puzzlesolvers.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.util.EnumChatFormatting;
@@ -84,7 +90,7 @@ public class ConfigHandler {
 		}
 		return true;
 	}
-	
+
 	public static void writeIntConfig(String category, String key, int value) {
 		config = new Configuration(new File(file));
 		try {
@@ -164,590 +170,370 @@ public class ConfigHandler {
 			config.save();
 		}
 	}
-	
-	public static void reloadConfig() {
-		// Config init
-		if (!hasKey("toggles", "GParty")) writeBooleanConfig("toggles", "GParty", false);
-		if (!hasKey("toggles", "Coords")) writeBooleanConfig("toggles", "Coords", false);
-		if (!hasKey("toggles", "Golden")) writeBooleanConfig("toggles", "Golden", false);
-		if (!hasKey("toggles", "SlayerCount")) writeBooleanConfig("toggles", "SlayerCount", true);
-		if (!hasKey("toggles", "RNGesusAlerts")) writeBooleanConfig("toggles", "RNGesusAlerts", true);
-		if (!hasKey("toggles", "SplitFishing")) writeBooleanConfig("toggles", "SplitFishing", true);
-		if (!hasKey("toggles", "ChatMaddox")) writeBooleanConfig("toggles", "ChatMaddox", true);
-		if (!hasKey("toggles", "SpiritBearAlerts")) writeBooleanConfig("toggles", "SpiritBearAlerts", true);
-		if (!hasKey("toggles", "AOTD")) writeBooleanConfig("toggles", "AOTD", false);
-		if (!hasKey("toggles", "LividDagger")) writeBooleanConfig("toggles", "LividDagger", false);
-		if (!hasKey("toggles", "MidasStaffMessages")) writeBooleanConfig("toggles", "MidasStaffMessages", true);
-		if (!hasKey("toggles", "ImplosionMessages")) writeBooleanConfig("toggles", "ImplosionMessages", true);
-		if (!hasKey("toggles", "HealMessages")) writeBooleanConfig("toggles", "HealMessages", true);
-		if (!hasKey("toggles", "PetColors")) writeBooleanConfig("toggles", "PetColors", false);
-		if (!hasKey("toggles", "BlockSlayer")) writeStringConfig("toggles", "BlockSlayer", "");
-		if (!hasKey("toggles", "GolemAlerts")) writeBooleanConfig("toggles", "GolemAlerts", false);
-		if (!hasKey("toggles", "ExpertiseLore")) writeBooleanConfig("toggles", "ExpertiseLore", true);
-		if (!hasKey("toggles", "Skill50Display")) writeBooleanConfig("toggles", "Skill50Display", false);
-		if (!hasKey("toggles", "OutlineText")) writeBooleanConfig("toggles", "OutlineText", false);
-		if (!hasKey("toggles", "CakeTimer")) writeBooleanConfig("toggles", "CakeTimer", false);
-		// Chat Messages
-		if (!hasKey("toggles", "SceptreMessages")) writeBooleanConfig("toggles", "SceptreMessages", true);
-		if (!hasKey("toggles", "MidasStaffMessages")) writeBooleanConfig("toggles", "MidasStaffMessages", true);
-		if (!hasKey("toggles", "ImplosionMessages")) writeBooleanConfig("toggles", "ImplosionMessages", true);
-		if (!hasKey("toggles", "HealMessages")) writeBooleanConfig("toggles", "HealMessages", true);
-		if (!hasKey("toggles", "CooldownMessages")) writeBooleanConfig("toggles","CooldownMessages",true);
-		if (!hasKey("toggles", "ManaMessages")) writeBooleanConfig("toggles","ManaMessages",true);
-		// Dungeons
-		if (!hasKey("toggles", "DungeonTimer")) writeBooleanConfig("toggles", "DungeonTimer", false);
-		if (!hasKey("toggles", "LowHealthNotify")) writeBooleanConfig("toggles", "LowHealthNotify", false);
-		if (!hasKey("toggles", "LividSolver")) writeBooleanConfig("toggles", "LividSolver", false);
-		if (!hasKey("toggles", "StopSalvageStarred")) writeBooleanConfig("toggles", "StopSalvageStarred", false);
-		if (!hasKey("toggles", "WatcherReadyMessage")) writeBooleanConfig("toggles", "WatcherReadyMessage", false);
-		if (!hasKey("toggles", "PickBlock")) writeBooleanConfig("toggles", "PickBlock", false);
-		if (!hasKey("toggles", "FlowerWeapons")) writeBooleanConfig("toggles", "FlowerWeapons", false);
-		if (!hasKey("toggles", "NotifySlayerSlain")) writeBooleanConfig("toggles", "NotifySlayerSlain", false);
-		if (!hasKey("toggles", "NecronNotifications")) writeBooleanConfig("toggles", "NecronNotifications", false);
-		if (!hasKey("toggles", "BonzoTimer")) writeBooleanConfig("toggles", "BonzoTimer", false);
-		if (!hasKey("toggles", "AutoSkillTracker")) writeBooleanConfig("toggles", "AutoSkillTracker", false);
-		// Puzzle Solvers
-		if (!hasKey("toggles", "ThreeManPuzzle")) writeBooleanConfig("toggles", "ThreeManPuzzle", false);
-		if (!hasKey("toggles", "OruoPuzzle")) writeBooleanConfig("toggles", "OruoPuzzle", false);
-		if (!hasKey("toggles", "BlazePuzzle")) writeBooleanConfig("toggles", "BlazePuzzle", false);
-		if (!hasKey("toggles", "CreeperPuzzle")) writeBooleanConfig("toggles", "CreeperPuzzle", false);
-		if (!hasKey("toggles", "WaterPuzzle")) writeBooleanConfig("toggles", "WaterPuzzle", false);
-		if (!hasKey("toggles", "TicTacToePuzzle")) writeBooleanConfig("toggles", "TicTacToePuzzle", false);
-		if (!hasKey("toggles", "StartsWithTerminal")) writeBooleanConfig("toggles", "StartsWithTerminal", false);
-		if (!hasKey("toggles", "SelectAllTerminal")) writeBooleanConfig("toggles", "SelectAllTerminal", false);
-		if (!hasKey("toggles", "ClickInOrderTerminal")) writeBooleanConfig("toggles", "ClickInOrderTerminal", false);
-		if (!hasKey("toggles", "BlockWrongTerminalClicks")) writeBooleanConfig("toggles", "BlockWrongTerminalClicks", false);
-		if (!hasKey("toggles", "IgnoreItemFrameOnSeaLanterns")) writeBooleanConfig("toggles", "IgnoreItemFrameOnSeaLanterns", false);
-		// Experiment Solvers
-		if (!hasKey("toggles", "UltraSequencer")) writeBooleanConfig("toggles", "UltraSequencer", false);
-		if (!hasKey("toggles", "Chronomatron")) writeBooleanConfig("toggles", "Chronomatron", false);
-		if (!hasKey("toggles", "Superpairs")) writeBooleanConfig("toggles", "Superpairs", false);
-		if (!hasKey("toggles", "HideTooltipsInExperimentAddons")) writeBooleanConfig("toggles", "HideTooltipsInExperimentAddons", false);
 
-		if (!hasKey("api", "APIKey")) writeStringConfig("api", "APIKey", "");
-		
-		// Wolf Loot
-		if (!hasKey("wolf", "svens")) writeIntConfig("wolf", "svens", 0);
-		if (!hasKey("wolf", "teeth")) writeIntConfig("wolf", "teeth", 0);
-		if (!hasKey("wolf", "wheel")) writeIntConfig("wolf", "wheel", 0);
-		if (!hasKey("wolf", "wheelDrops")) writeIntConfig("wolf", "wheelDrops", 0);
-		if (!hasKey("wolf", "spirit")) writeIntConfig("wolf", "spirit", 0);
-		if (!hasKey("wolf", "book")) writeIntConfig("wolf", "book", 0);
-		if (!hasKey("wolf", "egg")) writeIntConfig("wolf", "egg", 0);
-		if (!hasKey("wolf", "couture")) writeIntConfig("wolf", "couture", 0);
-		if (!hasKey("wolf", "bait")) writeIntConfig("wolf", "bait", 0);
-		if (!hasKey("wolf", "flux")) writeIntConfig("wolf", "flux", 0);
-		if (!hasKey("wolf", "timeRNG")) writeDoubleConfig("wolf", "timeRNG", -1);
-		if (!hasKey("wolf", "bossRNG")) writeIntConfig("wolf", "bossRNG", -1);
-		// Spider Loot
-		if (!hasKey("spider", "tarantulas")) writeIntConfig("spider", "tarantulas", 0);
-		if (!hasKey("spider", "web")) writeIntConfig("spider", "web", 0);
-		if (!hasKey("spider", "tap")) writeIntConfig("spider", "tap", 0);
-		if (!hasKey("spider", "tapDrops")) writeIntConfig("spider", "tapDrops", 0);
-		if (!hasKey("spider", "bite")) writeIntConfig("spider", "bite", 0);
-		if (!hasKey("spider", "catalyst")) writeIntConfig("spider", "catalyst", 0);
-		if (!hasKey("spider", "book")) writeIntConfig("spider", "book", 0);
-		if (!hasKey("spider", "swatter")) writeIntConfig("spider", "swatter", 0);
-		if (!hasKey("spider", "talisman")) writeIntConfig("spider", "talisman", 0);
-		if (!hasKey("spider", "mosquito")) writeIntConfig("spider", "mosquito", 0);
-		if (!hasKey("spider", "timeRNG")) writeDoubleConfig("spider", "timeRNG", -1);
-		if (!hasKey("spider", "bossRNG")) writeIntConfig("spider", "bossRNG", -1);
-		// Zombie Loot
-		if (!hasKey("zombie", "revs")) writeIntConfig("zombie", "revs", 0);
-		if (!hasKey("zombie", "revFlesh")) writeIntConfig("zombie", "revFlesh", 0);
-		if (!hasKey("zombie", "foulFlesh")) writeIntConfig("zombie", "foulFlesh", 0);
-		if (!hasKey("zombie", "foulFleshDrops")) writeIntConfig("zombie", "foulFleshDrops", 0);
-		if (!hasKey("zombie", "pestilence")) writeIntConfig("zombie", "pestilence", 0);
-		if (!hasKey("zombie", "undeadCatalyst")) writeIntConfig("zombie", "undeadCatalyst", 0);
-		if (!hasKey("zombie", "book")) writeIntConfig("zombie", "book", 0);
-		if (!hasKey("zombie", "beheaded")) writeIntConfig("zombie", "beheaded", 0);
-		if (!hasKey("zombie", "revCatalyst")) writeIntConfig("zombie", "revCatalyst", 0);
-		if (!hasKey("zombie", "snake")) writeIntConfig("zombie", "snake", 0);
-		if (!hasKey("zombie", "scythe")) writeIntConfig("zombie", "scythe", 0);
-		if (!hasKey("zombie", "timeRNG")) writeDoubleConfig("zombie", "timeRNG", -1);
-		if (!hasKey("zombie", "bossRNG")) writeIntConfig("zombie", "bossRNG", -1);
-		
-		// Fishing
-		if (!hasKey("fishing", "seaCreature")) writeIntConfig("fishing", "seaCreature", 0);
-		if (!hasKey("fishing", "goodCatch")) writeIntConfig("fishing", "goodCatch", 0);
-		if (!hasKey("fishing", "greatCatch")) writeIntConfig("fishing", "greatCatch", 0);
-		if (!hasKey("fishing", "squid")) writeIntConfig("fishing", "squid", 0);
-		if (!hasKey("fishing", "seaWalker")) writeIntConfig("fishing", "seaWalker", 0);
-		if (!hasKey("fishing", "nightSquid")) writeIntConfig("fishing", "nightSquid", 0);
-		if (!hasKey("fishing", "seaGuardian")) writeIntConfig("fishing", "seaGuardian", 0);
-		if (!hasKey("fishing", "seaWitch")) writeIntConfig("fishing", "seaWitch", 0);
-		if (!hasKey("fishing", "seaArcher")) writeIntConfig("fishing", "seaArcher", 0);
-		if (!hasKey("fishing", "monsterOfDeep")) writeIntConfig("fishing", "monsterOfDeep", 0);
-		if (!hasKey("fishing", "catfish")) writeIntConfig("fishing", "catfish", 0);
-		if (!hasKey("fishing", "carrotKing")) writeIntConfig("fishing", "carrotKing", 0);
-		if (!hasKey("fishing", "seaLeech")) writeIntConfig("fishing", "seaLeech", 0);
-		if (!hasKey("fishing", "guardianDefender")) writeIntConfig("fishing", "guardianDefender", 0);
-		if (!hasKey("fishing", "deepSeaProtector")) writeIntConfig("fishing", "deepSeaProtector", 0);
-		if (!hasKey("fishing", "hydra")) writeIntConfig("fishing", "hydra", 0);
-		if (!hasKey("fishing", "seaEmperor")) writeIntConfig("fishing", "seaEmperor", 0);
-		if (!hasKey("fishing", "empTime")) writeDoubleConfig("fishing", "empTime", -1);
-		if (!hasKey("fishing", "empSC")) writeIntConfig("fishing", "empSC", -1);
-		if (!hasKey("fishing", "milestone")) writeIntConfig("fishing", "milestone", 0);
-		// Fishing Winter
-		if (!hasKey("fishing", "frozenSteve")) writeIntConfig("fishing", "frozenSteve", 0);
-		if (!hasKey("fishing", "snowman")) writeIntConfig("fishing", "snowman", 0);
-		if (!hasKey("fishing", "grinch")) writeIntConfig("fishing", "grinch", 0);
-		if (!hasKey("fishing", "yeti")) writeIntConfig("fishing", "yeti", 0);
-		if (!hasKey("fishing", "yetiTime")) writeDoubleConfig("fishing", "yetiTime", -1);
-		if (!hasKey("fishing", "yetiSC")) writeIntConfig("fishing", "yetiSC", -1);
-		// Fishing Festival
-		if (!hasKey("fishing", "nurseShark")) writeIntConfig("fishing", "nurseShark", 0);
-		if (!hasKey("fishing", "blueShark")) writeIntConfig("fishing", "blueShark", 0);
-		if (!hasKey("fishing", "tigerShark")) writeIntConfig("fishing", "tigerShark", 0);
-		if (!hasKey("fishing", "greatWhiteShark")) writeIntConfig("fishing", "greatWhiteShark", 0);
-		// Spooky Fishing
-		if (!hasKey("fishing", "scarecrow")) writeIntConfig("fishing", "scarecrow", 0);
-		if (!hasKey("fishing", "nightmare")) writeIntConfig("fishing", "nightmare", 0);
-		if (!hasKey("fishing", "werewolf")) writeIntConfig("fishing", "werewolf", 0);
-		if (!hasKey("fishing", "phantomFisher")) writeIntConfig("fishing", "phantomFisher", 0);
-		if (!hasKey("fishing", "grimReaper")) writeIntConfig("fishing", "grimReaper", 0);
-		
-		// Mythological
-		if (!hasKey("mythological", "coins")) writeDoubleConfig("mythological", "coins", 0);
-		if (!hasKey("mythological", "griffinFeather")) writeIntConfig("mythological", "griffinFeather", 0);
-		if (!hasKey("mythological", "crownOfGreed")) writeIntConfig("mythological", "crownOfGreed", 0);
-		if (!hasKey("mythological", "washedUpSouvenir")) writeIntConfig("mythological", "washedUpSouvenir", 0);
-		if (!hasKey("mythological", "minosHunter")) writeIntConfig("mythological", "minosHunter", 0);
-		if (!hasKey("mythological", "siameseLynx")) writeIntConfig("mythological", "siameseLynx", 0);
-		if (!hasKey("mythological", "minotaur")) writeIntConfig("mythological", "minotaur", 0);
-		if (!hasKey("mythological", "gaiaConstruct")) writeIntConfig("mythological", "gaiaConstruct", 0);
-		if (!hasKey("mythological", "minosChampion")) writeIntConfig("mythological", "minosChampion", 0);
-		if (!hasKey("mythological", "minosInquisitor")) writeIntConfig("mythological", "minosInquisitor", 0);
-		
-		// Dungeons
-		if (!hasKey("catacombs", "recombobulator")) writeIntConfig("catacombs", "recombobulator", 0);
-		if (!hasKey("catacombs", "fumingBooks")) writeIntConfig("catacombs", "fumingBooks", 0);
-		// F1
-		if (!hasKey("catacombs", "bonzoStaff")) writeIntConfig("catacombs", "bonzoStaff", 0);
-		if (!hasKey("catacombs", "floorOneCoins")) writeDoubleConfig("catacombs", "floorOneCoins", 0);
-		if (!hasKey("catacombs", "floorOneTime")) writeDoubleConfig("catacombs", "floorOneTime", 0);
-		// F2
-		if (!hasKey("catacombs", "scarfStudies")) writeIntConfig("catacombs", "scarfStudies", 0);
-		if (!hasKey("catacombs", "floorTwoCoins")) writeDoubleConfig("catacombs", "floorTwoCoins", 0);
-		if (!hasKey("catacombs", "floorTwoTime")) writeDoubleConfig("catacombs", "floorTwoTime", 0);
-		// F3
-		if (!hasKey("catacombs", "adaptiveHelm")) writeIntConfig("catacombs", "adaptiveHelm", 0);
-		if (!hasKey("catacombs", "adaptiveChest")) writeIntConfig("catacombs", "adaptiveChest", 0);
-		if (!hasKey("catacombs", "adaptiveLegging")) writeIntConfig("catacombs", "adaptiveLegging", 0);
-		if (!hasKey("catacombs", "adaptiveBoot")) writeIntConfig("catacombs", "adaptiveBoot", 0);
-		if (!hasKey("catacombs", "adaptiveSword")) writeIntConfig("catacombs", "adaptiveSword", 0);
-		if (!hasKey("catacombs", "floorThreeCoins")) writeDoubleConfig("catacombs", "floorThreeCoins", 0);
-		if (!hasKey("catacombs", "floorThreeTime")) writeDoubleConfig("catacombs", "floorThreeTime", 0);
-		// F4
-		if (!hasKey("catacombs", "spiritWing")) writeIntConfig("catacombs", "spiritWing", 0);
-		if (!hasKey("catacombs", "spiritBone")) writeIntConfig("catacombs", "spiritBone", 0);
-		if (!hasKey("catacombs", "spiritBoot")) writeIntConfig("catacombs", "spiritBoot", 0);
-		if (!hasKey("catacombs", "spiritSword")) writeIntConfig("catacombs", "spiritSword", 0);
-		if (!hasKey("catacombs", "spiritBow")) writeIntConfig("catacombs", "spiritBow", 0);
-		if (!hasKey("catacombs", "spiritPetEpic")) writeIntConfig("catacombs", "spiritPetEpic", 0);
-		if (!hasKey("catacombs", "spiritPetLeg")) writeIntConfig("catacombs", "spiritPetLeg", 0);
-		if (!hasKey("catacombs", "floorFourCoins")) writeDoubleConfig("catacombs", "floorFourCoins", 0);
-		if (!hasKey("catacombs", "floorFourTime")) writeDoubleConfig("catacombs", "floorFourTime", 0);
-		// F5
-		if (!hasKey("catacombs", "warpedStone")) writeIntConfig("catacombs", "warpedStone", 0);
-		if (!hasKey("catacombs", "shadowAssassinHelm")) writeIntConfig("catacombs", "shadowAssassinHelm", 0);
-		if (!hasKey("catacombs", "shadowAssassinChest")) writeIntConfig("catacombs", "shadowAssassinChest", 0);
-		if (!hasKey("catacombs", "shadowAssassinLegging")) writeIntConfig("catacombs", "shadowAssassinLegging", 0);
-		if (!hasKey("catacombs", "shadowAssassinBoot")) writeIntConfig("catacombs", "shadowAssassinBoot", 0);
-		if (!hasKey("catacombs", "lastBreath")) writeIntConfig("catacombs", "lastBreath", 0);
-		if (!hasKey("catacombs", "lividDagger")) writeIntConfig("catacombs", "lividDagger", 0);
-		if (!hasKey("catacombs", "shadowFury")) writeIntConfig("catacombs", "shadowFury", 0);
-		if (!hasKey("catacombs", "floorFiveCoins")) writeDoubleConfig("catacombs", "floorFiveCoins", 0);
-		if (!hasKey("catacombs", "floorFiveTime")) writeDoubleConfig("catacombs", "floorFiveTime", 0);
-		// F6
-		if (!hasKey("catacombs", "ancientRose")) writeIntConfig("catacombs", "ancientRose", 0);
-		if (!hasKey("catacombs", "precursorEye")) writeIntConfig("catacombs", "precursorEye", 0);
-		if (!hasKey("catacombs", "giantsSword")) writeIntConfig("catacombs", "giantsSword", 0);
-		if (!hasKey("catacombs", "necroLordHelm")) writeIntConfig("catacombs", "necroHelm", 0);
-		if (!hasKey("catacombs", "necroLordChest")) writeIntConfig("catacombs", "necroChest", 0);
-		if (!hasKey("catacombs", "necroLordLegging")) writeIntConfig("catacombs", "necroLegging", 0);
-		if (!hasKey("catacombs", "necroLordBoot")) writeIntConfig("catacombs", "necroBoot", 0);
-		if (!hasKey("catacombs", "necroSword")) writeIntConfig("catacombs", "necroSword", 0);
-		if (!hasKey("catacombs", "floorSixCoins")) writeDoubleConfig("catacombs", "floorSixCoins", 0);
-		if (!hasKey("catacombs", "floorSixTime")) writeDoubleConfig("catacombs", "floorSixTime", 0);
-		// F7
-		if (!hasKey("catacombs", "witherBlood")) writeIntConfig("catacombs", "witherBlood", 0);
-		if (!hasKey("catacombs", "witherCloak")) writeIntConfig("catacombs", "witherCloak", 0);
-		if (!hasKey("catacombs", "implosion")) writeIntConfig("catacombs", "implosion", 0);
-		if (!hasKey("catacombs", "witherShield")) writeIntConfig("catacombs", "witherShield", 0);
-		if (!hasKey("catacombs", "shadowWarp")) writeIntConfig("catacombs", "shadowWarp", 0);
-		if (!hasKey("catacombs", "necronsHandle")) writeIntConfig("catacombs", "necronsHandle", 0);
-		if (!hasKey("catacombs", "autoRecomb")) writeIntConfig("catacombs", "autoRecomb", 0);
-		if (!hasKey("catacombs", "witherHelm")) writeIntConfig("catacombs", "witherHelm", 0);
-		if (!hasKey("catacombs", "witherChest")) writeIntConfig("catacombs", "witherChest", 0);
-		if (!hasKey("catacombs", "witherLegging")) writeIntConfig("catacombs", "witherLegging", 0);
-		if (!hasKey("catacombs", "witherBoot")) writeIntConfig("catacombs", "witherBoot", 0);
-		if (!hasKey("catacombs", "floorSevenCoins")) writeDoubleConfig("catacombs", "floorSevenCoins", 0);
-		if (!hasKey("catacombs", "floorSevenTime")) writeDoubleConfig("catacombs", "floorSevenTime", 0);
-		
-		if (!hasKey("misc", "display")) writeStringConfig("misc", "display", "off");
-		if (!hasKey("misc", "autoDisplay")) writeBooleanConfig("misc", "autoDisplay", false);
-		if (!hasKey("misc", "skill50Time")) writeIntConfig("misc", "skill50Time", 3);
-		if (!hasKey("misc", "cakeTime")) writeDoubleConfig("misc", "cakeTime", 0);
-		if (!hasKey("misc", "showSkillTracker")) writeBooleanConfig("misc", "showSkillTracker", false);
-		if (!hasKey("misc", "firstLaunch")) writeBooleanConfig("misc", "firstLaunch", true);
+	public static int initInt(String category, String key, int defaultValue) {
+		if (!hasKey(category, key)) {
+			writeIntConfig(category, key, defaultValue);
+			return defaultValue;
+		} else {
+			return getInt(category, key);
+		}
+	}
 
-		ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft());
-		int height = scaled.getScaledHeight();
-		if (!hasKey("locations", "coordsX")) writeIntConfig("locations", "coordsX", 5);
-		if (!hasKey("locations", "coordsY")) writeIntConfig("locations", "coordsY", height - 25);
-		if (!hasKey("locations", "displayX")) writeIntConfig("locations", "displayX", 80);
-		if (!hasKey("locations", "displayY")) writeIntConfig("locations", "displayY", 5);
-		if (!hasKey("locations", "dungeonTimerX")) writeIntConfig("locations", "dungeonTimerX", 5);
-		if (!hasKey("locations", "dungeonTimerY")) writeIntConfig("locations", "dungeonTimerY", 5);
-		if (!hasKey("locations", "skill50X")) writeIntConfig("locations", "skill50X", 40);
-		if (!hasKey("locations", "skill50Y")) writeIntConfig("locations", "skill50Y", 10);
-		if (!hasKey("locations", "lividHpX")) writeIntConfig("locations", "lividHpX", 40);
-		if (!hasKey("locations", "lividHpY")) writeIntConfig("locations", "lividHpY", 20);
-		if (!hasKey("locations", "cakeTimerX")) writeIntConfig("locations", "cakeTimerX", 40);
-		if (!hasKey("locations", "cakeTimerY")) writeIntConfig("locations", "cakeTimerY", 30);
-		if (!hasKey("locations", "skillTrackerX")) writeIntConfig("locations", "skillTrackerX", 40);
-		if (!hasKey("locations", "skillTrackerY")) writeIntConfig("locations", "skillTrackerY", 50);
-		if (!hasKey("locations", "waterAnswerX")) writeIntConfig("locations", "waterAnswerX", 100);
-		if (!hasKey("locations", "waterAnswerY")) writeIntConfig("locations", "waterAnswerY", 100);
-		if (!hasKey("locations", "bonzoTimerX")) writeIntConfig("locations", "bonzoTimerX", 40);
-		if (!hasKey("locations", "bonzoTimerY")) writeIntConfig("locations", "bonzoTimerY", 80);
-		if (!hasKey("scales", "coordsScale")) writeDoubleConfig("scales", "coordsScale", 1);
-		if (!hasKey("scales", "displayScale")) writeDoubleConfig("scales", "displayScale", 1);
-		if (!hasKey("scales", "dungeonTimerScale")) writeDoubleConfig("scales", "dungeonTimerScale", 1);
-		if (!hasKey("scales", "skill50Scale")) writeDoubleConfig("scales", "skill50Scale", 1);
-		if (!hasKey("scales", "lividHpScale")) writeDoubleConfig("scales", "lividHpScale", 1);
-		if (!hasKey("scales", "cakeTimerScale")) writeDoubleConfig("scales", "cakeTimerScale", 1);
-		if (!hasKey("scales", "skillTrackerScale")) writeDoubleConfig("scales", "skillTrackerScale", 1);
-		if (!hasKey("scales", "waterAnswerScale")) writeDoubleConfig("scales", "waterAnswerScale", 1);
-		if (!hasKey("scales", "bonzoTimerScale")) writeDoubleConfig("scales", "bonzoTimerScale", 1);
+	public static double initDouble(String category, String key, double defaultValue) {
+		if (!hasKey(category, key)) {
+			writeDoubleConfig(category, key, defaultValue);
+			return defaultValue;
+		} else {
+			return getDouble(category, key);
+		}
+	}
 
-		if (!hasKey("colors", "main")) writeStringConfig("colors", "main", EnumChatFormatting.GREEN.toString());
-		if (!hasKey("colors", "secondary")) writeStringConfig("colors", "secondary", EnumChatFormatting.DARK_GREEN.toString());
-		if (!hasKey("colors", "delimiter")) writeStringConfig("colors", "delimiter", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.STRIKETHROUGH.toString());
-		if (!hasKey("colors", "error")) writeStringConfig("colors", "error", EnumChatFormatting.RED.toString());
-		if (!hasKey("colors", "type")) writeStringConfig("colors", "type", EnumChatFormatting.GREEN.toString());
-		if (!hasKey("colors", "value")) writeStringConfig("colors", "value", EnumChatFormatting.DARK_GREEN.toString());
-		if (!hasKey("colors", "skillAverage")) writeStringConfig("colors", "skillAverage", EnumChatFormatting.GOLD.toString());
-		if (!hasKey("colors", "answer")) writeStringConfig("colors", "answer", EnumChatFormatting.DARK_GREEN.toString());
-		if (!hasKey("colors", "skill50Display")) writeStringConfig("colors", "skill50Display", EnumChatFormatting.AQUA.toString());
-		if (!hasKey("colors", "coordsDisplay")) writeStringConfig("colors", "coordsDisplay", EnumChatFormatting.WHITE.toString());
-		if (!hasKey("colors", "cakeDisplay")) writeStringConfig("colors", "cakeDisplay", EnumChatFormatting.GOLD.toString());
-		if (!hasKey("colors", "skillTracker")) writeStringConfig("colors", "skillTracker", EnumChatFormatting.AQUA.toString());
-		if (!hasKey("colors", "triviaWrongAnswer")) writeStringConfig("colors", "triviaWrongAnswer", EnumChatFormatting.RED.toString());
-		if (!hasKey("colors", "bonzoDisplay")) writeStringConfig("colors", "bonzoDisplay", EnumChatFormatting.RED.toString());
-		if (!hasKey("colors", "blazeLowest")) writeIntConfig("colors", "blazeLowest", 0xFF0000);
-		if (!hasKey("colors", "blazeHighest")) writeIntConfig("colors", "blazeHighest", 0x40FF40);
-		if (!hasKey("colors", "pet1To9")) writeIntConfig("colors", "pet1To9", 0x999999); // Gray
-		if (!hasKey("colors", "pet10To19")) writeIntConfig("colors", "pet10To19", 0xD62440); // Red
-		if (!hasKey("colors", "pet20To29")) writeIntConfig("colors", "pet20To29", 0xEF5230); // Orange
-		if (!hasKey("colors", "pet30To39")) writeIntConfig("colors", "pet30To39", 0xFFC400); // Yellow
-		if (!hasKey("colors", "pet40To49")) writeIntConfig("colors", "pet40To49", 0x0EAC35); // Green
-		if (!hasKey("colors", "pet50To59")) writeIntConfig("colors", "pet50To59", 0x008AD8); // Light Blue
-		if (!hasKey("colors", "pet60To69")) writeIntConfig("colors", "pet60To69", 0x7E4FC6); // Purple
-		if (!hasKey("colors", "pet70To79")) writeIntConfig("colors", "pet70To79", 0xD64FC8); // Pink
-		if (!hasKey("colors", "pet80To89")) writeIntConfig("colors", "pet80To89", 0x5C1F35); // idk weird magenta
-		if (!hasKey("colors", "pet90To99")) writeIntConfig("colors", "pet90To99", 0x9E794E); // Brown
-		if (!hasKey("colors", "pet100")) writeIntConfig("colors", "pet100", 0xF2D249); // Gold
-		if (!hasKey("colors", "ultrasequencerNext")) writeIntConfig("colors", "ultrasequencerNext", 0x40FF40);
-		if (!hasKey("colors", "ultrasequencerNextToNext")) writeIntConfig("colors", "ultrasequencerNextToNext", 0x40DAE6);
-		if (!hasKey("colors", "chronomatronNext")) writeIntConfig("colors", "chronomatronNext", 0x40FF40);
-		if (!hasKey("colors", "chronomatronNextToNext")) writeIntConfig("colors", "chronomatronNextToNext", 0x40DAE6);
-		if (!hasKey("colors", "clickInOrderNext")) writeIntConfig("colors", "clickInOrderNext", 0xFF00DD);
-		if (!hasKey("colors", "clickInOrderNextToNext")) writeIntConfig("colors", "clickInOrderNextToNext", 0x0BEFE7);
+	public static String initString(String category, String key, String defaultValue) {
+		if (!hasKey(category, key)) {
+			writeStringConfig(category, key, defaultValue);
+			return defaultValue;
+		} else {
+			return getString(category, key);
+		}
+	}
 
-		// Commands
-		if (!hasKey("commands", "reparty")) writeBooleanConfig("commands", "reparty", false);
-		
-		ToggleCommand.gpartyToggled = getBoolean("toggles", "GParty");
-		ToggleCommand.coordsToggled = getBoolean("toggles", "Coords");
-		ToggleCommand.goldenToggled = getBoolean("toggles", "Golden");
-		ToggleCommand.slayerCountTotal = getBoolean("toggles", "SlayerCount");
-		ToggleCommand.rngesusAlerts = getBoolean("toggles", "RNGesusAlerts");
-		ToggleCommand.splitFishing = getBoolean("toggles", "SplitFishing");
-		ToggleCommand.chatMaddoxToggled = getBoolean("toggles", "ChatMaddox");
-		ToggleCommand.spiritBearAlerts = getBoolean("toggles", "SpiritBearAlerts");
-		ToggleCommand.aotdToggled = getBoolean("toggles", "AOTD");
-		ToggleCommand.lividDaggerToggled = getBoolean("toggles", "LividDagger");
-		ToggleCommand.petColoursToggled = getBoolean("toggles", "PetColors");
-		ToggleCommand.golemAlertToggled = getBoolean("toggles", "GolemAlerts");
-		ToggleCommand.expertiseLoreToggled = getBoolean("toggles", "ExpertiseLore");
-		ToggleCommand.skill50DisplayToggled = getBoolean("toggles", "Skill50Display");
-		ToggleCommand.outlineTextToggled = getBoolean("toggles", "OutlineText");
-		ToggleCommand.cakeTimerToggled = getBoolean("toggles", "CakeTimer");
+	public static boolean initBoolean(String category, String key, boolean defaultValue) {
+		if (!hasKey(category, key)) {
+			writeBooleanConfig(category, key, defaultValue);
+			return defaultValue;
+		} else {
+			return getBoolean(category, key);
+		}
+	}
+	
+	public static void reloadConfig() {
+		// Toggles
+		ToggleCommand.gpartyToggled = initBoolean("toggles", "GParty", false);
+		ToggleCommand.coordsToggled = initBoolean("toggles", "Coords", false);
+		ToggleCommand.goldenToggled = initBoolean("toggles", "Golden", false);
+		ToggleCommand.slayerCountTotal = initBoolean("toggles", "SlayerCount", true);
+		ToggleCommand.rngesusAlerts = initBoolean("toggles", "RNGesusAlerts", false);
+		ToggleCommand.ghostDisplay = initBoolean("toggles", "GhostDisplay", true);
+		ToggleCommand.dungeonTimerToggled = initBoolean("toggles", "GhostTimer", false);
+		ToggleCommand.splitFishing = initBoolean("toggles", "SplitFishing", true);
+		ToggleCommand.chatMaddoxToggled = initBoolean("toggles", "ChatMaddox", false);
+		ToggleCommand.spiritBearAlerts = initBoolean("toggles", "SpiritBearAlerts", false);
+		ToggleCommand.petColoursToggled = initBoolean("toggles", "PetColors", false);
+		ToggleCommand.golemAlertToggled = initBoolean("toggles", "GolemAlerts", false);
+		ToggleCommand.expertiseLoreToggled = initBoolean("toggles", "ExpertiseLore", false);
+		ToggleCommand.skill50DisplayToggled = initBoolean("toggles", "Skill50Display", false);
+		ToggleCommand.outlineTextToggled = initBoolean("toggles", "OutlineText", false);
+		ToggleCommand.cakeTimerToggled = initBoolean("toggles", "CakeTimer", false);
+		ToggleCommand.melodyTooltips = initBoolean("toggles", "MelodyTooltips", false);
+		ToggleCommand.highlightSlayers = initBoolean("toggles", "HighlightSlayers", false);
+		ToggleCommand.highlightArachne = initBoolean("toggles", "HighlightArachne", false);
 		// Chat Messages
-		ToggleCommand.sceptreMessages = getBoolean("toggles", "SceptreMessages");
-		ToggleCommand.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages");
-		ToggleCommand.implosionMessages = getBoolean("toggles", "ImplosionMessages");
-		ToggleCommand.healMessages = getBoolean("toggles", "HealMessages");
-		ToggleCommand.cooldownMessages = getBoolean("toggles", "CooldownMessages");
-		ToggleCommand.manaMessages = getBoolean("toggles", "ManaMessages");
-		//Dungeons
-		ToggleCommand.dungeonTimerToggled = getBoolean("toggles", "DungeonTimer");
-		ToggleCommand.lowHealthNotifyToggled = getBoolean("toggles", "LowHealthNotify");
-		ToggleCommand.lividSolverToggled = getBoolean("toggles", "LividSolver");
-		ToggleCommand.stopSalvageStarredToggled = getBoolean("toggles", "StopSalvageStarred");
-		ToggleCommand.watcherReadyToggled = getBoolean("toggles", "WatcherReadyMessage");
-		ToggleCommand.notifySlayerSlainToggled = getBoolean("toggles", "NotifySlayerSlain");
-		ToggleCommand.necronNotificationsToggled = getBoolean("toggles", "NecronNotifications");
-		ToggleCommand.bonzoTimerToggled = getBoolean("toggles", "BonzoTimer");
-		ToggleCommand.swapToPickBlockToggled = getBoolean("toggles", "PickBlock");
-		ToggleCommand.flowerWeaponsToggled = getBoolean("toggles", "FlowerWeapons");
-		ToggleCommand.autoSkillTrackerToggled =  getBoolean("toggles", "AutoSkillTracker");
+		ToggleCommand.sceptreMessages = initBoolean("toggles", "SceptreMessages", true);
+		ToggleCommand.midasStaffMessages = initBoolean("toggles", "MidasStaffMessages", true);
+		ToggleCommand.implosionMessages = initBoolean("toggles", "ImplosionMessages", true);
+		ToggleCommand.healMessages = initBoolean("toggles", "HealMessages", true);
+		ToggleCommand.cooldownMessages = initBoolean("toggles", "CooldownMessages", true);
+		ToggleCommand.manaMessages = initBoolean("toggles", "ManaMessages", true);
+		ToggleCommand.killComboMessages = initBoolean("toggles", "KillComboMessages", true);
+		// Dungeons
+		ToggleCommand.dungeonTimerToggled = initBoolean("toggles", "DungeonTimer", false);
+		ToggleCommand.lowHealthNotifyToggled = initBoolean("toggles", "LowHealthNotify", false);
+		ToggleCommand.lividSolverToggled = initBoolean("toggles", "LividSolver", false);
+		ToggleCommand.stopSalvageStarredToggled = initBoolean("toggles", "StopSalvageStarred", false);
+		ToggleCommand.watcherReadyToggled = initBoolean("toggles", "WatcherReadyMessage", false);
+		ToggleCommand.notifySlayerSlainToggled = initBoolean("toggles", "NotifySlayerSlain", false);
+		ToggleCommand.necronNotificationsToggled = initBoolean("toggles", "NecronNotifications", false);
+		ToggleCommand.bonzoTimerToggled = initBoolean("toggles", "BonzoTimer", false);
+		ToggleCommand.swapToPickBlockToggled = initBoolean("toggles", "PickBlock", false);
+		ToggleCommand.autoSkillTrackerToggled =  initBoolean("toggles", "AutoSkillTracker", false);
 		// Puzzle Solvers
-		ToggleCommand.threeManToggled = getBoolean("toggles", "ThreeManPuzzle");
-		ToggleCommand.oruoToggled = getBoolean("toggles", "OruoPuzzle");
-		ToggleCommand.blazeToggled = getBoolean("toggles", "BlazePuzzle");
-		ToggleCommand.creeperToggled = getBoolean("toggles", "CreeperPuzzle");
-		ToggleCommand.waterToggled = getBoolean("toggles", "WaterPuzzle");
-		ToggleCommand.ticTacToeToggled = getBoolean("toggles", "TicTacToePuzzle");
-		ToggleCommand.startsWithToggled = getBoolean("toggles", "StartsWithTerminal");
-		ToggleCommand.selectAllToggled = getBoolean("toggles", "SelectAllTerminal");
-		ToggleCommand.clickInOrderToggled = getBoolean("toggles", "ClickInOrderTerminal");
-		ToggleCommand.blockWrongTerminalClicksToggled = getBoolean("toggles", "BlockWrongTerminalClicks");
-		ToggleCommand.itemFrameOnSeaLanternsToggled = getBoolean("toggles", "IgnoreItemFrameOnSeaLanterns");
+		ToggleCommand.threeManToggled = initBoolean("toggles", "ThreeManPuzzle", false);
+		ToggleCommand.oruoToggled = initBoolean("toggles", "OruoPuzzle", false);
+		ToggleCommand.blazeToggled = initBoolean("toggles", "BlazePuzzle", false);
+		ToggleCommand.creeperToggled = initBoolean("toggles", "CreeperPuzzle", false);
+		ToggleCommand.waterToggled = initBoolean("toggles", "WaterPuzzle", false);
+		ToggleCommand.ticTacToeToggled = initBoolean("toggles", "TicTacToePuzzle", false);
+		ToggleCommand.boulderToggled = initBoolean("toggles", "BoulderPuzzle", false);
+		ToggleCommand.silverfishToggled = initBoolean("toggles", "SilverfishPuzzle", false);
+		ToggleCommand.iceWalkToggled = initBoolean("toggles", "IceWalkPuzzle", false);
+		ToggleCommand.startsWithToggled = initBoolean("toggles", "StartsWithTerminal", false);
+		ToggleCommand.selectAllToggled = initBoolean("toggles", "SelectAllTerminal", false);
+		ToggleCommand.clickInOrderToggled = initBoolean("toggles", "ClickInOrderTerminal", false);
 		// Experiment Solvers
-		ToggleCommand.ultrasequencerToggled = getBoolean("toggles", "UltraSequencer");
-		ToggleCommand.chronomatronToggled = getBoolean("toggles", "Chronomatron");
-		ToggleCommand.superpairsToggled = getBoolean("toggles", "Superpairs");
-		ToggleCommand.hideTooltipsInExperimentAddonsToggled = getBoolean("toggles", "HideTooltipsInExperimentAddons");
+		ToggleCommand.ultrasequencerToggled = initBoolean("toggles", "UltraSequencer", false);
+		ToggleCommand.chronomatronToggled = initBoolean("toggles", "Chronomatron", false);
+		ToggleCommand.superpairsToggled = initBoolean("toggles", "Superpairs", false);
+		ToggleCommand.hideTooltipsInExperimentAddonsToggled = initBoolean("toggles", "HideTooltipsInExperimentAddons", false);
+		// Custom Music
+		ToggleCommand.dungeonBossMusic = initBoolean("toggles", "DungeonBossMusic", false);
+		ToggleCommand.bloodRoomMusic = initBoolean("toggles", "BloodRoomMusic", false);
+		ToggleCommand.dungeonMusic = initBoolean("toggles", "DungeonMusic", false);
+		// Music Volume
+		CustomMusic.dungeonbossVolume = initInt("music", "DungeonBossVolume", 50);
+		CustomMusic.bloodroomVolume = initInt("music", "BloodRoomVolume", 50);
+		CustomMusic.dungeonVolume = initInt("music", "DungeonVolume", 50);
 
-		String onlySlayer = getString("toggles", "BlockSlayer");
-		if (!onlySlayer.equals("")) {
-			BlockSlayerCommand.onlySlayerName = onlySlayer.substring(0, onlySlayer.lastIndexOf(" "));
-			BlockSlayerCommand.onlySlayerNumber = onlySlayer.substring(onlySlayer.lastIndexOf(" ") + 1);
-		}
+		// API
+		if (!hasKey("api", "APIKey")) writeStringConfig("api", "APIKey", "");
 		
 		// Wolf
-		LootCommand.wolfSvens = getInt("wolf", "svens");
-		LootCommand.wolfTeeth = getInt("wolf", "teeth");
-		LootCommand.wolfWheels = getInt("wolf", "wheel");
-		LootCommand.wolfWheelsDrops = getInt("wolf", "wheelDrops");
-		LootCommand.wolfSpirits = getInt("wolf", "spirit");
-		LootCommand.wolfBooks = getInt("wolf", "book");
-		LootCommand.wolfEggs = getInt("wolf", "egg");
-		LootCommand.wolfCoutures = getInt("wolf", "couture");
-		LootCommand.wolfBaits = getInt("wolf", "bait");
-		LootCommand.wolfFluxes = getInt("wolf", "flux");
-		LootCommand.wolfTime = getDouble("wolf", "timeRNG");
-		LootCommand.wolfBosses = getInt("wolf", "bossRNG");
+		LootTracker.wolfSvens = initInt("wolf", "svens", 0);
+		LootTracker.wolfTeeth = initInt("wolf", "teeth", 0);
+		LootTracker.wolfWheels = initInt("wolf", "wheel", 0);
+		LootTracker.wolfWheelsDrops = initInt("wolf", "wheelDrops", 0);
+		LootTracker.wolfSpirits = initInt("wolf", "spirit", 0);
+		LootTracker.wolfBooks = initInt("wolf", "book", 0);
+		LootTracker.wolfEggs = initInt("wolf", "egg", 0);
+		LootTracker.wolfCoutures = initInt("wolf", "couture", 0);
+		LootTracker.wolfBaits = initInt("wolf", "bait", 0);
+		LootTracker.wolfFluxes = initInt("wolf", "flux", 0);
+		LootTracker.wolfTime = initDouble("wolf", "timeRNG", -1);
+		LootTracker.wolfBosses = initInt("wolf", "bossRNG", -1);
 		// Spider
-		LootCommand.spiderTarantulas = getInt("spider", "tarantulas");
-		LootCommand.spiderWebs = getInt("spider", "web");
-		LootCommand.spiderTAP = getInt("spider", "tap");
-		LootCommand.spiderTAPDrops = getInt("spider", "tapDrops");
-		LootCommand.spiderBites = getInt("spider", "bite");
-		LootCommand.spiderCatalysts = getInt("spider", "catalyst");
-		LootCommand.spiderBooks = getInt("spider", "book");
-		LootCommand.spiderSwatters = getInt("spider", "swatter");
-		LootCommand.spiderTalismans = getInt("spider", "talisman");
-		LootCommand.spiderMosquitos = getInt("spider", "mosquito");
-		LootCommand.spiderTime = getDouble("spider", "timeRNG");
-		LootCommand.spiderBosses = getInt("spider", "bossRNG");
+		LootTracker.spiderTarantulas = initInt("spider", "tarantulas", 0);
+		LootTracker.spiderWebs = initInt("spider", "web", 0);
+		LootTracker.spiderTAP = initInt("spider", "tap", 0);
+		LootTracker.spiderTAPDrops = initInt("spider", "tapDrops", 0);
+		LootTracker.spiderBites = initInt("spider", "bite", 0);
+		LootTracker.spiderCatalysts = initInt("spider", "catalyst", 0);
+		LootTracker.spiderBooks = initInt("spider", "book", 0);
+		LootTracker.spiderSwatters = initInt("spider", "swatter", 0);
+		LootTracker.spiderTalismans = initInt("spider", "talisman", 0);
+		LootTracker.spiderMosquitos = initInt("spider", "mosquito", 0);
+		LootTracker.spiderTime = initDouble("spider", "timeRNG", -1);
+		LootTracker.spiderBosses = initInt("spider", "bossRNG", -1);
 		// Zombie
-		LootCommand.zombieRevs = getInt("zombie", "revs");
-		LootCommand.zombieRevFlesh = getInt("zombie", "revFlesh");
-		LootCommand.zombieFoulFlesh = getInt("zombie", "foulFlesh");
-		LootCommand.zombieFoulFleshDrops = getInt("zombie", "foulFleshDrops");
-		LootCommand.zombiePestilences = getInt("zombie", "pestilence");
-		LootCommand.zombieUndeadCatas = getInt("zombie", "undeadCatalyst");
-		LootCommand.zombieBooks = getInt("zombie", "book");
-		LootCommand.zombieBeheadeds = getInt("zombie", "beheaded");
-		LootCommand.zombieRevCatas = getInt("zombie", "revCatalyst");
-		LootCommand.zombieSnakes = getInt("zombie", "snake");
-		LootCommand.zombieScythes = getInt("zombie", "scythe");
-		LootCommand.zombieTime = getDouble("zombie", "timeRNG");
-		LootCommand.zombieBosses = getInt("zombie", "bossRNG");
+		LootTracker.zombieRevs = initInt("zombie", "revs", 0);
+		LootTracker.zombieRevFlesh = initInt("zombie", "revFlesh", 0);
+		LootTracker.zombieFoulFlesh = initInt("zombie", "foulFlesh", 0);
+		LootTracker.zombieFoulFleshDrops = initInt("zombie", "foulFleshDrops", 0);
+		LootTracker.zombiePestilences = initInt("zombie", "pestilence", 0);
+		LootTracker.zombieUndeadCatas = initInt("zombie", "undeadCatalyst", 0);
+		LootTracker.zombieBooks = initInt("zombie", "book", 0);
+		LootTracker.zombieBeheadeds = initInt("zombie", "beheaded", 0);
+		LootTracker.zombieRevCatas = initInt("zombie", "revCatalyst", 0);
+		LootTracker.zombieSnakes = initInt("zombie", "snake", 0);
+		LootTracker.zombieScythes = initInt("zombie", "scythe", 0);
+		LootTracker.zombieShards = initInt("zombie", "shard", 0);
+		LootTracker.zombieWardenHearts = initInt("zombie", "heart", 0);
+		LootTracker.zombieTime = initDouble("zombie", "timeRNG", -1);
+		LootTracker.zombieBosses = initInt("zombie", "bossRNG", -1);
 		
 		// Fishing
-		LootCommand.seaCreatures = getInt("fishing", "seaCreature");
-		LootCommand.goodCatches = getInt("fishing", "goodCatch");
-		LootCommand.greatCatches = getInt("fishing", "greatCatch");
-		LootCommand.squids = getInt("fishing", "squid");
-		LootCommand.seaWalkers = getInt("fishing", "seaWalker");
-		LootCommand.nightSquids = getInt("fishing", "nightSquid");
-		LootCommand.seaGuardians = getInt("fishing", "seaGuardian");
-		LootCommand.seaWitches = getInt("fishing", "seaWitch");
-		LootCommand.seaArchers = getInt("fishing", "seaArcher");
-		LootCommand.monsterOfTheDeeps = getInt("fishing", "monsterOfDeep");
-		LootCommand.catfishes = getInt("fishing", "catfish");
-		LootCommand.carrotKings = getInt("fishing", "carrotKing");
-		LootCommand.seaLeeches = getInt("fishing", "seaLeech");
-		LootCommand.guardianDefenders = getInt("fishing", "guardianDefender");
-		LootCommand.deepSeaProtectors = getInt("fishing", "deepSeaProtector");
-		LootCommand.hydras = getInt("fishing", "hydra");
-		LootCommand.seaEmperors = getInt("fishing", "seaEmperor");
-		LootCommand.empTime = getDouble("fishing", "empTime");
-		LootCommand.empSCs = getInt("fishing", "empSC");
-		LootCommand.fishingMilestone = getInt("fishing", "milestone");
+		LootTracker.seaCreatures = initInt("fishing", "seaCreature", 0);
+		LootTracker.goodCatches = initInt("fishing", "goodCatch", 0);
+		LootTracker.greatCatches = initInt("fishing", "greatCatch", 0);
+		LootTracker.squids = initInt("fishing", "squid", 0);
+		LootTracker.seaWalkers = initInt("fishing", "seaWalker", 0);
+		LootTracker.nightSquids = initInt("fishing", "nightSquid", 0);
+		LootTracker.seaGuardians = initInt("fishing", "seaGuardian", 0);
+		LootTracker.seaWitches = initInt("fishing", "seaWitch", 0);
+		LootTracker.seaArchers = initInt("fishing", "seaArcher", 0);
+		LootTracker.monsterOfTheDeeps = initInt("fishing", "monsterOfDeep", 0);
+		LootTracker.catfishes = initInt("fishing", "catfish", 0);
+		LootTracker.carrotKings = initInt("fishing", "carrotKing", 0);
+		LootTracker.seaLeeches = initInt("fishing", "seaLeech", 0);
+		LootTracker.guardianDefenders = initInt("fishing", "guardianDefender", 0);
+		LootTracker.deepSeaProtectors = initInt("fishing", "deepSeaProtector", 0);
+		LootTracker.hydras = initInt("fishing", "hydra", 0);
+		LootTracker.seaEmperors = initInt("fishing", "seaEmperor", 0);
+		LootTracker.empTime = initDouble("fishing", "empTime", -1);
+		LootTracker.empSCs = initInt("fishing", "empSC", -1);
+		LootTracker.fishingMilestone = initInt("fishing", "milestone", 0);
 		// Fishing Winter