Move features into their own files

1 files changed, 176 insertions, 170 deletions

diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index d5ab40b..7c51b1b 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.DisplayCommand;
+import me.Danker.commands.MoveCommand;
+import me.Danker.commands.ScaleCommand;
+import me.Danker.commands.ToggleCommand;
+import me.Danker.features.*;
+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;
@@ -514,175 +520,175 @@ public class ConfigHandler {
 
 		String onlySlayer = getString("toggles", "BlockSlayer");
 		if (!onlySlayer.equals("")) {
-			BlockSlayerCommand.onlySlayerName = onlySlayer.substring(0, onlySlayer.lastIndexOf(" "));
-			BlockSlayerCommand.onlySlayerNumber = onlySlayer.substring(onlySlayer.lastIndexOf(" ") + 1);
+			BlockWrongSlayer.onlySlayerName = onlySlayer.substring(0, onlySlayer.lastIndexOf(" "));
+			BlockWrongSlayer.onlySlayerNumber = onlySlayer.substring(onlySlayer.lastIndexOf(" ") + 1);
 		}
 		
 		// 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 = getInt("wolf", "svens");
+		LootTracker.wolfTeeth = getInt("wolf", "teeth");
+		LootTracker.wolfWheels = getInt("wolf", "wheel");
+		LootTracker.wolfWheelsDrops = getInt("wolf", "wheelDrops");
+		LootTracker.wolfSpirits = getInt("wolf", "spirit");
+		LootTracker.wolfBooks = getInt("wolf", "book");
+		LootTracker.wolfEggs = getInt("wolf", "egg");
+		LootTracker.wolfCoutures = getInt("wolf", "couture");
+		LootTracker.wolfBaits = getInt("wolf", "bait");
+		LootTracker.wolfFluxes = getInt("wolf", "flux");
+		LootTracker.wolfTime = getDouble("wolf", "timeRNG");
+		LootTracker.wolfBosses = getInt("wolf", "bossRNG");
 		// 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 = getInt("spider", "tarantulas");
+		LootTracker.spiderWebs = getInt("spider", "web");
+		LootTracker.spiderTAP = getInt("spider", "tap");
+		LootTracker.spiderTAPDrops = getInt("spider", "tapDrops");
+		LootTracker.spiderBites = getInt("spider", "bite");
+		LootTracker.spiderCatalysts = getInt("spider", "catalyst");
+		LootTracker.spiderBooks = getInt("spider", "book");
+		LootTracker.spiderSwatters = getInt("spider", "swatter");
+		LootTracker.spiderTalismans = getInt("spider", "talisman");
+		LootTracker.spiderMosquitos = getInt("spider", "mosquito");
+		LootTracker.spiderTime = getDouble("spider", "timeRNG");
+		LootTracker.spiderBosses = getInt("spider", "bossRNG");
 		// 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 = getInt("zombie", "revs");
+		LootTracker.zombieRevFlesh = getInt("zombie", "revFlesh");
+		LootTracker.zombieFoulFlesh = getInt("zombie", "foulFlesh");
+		LootTracker.zombieFoulFleshDrops = getInt("zombie", "foulFleshDrops");
+		LootTracker.zombiePestilences = getInt("zombie", "pestilence");
+		LootTracker.zombieUndeadCatas = getInt("zombie", "undeadCatalyst");
+		LootTracker.zombieBooks = getInt("zombie", "book");
+		LootTracker.zombieBeheadeds = getInt("zombie", "beheaded");
+		LootTracker.zombieRevCatas = getInt("zombie", "revCatalyst");
+		LootTracker.zombieSnakes = getInt("zombie", "snake");
+		LootTracker.zombieScythes = getInt("zombie", "scythe");
+		LootTracker.zombieTime = getDouble("zombie", "timeRNG");
+		LootTracker.zombieBosses = getInt("zombie", "bossRNG");
 		
 		// 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 = getInt("fishing", "seaCreature");
+		LootTracker.goodCatches = getInt("fishing", "goodCatch");
+		LootTracker.greatCatches = getInt("fishing", "greatCatch");
+		LootTracker.squids = getInt("fishing", "squid");
+		LootTracker.seaWalkers = getInt("fishing", "seaWalker");
+		LootTracker.nightSquids = getInt("fishing", "nightSquid");
+		LootTracker.seaGuardians = getInt("fishing", "seaGuardian");
+		LootTracker.seaWitches = getInt("fishing", "seaWitch");
+		LootTracker.seaArchers = getInt("fishing", "seaArcher");
+		LootTracker.monsterOfTheDeeps = getInt("fishing", "monsterOfDeep");
+		LootTracker.catfishes = getInt("fishing", "catfish");
+		LootTracker.carrotKings = getInt("fishing", "carrotKing");
+		LootTracker.seaLeeches = getInt("fishing", "seaLeech");
+		LootTracker.guardianDefenders = getInt("fishing", "guardianDefender");
+		LootTracker.deepSeaProtectors = getInt("fishing", "deepSeaProtector");
+		LootTracker.hydras = getInt("fishing", "hydra");
+		LootTracker.seaEmperors = getInt("fishing", "seaEmperor");
+		LootTracker.empTime = getDouble("fishing", "empTime");
+		LootTracker.empSCs = getInt("fishing", "empSC");
+		LootTracker.fishingMilestone = getInt("fishing", "milestone");
 		// Fishing Winter
-		LootCommand.frozenSteves = getInt("fishing", "frozenSteve");
-		LootCommand.frostyTheSnowmans = getInt("fishing", "snowman");
-		LootCommand.grinches = getInt("fishing", "grinch");
-		LootCommand.yetis = getInt("fishing", "yeti");
-		LootCommand.yetiTime = getDouble("fishing", "yetiTime");
-		LootCommand.yetiSCs = getInt("fishing", "yetiSC");
+		LootTracker.frozenSteves = getInt("fishing", "frozenSteve");
+		LootTracker.frostyTheSnowmans = getInt("fishing", "snowman");
+		LootTracker.grinches = getInt("fishing", "grinch");
+		LootTracker.yetis = getInt("fishing", "yeti");
+		LootTracker.yetiTime = getDouble("fishing", "yetiTime");
+		LootTracker.yetiSCs = getInt("fishing", "yetiSC");
 		// Fishing Festival
-		LootCommand.nurseSharks = getInt("fishing", "nurseShark");
-		LootCommand.blueSharks = getInt("fishing", "blueShark");
-		LootCommand.tigerSharks = getInt("fishing", "tigerShark");
-		LootCommand.greatWhiteSharks = getInt("fishing", "greatWhiteShark");
+		LootTracker.nurseSharks = getInt("fishing", "nurseShark");
+		LootTracker.blueSharks = getInt("fishing", "blueShark");
+		LootTracker.tigerSharks = getInt("fishing", "tigerShark");
+		LootTracker.greatWhiteSharks = getInt("fishing", "greatWhiteShark");
 		// Spooky Fishing
-		LootCommand.scarecrows = getInt("fishing", "scarecrow");
-		LootCommand.nightmares = getInt("fishing", "nightmare");
-		LootCommand.werewolfs = getInt("fishing", "werewolf");
-		LootCommand.phantomFishers = getInt("fishing", "phantomFisher");
-		LootCommand.grimReapers = getInt("fishing", "grimReaper");
+		LootTracker.scarecrows = getInt("fishing", "scarecrow");
+		LootTracker.nightmares = getInt("fishing", "nightmare");
+		LootTracker.werewolfs = getInt("fishing", "werewolf");
+		LootTracker.phantomFishers = getInt("fishing", "phantomFisher");
+		LootTracker.grimReapers = getInt("fishing", "grimReaper");
 		
 		// Mythological
-		LootCommand.mythCoins = getDouble("mythological", "coins");
-		LootCommand.griffinFeathers = getInt("mythological", "griffinFeather");
-		LootCommand.crownOfGreeds = getInt("mythological", "crownOfGreed");
-		LootCommand.washedUpSouvenirs = getInt("mythological", "washedUpSouvenir");
-		LootCommand.minosHunters = getInt("mythological", "minosHunter");
-		LootCommand.siameseLynxes = getInt("mythological", "siameseLynx");
-		LootCommand.minotaurs = getInt("mythological", "minotaur");
-		LootCommand.gaiaConstructs = getInt("mythological", "gaiaConstruct");
-		LootCommand.minosChampions = getInt("mythological", "minosChampion");
-		LootCommand.minosInquisitors = getInt("mythological", "minosInquisitor");
+		LootTracker.mythCoins = getDouble("mythological", "coins");
+		LootTracker.griffinFeathers = getInt("mythological", "griffinFeather");
+		LootTracker.crownOfGreeds = getInt("mythological", "crownOfGreed");
+		LootTracker.washedUpSouvenirs = getInt("mythological", "washedUpSouvenir");
+		LootTracker.minosHunters = getInt("mythological", "minosHunter");
+		LootTracker.siameseLynxes = getInt("mythological", "siameseLynx");
+		LootTracker.minotaurs = getInt("mythological", "minotaur");
+		LootTracker.gaiaConstructs = getInt("mythological", "gaiaConstruct");
+		LootTracker.minosChampions = getInt("mythological", "minosChampion");
+		LootTracker.minosInquisitors = getInt("mythological", "minosInquisitor");
 		
 		// Dungeons
-		LootCommand.recombobulators =  getInt("catacombs", "recombobulator");
-		LootCommand.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
+		LootTracker.recombobulators =  getInt("catacombs", "recombobulator");
+		LootTracker.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
 		// F1
-		LootCommand.bonzoStaffs = getInt("catacombs", "bonzoStaff");
-		LootCommand.f1CoinsSpent = getDouble("catacombs", "floorOneCoins");
-		LootCommand.f1TimeSpent = getDouble("catacombs", "floorOneTime");
+		LootTracker.bonzoStaffs = getInt("catacombs", "bonzoStaff");
+		LootTracker.f1CoinsSpent = getDouble("catacombs", "floorOneCoins");
+		LootTracker.f1TimeSpent = getDouble("catacombs", "floorOneTime");
 		// F2
-		LootCommand.scarfStudies = getInt("catacombs", "scarfStudies");
-		LootCommand.f2CoinsSpent = getDouble("catacombs", "floorTwoCoins");
-		LootCommand.f2TimeSpent = getDouble("catacombs", "floorTwoTime");
+		LootTracker.scarfStudies = getInt("catacombs", "scarfStudies");
+		LootTracker.f2CoinsSpent = getDouble("catacombs", "floorTwoCoins");
+		LootTracker.f2TimeSpent = getDouble("catacombs", "floorTwoTime");
 		// F3
-		LootCommand.adaptiveHelms = getInt("catacombs", "adaptiveHelm");
-		LootCommand.adaptiveChests = getInt("catacombs", "adaptiveChest");
-		LootCommand.adaptiveLegs = getInt("catacombs", "adaptiveLegging");
-		LootCommand.adaptiveBoots = getInt("catacombs", "adaptiveBoot");
-		LootCommand.adaptiveSwords = getInt("catacombs", "adaptiveSword");
-		LootCommand.f3CoinsSpent = getDouble("catacombs", "floorThreeCoins");
-		LootCommand.f3TimeSpent = getDouble("catacombs", "floorThreeTime");
+		LootTracker.adaptiveHelms = getInt("catacombs", "adaptiveHelm");
+		LootTracker.adaptiveChests = getInt("catacombs", "adaptiveChest");
+		LootTracker.adaptiveLegs = getInt("catacombs", "adaptiveLegging");
+		LootTracker.adaptiveBoots = getInt("catacombs", "adaptiveBoot");
+		LootTracker.adaptiveSwords = getInt("catacombs", "adaptiveSword");
+		LootTracker.f3CoinsSpent = getDouble("catacombs", "floorThreeCoins");
+		LootTracker.f3TimeSpent = getDouble("catacombs", "floorThreeTime");
 		// F4
-		LootCommand.spiritWings = getInt("catacombs", "spiritWing");
-		LootCommand.spiritBones = getInt("catacombs", "spiritBone");
-		LootCommand.spiritBoots = getInt("catacombs", "spiritBoot");
-		LootCommand.spiritSwords = getInt("catacombs", "spiritSword");
-		LootCommand.spiritBows = getInt("catacombs", "spiritBow");
-		LootCommand.epicSpiritPets = getInt("catacombs", "spiritPetEpic");
-		LootCommand.legSpiritPets = getInt("catacombs", "spiritPetLeg");
-		LootCommand.f4CoinsSpent = getDouble("catacombs", "floorFourCoins");
-		LootCommand.f4TimeSpent = getDouble("catacombs", "floorFourTime");
+		LootTracker.spiritWings = getInt("catacombs", "spiritWing");
+		LootTracker.spiritBones = getInt("catacombs", "spiritBone");
+		LootTracker.spiritBoots = getInt("catacombs", "spiritBoot");
+		LootTracker.spiritSwords = getInt("catacombs", "spiritSword");
+		LootTracker.spiritBows = getInt("catacombs", "spiritBow");
+		LootTracker.epicSpiritPets = getInt("catacombs", "spiritPetEpic");
+		LootTracker.legSpiritPets = getInt("catacombs", "spiritPetLeg");
+		LootTracker.f4CoinsSpent = getDouble("catacombs", "floorFourCoins");
+		LootTracker.f4TimeSpent = getDouble("catacombs", "floorFourTime");
 		// F5
-		LootCommand.warpedStones = getInt("catacombs", "warpedStone");
-		LootCommand.shadowAssHelms = getInt("catacombs", "shadowAssassinHelm");
-		LootCommand.shadowAssChests = getInt("catacombs", "shadowAssassinChest");
-		LootCommand.shadowAssLegs = getInt("catacombs", "shadowAssassinLegging");
-		LootCommand.shadowAssBoots = getInt("catacombs", "shadowAssassinBoot");
-		LootCommand.lastBreaths = getInt("catacombs", "lastBreath");
-		LootCommand.lividDaggers = getInt("catacombs", "lividDagger");
-		LootCommand.shadowFurys = getInt("catacombs", "shadowFury");
-		LootCommand.f5CoinsSpent = getDouble("catacombs", "floorFiveCoins");
-		LootCommand.f5TimeSpent = getDouble("catacombs", "floorFiveTime");
+		LootTracker.warpedStones = getInt("catacombs", "warpedStone");
+		LootTracker.shadowAssHelms = getInt("catacombs", "shadowAssassinHelm");
+		LootTracker.shadowAssChests = getInt("catacombs", "shadowAssassinChest");
+		LootTracker.shadowAssLegs = getInt("catacombs", "shadowAssassinLegging");
+		LootTracker.shadowAssBoots = getInt("catacombs", "shadowAssassinBoot");
+		LootTracker.lastBreaths = getInt("catacombs", "lastBreath");
+		LootTracker.lividDaggers = getInt("catacombs", "lividDagger");
+		LootTracker.shadowFurys = getInt("catacombs", "shadowFury");
+		LootTracker.f5CoinsSpent = getDouble("catacombs", "floorFiveCoins");
+		LootTracker.f5TimeSpent = getDouble("catacombs", "floorFiveTime");
 		// F6
-		LootCommand.ancientRoses = getInt("catacombs", "ancientRose");
-		LootCommand.precursorEyes = getInt("catacombs", "precursorEye");
-		LootCommand.giantsSwords = getInt("catacombs", "giantsSword");
-		LootCommand.necroLordHelms = getInt("catacombs", "necroLordHelm");
-		LootCommand.necroLordChests = getInt("catacombs", "necroLordChest");
-		LootCommand.necroLordLegs = getInt("catacombs", "necroLordLegging");
-		LootCommand.necroLordBoots = getInt("catacombs", "necroLordBoot");
-		LootCommand.necroSwords = getInt("catacombs", "necroSword");
-		LootCommand.f6CoinsSpent = getDouble("catacombs", "floorSixCoins");
-		LootCommand.f6TimeSpent = getDouble("catacombs", "floorSixTime");
+		LootTracker.ancientRoses = getInt("catacombs", "ancientRose");
+		LootTracker.precursorEyes = getInt("catacombs", "precursorEye");
+		LootTracker.giantsSwords = getInt("catacombs", "giantsSword");
+		LootTracker.necroLordHelms = getInt("catacombs", "necroLordHelm");
+		LootTracker.necroLordChests = getInt("catacombs", "necroLordChest");
+		LootTracker.necroLordLegs = getInt("catacombs", "necroLordLegging");
+		LootTracker.necroLordBoots = getInt("catacombs", "necroLordBoot");
+		LootTracker.necroSwords = getInt("catacombs", "necroSword");
+		LootTracker.f6CoinsSpent = getDouble("catacombs", "floorSixCoins");
+		LootTracker.f6TimeSpent = getDouble("catacombs", "floorSixTime");
 		// F7
-		LootCommand.witherBloods = getInt("catacombs", "witherBlood");
-		LootCommand.witherCloaks = getInt("catacombs", "witherCloak");
-		LootCommand.implosions = getInt("catacombs", "implosion");
-		LootCommand.witherShields = getInt("catacombs", "witherShield");
-		LootCommand.shadowWarps = getInt("catacombs", "shadowWarp");
-		LootCommand.necronsHandles = getInt("catacombs", "necronsHandle");
-		LootCommand.autoRecombs = getInt("catacombs", "autoRecomb");
-		LootCommand.witherHelms = getInt("catacombs", "witherHelm");
-		LootCommand.witherChests = getInt("catacombs", "witherChest");
-		LootCommand.witherLegs = getInt("catacombs", "witherLegging");
-		LootCommand.witherBoots = getInt("catacombs", "witherBoot");
-		LootCommand.f7CoinsSpent = getDouble("catacombs", "floorSevenCoins");
-		LootCommand.f7TimeSpent = getDouble("catacombs", "floorSevenTime");
+		LootTracker.witherBloods = getInt("catacombs", "witherBlood");
+		LootTracker.witherCloaks = getInt("catacombs", "witherCloak");
+		LootTracker.implosions = getInt("catacombs", "implosion");
+		LootTracker.witherShields = getInt("catacombs", "witherShield");
+		LootTracker.shadowWarps = getInt("catacombs", "shadowWarp");
+		LootTracker.necronsHandles = getInt("catacombs", "necronsHandle");
+		LootTracker.autoRecombs = getInt("catacombs", "autoRecomb");
+		LootTracker.witherHelms = getInt("catacombs", "witherHelm");
+		LootTracker.witherChests = getInt("catacombs", "witherChest");
+		LootTracker.witherLegs = getInt("catacombs", "witherLegging");
+		LootTracker.witherBoots = getInt("catacombs", "witherBoot");
+		LootTracker.f7CoinsSpent = getDouble("catacombs", "floorSevenCoins");
+		LootTracker.f7TimeSpent = getDouble("catacombs", "floorSevenTime");
 		
 		// Misc
 		DisplayCommand.display = getString("misc", "display");
 		DisplayCommand.auto = getBoolean("misc", "autoDisplay");
-		DankersSkyblockMod.SKILL_TIME = getInt("misc", "skill50Time") * 20;
-		DankersSkyblockMod.cakeTime = getDouble("misc", "cakeTime");
-		DankersSkyblockMod.showSkillTracker = getBoolean("misc", "showSkillTracker");
+		Skill50Display.SKILL_TIME = getInt("misc", "skill50Time") * 20;
+		CakeTimer.cakeTime = getDouble("misc", "cakeTime");
+		SkillTracker.showSkillTracker = getBoolean("misc", "showSkillTracker");
 		DankersSkyblockMod.firstLaunch = getBoolean("misc", "firstLaunch");
 
 		MoveCommand.coordsXY[0] = getInt("locations", "coordsX");
@@ -723,31 +729,31 @@ public class ConfigHandler {
 		DankersSkyblockMod.VALUE_COLOUR = getString("colors", "value");
 		DankersSkyblockMod.SKILL_AVERAGE_COLOUR = getString("colors", "skillAverage");
 		DankersSkyblockMod.ANSWER_COLOUR = getString("colors", "answer");
-		DankersSkyblockMod.SKILL_50_COLOUR = getString("colors", "skill50Display");
-		DankersSkyblockMod.COORDS_COLOUR = getString("colors", "coordsDisplay");
-		DankersSkyblockMod.CAKE_COLOUR = getString("colors", "cakeDisplay");
-		DankersSkyblockMod.SKILL_TRACKER_COLOUR = getString("colors", "skillTracker");
-		DankersSkyblockMod.TRIVIA_WRONG_ANSWER_COLOUR = getString("colors", "triviaWrongAnswer");
-		DankersSkyblockMod.BONZO_COLOR = getString("colors", "bonzoDisplay");
-		DankersSkyblockMod.LOWEST_BLAZE_COLOUR = getInt("colors", "blazeLowest");
-		DankersSkyblockMod.HIGHEST_BLAZE_COLOUR = getInt("colors", "blazeHighest");
-		DankersSkyblockMod.PET_1_TO_9 = getInt("colors", "pet1To9");
-		DankersSkyblockMod.PET_10_TO_19 = getInt("colors", "pet10To19");
-		DankersSkyblockMod.PET_20_TO_29 = getInt("colors", "pet20To29");
-		DankersSkyblockMod.PET_30_TO_39 = getInt("colors", "pet30To39");
-		DankersSkyblockMod.PET_40_TO_49 = getInt("colors", "pet40To49");
-		DankersSkyblockMod.PET_50_TO_59 = getInt("colors", "pet50To59");
-		DankersSkyblockMod.PET_60_TO_69 = getInt("colors", "pet60To69");
-		DankersSkyblockMod.PET_70_TO_79 = getInt("colors", "pet70To79");
-		DankersSkyblockMod.PET_80_TO_89 = getInt("colors", "pet80To89");
-		DankersSkyblockMod.PET_90_TO_99 = getInt("colors", "pet90To99");
-		DankersSkyblockMod.PET_100 = getInt("colors", "pet100");
-		DankersSkyblockMod.ULTRASEQUENCER_NEXT = getInt("colors", "ultrasequencerNext");
-		DankersSkyblockMod.ULTRASEQUENCER_NEXT_TO_NEXT = getInt("colors", "ultrasequencerNextToNext");
-		DankersSkyblockMod.CHRONOMATRON_NEXT = getInt("colors", "chronomatronNext");
-		DankersSkyblockMod.CHRONOMATRON_NEXT_TO_NEXT = getInt("colors", "chronomatronNextToNext");
-		DankersSkyblockMod.CLICK_IN_ORDER_NEXT = getInt("colors", "clickInOrderNext");
-		DankersSkyblockMod.CLICK_IN_ORDER_NEXT_TO_NEXT = getInt("colors", "clickInOrderNextToNext");
+		Skill50Display.SKILL_50_COLOUR = getString("colors", "skill50Display");
+		NoF3Coords.COORDS_COLOUR = getString("colors", "coordsDisplay");
+		CakeTimer.CAKE_COLOUR = getString("colors", "cakeDisplay");
+		SkillTracker.SKILL_TRACKER_COLOUR = getString("colors", "skillTracker");
+		TriviaSolver.TRIVIA_WRONG_ANSWER_COLOUR = getString("colors", "triviaWrongAnswer");
+		BonzoMaskTimer.BONZO_COLOR = getString("colors", "bonzoDisplay");
+		BlazeSolver.LOWEST_BLAZE_COLOUR = getInt("colors", "blazeLowest");
+		BlazeSolver.HIGHEST_BLAZE_COLOUR = getInt("colors", "blazeHighest");
+		PetColours.PET_1_TO_9 = getInt("colors", "pet1To9");
+		PetColours.PET_10_TO_19 = getInt("colors", "pet10To19");
+		PetColours.PET_20_TO_29 = getInt("colors", "pet20To29");
+		PetColours.PET_30_TO_39 = getInt("colors", "pet30To39");
+		PetColours.PET_40_TO_49 = getInt("colors", "pet40To49");
+		PetColours.PET_50_TO_59 = getInt("colors", "pet50To59");
+		PetColours.PET_60_TO_69 = getInt("colors", "pet60To69");
+		PetColours.PET_70_TO_79 = getInt("colors", "pet70To79");
+		PetColours.PET_80_TO_89 = getInt("colors", "pet80To89");
+		PetColours.PET_90_TO_99 = getInt("colors", "pet90To99");
+		PetColours.PET_100 = getInt("colors", "pet100");
+		UltrasequencerSolver.ULTRASEQUENCER_NEXT = getInt("colors", "ultrasequencerNext");
+		UltrasequencerSolver.ULTRASEQUENCER_NEXT_TO_NEXT = getInt("colors", "ultrasequencerNextToNext");
+		ChronomatronSolver.CHRONOMATRON_NEXT = getInt("colors", "chronomatronNext");
+		ChronomatronSolver.CHRONOMATRON_NEXT_TO_NEXT = getInt("colors", "chronomatronNextToNext");
+		ClickInOrderSolver.CLICK_IN_ORDER_NEXT = getInt("colors", "clickInOrderNext");
+		ClickInOrderSolver.CLICK_IN_ORDER_NEXT_TO_NEXT = getInt("colors", "clickInOrderNextToNext");
 	}
 	
 }