Access static methods in static ways and remove unused imports

2 files changed, 165 insertions, 171 deletions

diff --git a/src/main/java/me/Danker/handlers/APIHandler.java b/src/main/java/me/Danker/handlers/APIHandler.java
index 6d1df32..c96aa50 100644
--- a/src/main/java/me/Danker/handlers/APIHandler.java
+++ b/src/main/java/me/Danker/handlers/APIHandler.java
@@ -18,7 +18,6 @@ import me.Danker.TheMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class APIHandler {
 	public static JsonObject getResponse(String urlString) {
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java
index 5a59308..08a78c4 100644
--- a/src/main/java/me/Danker/handlers/ConfigHandler.java
+++ b/src/main/java/me/Danker/handlers/ConfigHandler.java
@@ -374,203 +374,198 @@ public class ConfigHandler {
 		if (!hasKey("colors", "coordsDisplay")) writeStringConfig("colors", "coordsDisplay", "" + EnumChatFormatting.WHITE);
 		if (!hasKey("colors", "cakeDisplay")) writeStringConfig("colors", "cakeDisplay", "" + EnumChatFormatting.GOLD);
 		
-		final ToggleCommand tf = new ToggleCommand();
-		tf.gpartyToggled = getBoolean("toggles", "GParty");
-		tf.coordsToggled = getBoolean("toggles", "Coords");
-		tf.goldenToggled = getBoolean("toggles", "Golden");
-		tf.slayerCountTotal = getBoolean("toggles", "SlayerCount");
-		tf.rngesusAlerts = getBoolean("toggles", "RNGesusAlerts");
-		tf.splitFishing = getBoolean("toggles", "SplitFishing");
-		tf.chatMaddoxToggled = getBoolean("toggles", "ChatMaddox");
-		tf.spiritBearAlerts = getBoolean("toggles", "SpiritBearAlerts");
-		tf.aotdToggled = getBoolean("toggles", "AOTD");
-		tf.lividDaggerToggled = getBoolean("toggles", "LividDagger");
-		tf.sceptreMessages = getBoolean("toggles", "SceptreMessages");
-		tf.petColoursToggled = getBoolean("toggles", "PetColors");
-		tf.dungeonTimerToggled = getBoolean("toggles", "DungeonTimer");
-		tf.golemAlertToggled = getBoolean("toggles", "GolemAlerts");
-		tf.expertiseLoreToggled = getBoolean("toggles", "ExpertiseLore");
-		tf.skill50DisplayToggled = getBoolean("toggles", "Skill50Display");
-		tf.outlineTextToggled = getBoolean("toggles", "OutlineText");
-		tf.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages");
-		tf.healMessages = getBoolean("toggles", "HealMessages");
-		tf.cakeTimerToggled = getBoolean("toggles", "CakeTimer");
-		tf.lividSolverToggled = getBoolean("toggles", "LividSolver");
+		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.sceptreMessages = getBoolean("toggles", "SceptreMessages");
+		ToggleCommand.petColoursToggled = getBoolean("toggles", "PetColors");
+		ToggleCommand.dungeonTimerToggled = getBoolean("toggles", "DungeonTimer");
+		ToggleCommand.golemAlertToggled = getBoolean("toggles", "GolemAlerts");
+		ToggleCommand.expertiseLoreToggled = getBoolean("toggles", "ExpertiseLore");
+		ToggleCommand.skill50DisplayToggled = getBoolean("toggles", "Skill50Display");
+		ToggleCommand.outlineTextToggled = getBoolean("toggles", "OutlineText");
+		ToggleCommand.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages");
+		ToggleCommand.healMessages = getBoolean("toggles", "HealMessages");
+		ToggleCommand.cakeTimerToggled = getBoolean("toggles", "CakeTimer");
+		ToggleCommand.lividSolverToggled = getBoolean("toggles", "LividSolver");
 		// Puzzle Solvers
-		tf.threeManToggled = getBoolean("toggles", "ThreeManPuzzle");
-		tf.oruoToggled = getBoolean("toggles", "OruoPuzzle");
-		tf.blazeToggled = getBoolean("toggles", "BlazePuzzle");
-		tf.creeperToggled = getBoolean("toggles", "CreeperPuzzle");
-		tf.waterToggled = getBoolean("toggles", "WaterPuzzle");
+		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");
 		
-		final BlockSlayerCommand bs = new BlockSlayerCommand();
 		String onlySlayer = getString("toggles", "BlockSlayer");
 		if (!onlySlayer.equals("")) {
-			bs.onlySlayerName = onlySlayer.substring(0, onlySlayer.lastIndexOf(" "));
-			bs.onlySlayerNumber = onlySlayer.substring(onlySlayer.lastIndexOf(" ") + 1, onlySlayer.length());
+			BlockSlayerCommand.onlySlayerName = onlySlayer.substring(0, onlySlayer.lastIndexOf(" "));
+			BlockSlayerCommand.onlySlayerNumber = onlySlayer.substring(onlySlayer.lastIndexOf(" ") + 1, onlySlayer.length());
 		}
 		
-		final LootCommand lc = new LootCommand();
 		// Wolf
-		lc.wolfSvens = getInt("wolf", "svens");
-		lc.wolfTeeth = getInt("wolf", "teeth");
-		lc.wolfWheels = getInt("wolf", "wheel");
-		lc.wolfWheelsDrops = getInt("wolf", "wheelDrops");
-		lc.wolfSpirits = getInt("wolf", "spirit");
-		lc.wolfBooks = getInt("wolf", "book");
-		lc.wolfEggs = getInt("wolf", "egg");
-		lc.wolfCoutures = getInt("wolf", "couture");
-		lc.wolfBaits = getInt("wolf", "bait");
-		lc.wolfFluxes = getInt("wolf", "flux");
-		lc.wolfTime = getDouble("wolf", "timeRNG");
-		lc.wolfBosses = getInt("wolf", "bossRNG");
+		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");
 		// Spider
-		lc.spiderTarantulas = getInt("spider", "tarantulas");
-		lc.spiderWebs = getInt("spider", "web");
-		lc.spiderTAP = getInt("spider", "tap");
-		lc.spiderTAPDrops = getInt("spider", "tapDrops");
-		lc.spiderBites = getInt("spider", "bite");
-		lc.spiderCatalysts = getInt("spider", "catalyst");
-		lc.spiderBooks = getInt("spider", "book");
-		lc.spiderSwatters = getInt("spider", "swatter");
-		lc.spiderTalismans = getInt("spider", "talisman");
-		lc.spiderMosquitos = getInt("spider", "mosquito");
-		lc.spiderTime = getDouble("spider", "timeRNG");
-		lc.spiderBosses = getInt("spider", "bossRNG");
+		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");
 		// Zombie
-		lc.zombieRevs = getInt("zombie", "revs");
-		lc.zombieRevFlesh = getInt("zombie", "revFlesh");
-		lc.zombieFoulFlesh = getInt("zombie", "foulFlesh");
-		lc.zombieFoulFleshDrops = getInt("zombie", "foulFleshDrops");
-		lc.zombiePestilences = getInt("zombie", "pestilence");
-		lc.zombieUndeadCatas = getInt("zombie", "undeadCatalyst");
-		lc.zombieBooks = getInt("zombie", "book");
-		lc.zombieBeheadeds = getInt("zombie", "beheaded");
-		lc.zombieRevCatas = getInt("zombie", "revCatalyst");
-		lc.zombieSnakes = getInt("zombie", "snake");
-		lc.zombieScythes = getInt("zombie", "scythe");
-		lc.zombieTime = getDouble("zombie", "timeRNG");
-		lc.zombieBosses = getInt("zombie", "bossRNG");
+		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");
 		
 		// Fishing
-		lc.seaCreatures = getInt("fishing", "seaCreature");
-		lc.goodCatches = getInt("fishing", "goodCatch");
-		lc.greatCatches = getInt("fishing", "greatCatch");
-		lc.squids = getInt("fishing", "squid");
-		lc.seaWalkers = getInt("fishing", "seaWalker");
-		lc.nightSquids = getInt("fishing", "nightSquid");
-		lc.seaGuardians = getInt("fishing", "seaGuardian");
-		lc.seaWitches = getInt("fishing", "seaWitch");
-		lc.seaArchers = getInt("fishing", "seaArcher");
-		lc.monsterOfTheDeeps = getInt("fishing", "monsterOfDeep");
-		lc.catfishes = getInt("fishing", "catfish");
-		lc.carrotKings = getInt("fishing", "carrotKing");
-		lc.seaLeeches = getInt("fishing", "seaLeech");
-		lc.guardianDefenders = getInt("fishing", "guardianDefender");
-		lc.deepSeaProtectors = getInt("fishing", "deepSeaProtector");
-		lc.hydras = getInt("fishing", "hydra");
-		lc.seaEmperors = getInt("fishing", "seaEmperor");
-		lc.empTime = getDouble("fishing", "empTime");
-		lc.empSCs = getInt("fishing", "empSC");
-		lc.fishingMilestone = getInt("fishing", "milestone");
+		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");
 		// Fishing Winter
-		lc.frozenSteves = getInt("fishing", "frozenSteve");
-		lc.frostyTheSnowmans = getInt("fishing", "snowman");
-		lc.grinches = getInt("fishing", "grinch");
-		lc.yetis = getInt("fishing", "yeti");
-		lc.yetiTime = getDouble("fishing", "yetiTime");
-		lc.yetiSCs = getInt("fishing", "yetiSC");
+		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");
 		// Fishing Festival
-		lc.nurseSharks = getInt("fishing", "nurseShark");
-		lc.blueSharks = getInt("fishing", "blueShark");
-		lc.tigerSharks = getInt("fishing", "tigerShark");
-		lc.greatWhiteSharks = getInt("fishing", "greatWhiteShark");
+		LootCommand.nurseSharks = getInt("fishing", "nurseShark");
+		LootCommand.blueSharks = getInt("fishing", "blueShark");
+		LootCommand.tigerSharks = getInt("fishing", "tigerShark");
+		LootCommand.greatWhiteSharks = getInt("fishing", "greatWhiteShark");
 		// Spooky Fishing
-		lc.scarecrows = getInt("fishing", "scarecrow");
-		lc.nightmares = getInt("fishing", "nightmare");
-		lc.werewolfs = getInt("fishing", "nightmare");
-		lc.phantomFishers = getInt("fishing", "phantomFisher");
-		lc.grimReapers = getInt("fishing", "grimReaper");
+		LootCommand.scarecrows = getInt("fishing", "scarecrow");
+		LootCommand.nightmares = getInt("fishing", "nightmare");
+		LootCommand.werewolfs = getInt("fishing", "nightmare");
+		LootCommand.phantomFishers = getInt("fishing", "phantomFisher");
+		LootCommand.grimReapers = getInt("fishing", "grimReaper");
 		
 		// Dungeons
-		lc.recombobulators =  getInt("catacombs", "recombobulator");
-		lc.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
+		LootCommand.recombobulators =  getInt("catacombs", "recombobulator");
+		LootCommand.fumingPotatoBooks = getInt("catacombs", "fumingBooks");
 		// F1
-		lc.bonzoStaffs = getInt("catacombs", "bonzoStaff");
-		lc.f1CoinsSpent = getDouble("catacombs", "floorOneCoins");
-		lc.f1TimeSpent = getDouble("catacombs", "floorOneTime");
+		LootCommand.bonzoStaffs = getInt("catacombs", "bonzoStaff");
+		LootCommand.f1CoinsSpent = getDouble("catacombs", "floorOneCoins");
+		LootCommand.f1TimeSpent = getDouble("catacombs", "floorOneTime");
 		// F2
-		lc.scarfStudies = getInt("catacombs", "scarfStudies");
-		lc.f2CoinsSpent = getDouble("catacombs", "floorTwoCoins");
-		lc.f2TimeSpent = getDouble("catacombs", "floorTwoTime");
+		LootCommand.scarfStudies = getInt("catacombs", "scarfStudies");
+		LootCommand.f2CoinsSpent = getDouble("catacombs", "floorTwoCoins");
+		LootCommand.f2TimeSpent = getDouble("catacombs", "floorTwoTime");
 		// F3
-		lc.adaptiveHelms = getInt("catacombs", "adaptiveHelm");
-		lc.adaptiveChests = getInt("catacombs", "adaptiveChest");
-		lc.adaptiveLegs = getInt("catacombs", "adaptiveLegging");
-		lc.adaptiveBoots = getInt("catacombs", "adaptiveBoot");
-		lc.adaptiveSwords = getInt("catacombs", "adaptiveSword");
-		lc.f3CoinsSpent = getDouble("catacombs", "floorThreeCoins");
-		lc.f3TimeSpent = getDouble("catacombs", "floorThreeTime");
+		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");
 		// F4
-		lc.spiritWings = getInt("catacombs", "spiritWing");
-		lc.spiritBones = getInt("catacombs", "spiritBone");
-		lc.spiritBoots = getInt("catacombs", "spiritBoot");
-		lc.spiritSwords = getInt("catacombs", "spiritSword");
-		lc.spiritBows = getInt("catacombs", "spiritBow");
-		lc.epicSpiritPets = getInt("catacombs", "spiritPetEpic");
-		lc.legSpiritPets = getInt("catacombs", "spiritPetLeg");
-		lc.f4CoinsSpent = getDouble("catacombs", "floorFourCoins");
-		lc.f4TimeSpent = getDouble("catacombs", "floorFourTime");
+		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");
 		// F5
-		lc.warpedStones = getInt("catacombs", "warpedStone");
-		lc.shadowAssHelms = getInt("catacombs", "shadowAssassinHelm");
-		lc.shadowAssChests = getInt("catacombs", "shadowAssassinChest");
-		lc.shadowAssLegs = getInt("catacombs", "shadowAssassinLegging");
-		lc.shadowAssBoots = getInt("catacombs", "shadowAssassinBoot");
-		lc.lastBreaths = getInt("catacombs", "lastBreath");
-		lc.lividDaggers = getInt("catacombs", "lividDagger");
-		lc.shadowFurys = getInt("catacombs", "shadowFury");
-		lc.f5CoinsSpent = getDouble("catacombs", "floorFiveCoins");
-		lc.f5TimeSpent = getDouble("catacombs", "floorFiveTime");
+		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");
 		// F6
-		lc.ancientRoses = getInt("catacombs", "ancientRose");
-		lc.precursorEyes = getInt("catacombs", "precursorEye");
-		lc.giantsSwords = getInt("catacombs", "giantsSword");
-		lc.necroLordHelms = getInt("catacombs", "necroLordHelm");
-		lc.necroLordChests = getInt("catacombs", "necroLordChest");
-		lc.necroLordLegs = getInt("catacombs", "necroLordLegging");
-		lc.necroLordBoots = getInt("catacombs", "necroLordBoot");
-		lc.necroSwords = getInt("catacombs", "necroSword");
-		lc.f6CoinsSpent = getDouble("catacombs", "floorSixCoins");
-		lc.f6TimeSpent = getDouble("catacombs", "floorSixTime");
+		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");
 		
-		final DisplayCommand ds = new DisplayCommand();
-		ds.display = getString("misc", "display");
-		ds.auto = getBoolean("misc", "autoDisplay");
+		// Misc
+		DisplayCommand.display = getString("misc", "display");
+		DisplayCommand.auto = getBoolean("misc", "autoDisplay");
 		TheMod.SKILL_TIME = getInt("misc", "skill50Time") * 20;
 		TheMod.cakeTime = getDouble("misc", "cakeTime");
 		
-		final MoveCommand moc = new MoveCommand();
-		moc.coordsXY[0] = getInt("locations", "coordsX");
-		moc.coordsXY[1] = getInt("locations", "coordsY");
-		moc.displayXY[0] = getInt("locations", "displayX");
-		moc.displayXY[1] = getInt("locations", "displayY");
-		moc.dungeonTimerXY[0] = getInt("locations", "dungeonTimerX");
-		moc.dungeonTimerXY[1] = getInt("locations", "dungeonTimerY");
-		moc.skill50XY[0] = getInt("locations", "skill50X");
-		moc.skill50XY[1] = getInt("locations", "skill50Y");
-		moc.lividHpXY[0] = getInt("locations", "lividHpX");
-		moc.lividHpXY[1] = getInt("locations", "lividHpY");
-		moc.cakeTimerXY[0] = getInt("locations", "cakeTimerX");
-		moc.cakeTimerXY[1] = getInt("locations", "cakeTimerY");
+		MoveCommand.coordsXY[0] = getInt("locations", "coordsX");
+		MoveCommand.coordsXY[1] = getInt("locations", "coordsY");
+		MoveCommand.displayXY[0] = getInt("locations", "displayX");
+		MoveCommand.displayXY[1] = getInt("locations", "displayY");
+		MoveCommand.dungeonTimerXY[0] = getInt("locations", "dungeonTimerX");
+		MoveCommand.dungeonTimerXY[1] = getInt("locations", "dungeonTimerY");
+		MoveCommand.skill50XY[0] = getInt("locations", "skill50X");
+		MoveCommand.skill50XY[1] = getInt("locations", "skill50Y");
+		MoveCommand.lividHpXY[0] = getInt("locations", "lividHpX");
+		MoveCommand.lividHpXY[1] = getInt("locations", "lividHpY");
+		MoveCommand.cakeTimerXY[0] = getInt("locations", "cakeTimerX");
+		MoveCommand.cakeTimerXY[1] = getInt("locations", "cakeTimerY");
 		
-		final ScaleCommand sc = new ScaleCommand();
-		sc.coordsScale = getDouble("scales", "coordsScale");
-		sc.displayScale = getDouble("scales", "displayScale");
-		sc.dungeonTimerScale = getDouble("scales", "dungeonTimerScale");
-		sc.skill50Scale = getDouble("scales", "skill50Scale");
-		sc.lividHpScale = getDouble("scales", "lividHpScale");
-		sc.cakeTimerScale = getDouble("scales", "cakeTimerScale");
+		ScaleCommand.coordsScale = getDouble("scales", "coordsScale");
+		ScaleCommand.displayScale = getDouble("scales", "displayScale");
+		ScaleCommand.dungeonTimerScale = getDouble("scales", "dungeonTimerScale");
+		ScaleCommand.skill50Scale = getDouble("scales", "skill50Scale");
+		ScaleCommand.lividHpScale = getDouble("scales", "lividHpScale");
+		ScaleCommand.cakeTimerScale = getDouble("scales", "cakeTimerScale");
 		
 		TheMod.MAIN_COLOUR = getString("colors", "main");
 		TheMod.SECONDARY_COLOUR = getString("colors", "secondary");