From 511b95de7dcb83e047dce2adadeff8c18804c1b6 Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Mon, 9 Nov 2020 14:50:39 -0500 Subject: Add config values for colours and many bug fixes Fix spooky fishing config values Add spooky fishing to /importfishing Add boolean to config to truely turn off chat Maddox Remove bold red name from three man puzzle answer Change spooky fishing to fishing spooky --- src/main/java/me/Danker/handlers/APIHandler.java | 19 ++++++++-------- .../java/me/Danker/handlers/ConfigHandler.java | 25 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 9 deletions(-) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/APIHandler.java b/src/main/java/me/Danker/handlers/APIHandler.java index b8d52dc..6d1df32 100644 --- a/src/main/java/me/Danker/handlers/APIHandler.java +++ b/src/main/java/me/Danker/handlers/APIHandler.java @@ -14,6 +14,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import me.Danker.TheMod; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; @@ -54,16 +55,16 @@ public class APIHandler { return object; } } else if (urlString.startsWith("https://api.mojang.com/users/profiles/minecraft/") && conn.getResponseCode() == 204) { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Failed with reason: Player does not exist.")); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: Player does not exist.")); } else { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Request failed. HTTP Error Code: " + conn.getResponseCode())); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Request failed. HTTP Error Code: " + conn.getResponseCode())); } } } catch (MalformedURLException ex) { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "An error has occured. See logs for more details.")); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "An error has occured. See logs for more details.")); System.err.println(ex); } catch (IOException ex) { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "An error has occured. See logs for more details.")); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "An error has occured. See logs for more details.")); System.err.println(ex); } @@ -94,13 +95,13 @@ public class APIHandler { return array; } else { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Request failed. HTTP Error Code: " + conn.getResponseCode())); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Request failed. HTTP Error Code: " + conn.getResponseCode())); } } catch (MalformedURLException ex) { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "An error has occured. See logs for more details.")); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "An error has occured. See logs for more details.")); System.err.println(ex); } catch (IOException ex) { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "An error has occured. See logs for more details.")); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "An error has occured. See logs for more details.")); System.err.println(ex); } @@ -125,11 +126,11 @@ public class APIHandler { JsonObject profilesResponse = getResponse("https://api.hypixel.net/skyblock/profiles?uuid=" + UUID + "&key=" + key); if (!profilesResponse.get("success").getAsBoolean()) { String reason = profilesResponse.get("cause").getAsString(); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Failed with reason: " + reason)); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Failed with reason: " + reason)); return null; } if (profilesResponse.get("profiles").isJsonNull()) { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "This player doesn't appear to have played SkyBlock.")); + player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "This player doesn't appear to have played SkyBlock.")); return null; } diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 2b6c0f7..98cc35e 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -11,6 +11,7 @@ import me.Danker.commands.ScaleCommand; import me.Danker.commands.ToggleCommand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; @@ -334,6 +335,7 @@ public class ConfigHandler { 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", "trueChatMaddoxEnabled")) writeBooleanConfig("misc", "trueChatMaddoxEnabled", true); ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft()); int height = scaled.getScaledHeight(); @@ -353,6 +355,17 @@ public class ConfigHandler { if (!hasKey("scales", "skill50Scale")) writeDoubleConfig("scales", "skill50Scale", 1); if (!hasKey("scales", "lividHpScale")) writeDoubleConfig("scales", "lividHpScale", 1); + if (!hasKey("colors", "main")) writeStringConfig("colors", "main", "" + EnumChatFormatting.GREEN); + if (!hasKey("colors", "secondary")) writeStringConfig("colors", "secondary", "" + EnumChatFormatting.DARK_GREEN); + if (!hasKey("colors", "delimiter")) writeStringConfig("colors", "delimiter", "" + EnumChatFormatting.AQUA); + if (!hasKey("colors", "error")) writeStringConfig("colors", "error", "" + EnumChatFormatting.RED); + if (!hasKey("colors", "type")) writeStringConfig("colors", "type", "" + EnumChatFormatting.GREEN); + if (!hasKey("colors", "value")) writeStringConfig("colors", "value", "" + EnumChatFormatting.DARK_GREEN); + if (!hasKey("colors", "skillAverage")) writeStringConfig("colors", "skillAverage", "" + EnumChatFormatting.GOLD); + if (!hasKey("colors", "answer")) writeStringConfig("colors", "answer", "" + EnumChatFormatting.DARK_GREEN); + if (!hasKey("colors", "skill50Display")) writeStringConfig("colors", "skill50Display", "" + EnumChatFormatting.AQUA); + if (!hasKey("colors", "coordsDisplay")) writeStringConfig("colors", "coordsDisplay", "" + EnumChatFormatting.WHITE); + final ToggleCommand tf = new ToggleCommand(); tf.gpartyToggled = getBoolean("toggles", "GParty"); tf.coordsToggled = getBoolean("toggles", "Coords"); @@ -523,6 +536,7 @@ public class ConfigHandler { ds.display = getString("misc", "display"); ds.auto = getBoolean("misc", "autoDisplay"); TheMod.SKILL_TIME = getInt("misc", "skill50Time") * 20; + tf.trueChatMaddoxEnabled = getBoolean("misc", "trueChatMaddoxEnabled"); final MoveCommand moc = new MoveCommand(); moc.coordsXY[0] = getInt("locations", "coordsX"); @@ -542,6 +556,17 @@ public class ConfigHandler { sc.dungeonTimerScale = getDouble("scales", "dungeonTimerScale"); sc.skill50Scale = getDouble("scales", "skill50Scale"); sc.lividHpScale = getDouble("scales", "lividHpScale"); + + TheMod.MAIN_COLOUR = getString("colors", "main"); + TheMod.SECONDARY_COLOUR = getString("colors", "secondary"); + TheMod.DELIMITER_COLOUR = getString("colors", "delimiter"); + TheMod.ERROR_COLOUR = getString("colors", "error"); + TheMod.TYPE_COLOUR = getString("colors", "type"); + TheMod.VALUE_COLOUR = getString("colors", "value"); + TheMod.SKILL_AVERAGE_COLOUR = getString("colors", "skillAverage"); + TheMod.ANSWER_COLOUR = getString("colors", "answer"); + TheMod.SKILL_50_COLOUR = getString("colors", "skill50Display"); + TheMod.COORDS_COLOUR = getString("colors", "coordsDisplay"); } } -- cgit From 6cf3309708ca632fdeebd99a2a79f3a3471e549d Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Tue, 10 Nov 2020 23:24:17 -0500 Subject: Add display for time until century cakes run out --- src/main/java/me/Danker/handlers/ConfigHandler.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 98cc35e..7473e43 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -191,6 +191,7 @@ public class ConfigHandler { if (!hasKey("toggles", "Skill50Display")) writeBooleanConfig("toggles", "Skill50Display", false); if (!hasKey("toggles", "OutlineText")) writeBooleanConfig("toggles", "OutlineText", false); if (!hasKey("toggles", "MidasStaffMessages")) writeBooleanConfig("toggles", "MidasStaffMessages", true); + if (!hasKey("toggles", "CakeTimer")) writeBooleanConfig("toggles", "CakeTimer", false); if (!hasKey("toggles", "LividSolver")) writeBooleanConfig("toggles", "LividSolver", false); // Puzzle Solvers if (!hasKey("toggles", "ThreeManPuzzle")) writeBooleanConfig("toggles", "ThreeManPuzzle", false); @@ -336,6 +337,7 @@ public class ConfigHandler { if (!hasKey("misc", "autoDisplay")) writeBooleanConfig("misc", "autoDisplay", false); if (!hasKey("misc", "skill50Time")) writeIntConfig("misc", "skill50Time", 3); if (!hasKey("misc", "trueChatMaddoxEnabled")) writeBooleanConfig("misc", "trueChatMaddoxEnabled", true); + if (!hasKey("misc", "cakeTime")) writeDoubleConfig("misc", "cakeTime", 0); ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft()); int height = scaled.getScaledHeight(); @@ -349,11 +351,14 @@ public class ConfigHandler { 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("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("colors", "main")) writeStringConfig("colors", "main", "" + EnumChatFormatting.GREEN); if (!hasKey("colors", "secondary")) writeStringConfig("colors", "secondary", "" + EnumChatFormatting.DARK_GREEN); @@ -365,6 +370,7 @@ public class ConfigHandler { if (!hasKey("colors", "answer")) writeStringConfig("colors", "answer", "" + EnumChatFormatting.DARK_GREEN); if (!hasKey("colors", "skill50Display")) writeStringConfig("colors", "skill50Display", "" + EnumChatFormatting.AQUA); 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"); @@ -385,6 +391,7 @@ public class ConfigHandler { tf.skill50DisplayToggled = getBoolean("toggles", "Skill50Display"); tf.outlineTextToggled = getBoolean("toggles", "OutlineText"); tf.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages"); + tf.cakeTimerToggled = getBoolean("toggles", "CakeTimer"); tf.lividSolverToggled = getBoolean("toggles", "LividSolver"); // Puzzle Solvers tf.threeManToggled = getBoolean("toggles", "ThreeManPuzzle"); @@ -537,6 +544,7 @@ public class ConfigHandler { ds.auto = getBoolean("misc", "autoDisplay"); TheMod.SKILL_TIME = getInt("misc", "skill50Time") * 20; tf.trueChatMaddoxEnabled = getBoolean("misc", "trueChatMaddoxEnabled"); + TheMod.cakeTime = getDouble("misc", "cakeTime"); final MoveCommand moc = new MoveCommand(); moc.coordsXY[0] = getInt("locations", "coordsX"); @@ -549,6 +557,8 @@ public class ConfigHandler { 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"); final ScaleCommand sc = new ScaleCommand(); sc.coordsScale = getDouble("scales", "coordsScale"); @@ -556,6 +566,7 @@ public class ConfigHandler { sc.dungeonTimerScale = getDouble("scales", "dungeonTimerScale"); sc.skill50Scale = getDouble("scales", "skill50Scale"); sc.lividHpScale = getDouble("scales", "lividHpScale"); + sc.cakeTimerScale = getDouble("scales", "cakeTimerScale"); TheMod.MAIN_COLOUR = getString("colors", "main"); TheMod.SECONDARY_COLOUR = getString("colors", "secondary"); @@ -567,6 +578,7 @@ public class ConfigHandler { TheMod.ANSWER_COLOUR = getString("colors", "answer"); TheMod.SKILL_50_COLOUR = getString("colors", "skill50Display"); TheMod.COORDS_COLOUR = getString("colors", "coordsDisplay"); + TheMod.CAKE_COLOUR = getString("colors", "cakeDisplay"); } } -- cgit From db03ce14fde088c15dc366e70d937338de8721dc Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Sat, 14 Nov 2020 18:39:14 -0500 Subject: Add option to hide heal messages --- src/main/java/me/Danker/handlers/ConfigHandler.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 7473e43..131076d 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -191,6 +191,7 @@ public class ConfigHandler { if (!hasKey("toggles", "Skill50Display")) writeBooleanConfig("toggles", "Skill50Display", false); if (!hasKey("toggles", "OutlineText")) writeBooleanConfig("toggles", "OutlineText", false); if (!hasKey("toggles", "MidasStaffMessages")) writeBooleanConfig("toggles", "MidasStaffMessages", true); + if (!hasKey("toggles", "HealMessages")) writeBooleanConfig("toggles", "HealMessages", true); if (!hasKey("toggles", "CakeTimer")) writeBooleanConfig("toggles", "CakeTimer", false); if (!hasKey("toggles", "LividSolver")) writeBooleanConfig("toggles", "LividSolver", false); // Puzzle Solvers @@ -391,6 +392,7 @@ public class ConfigHandler { 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"); // Puzzle Solvers -- cgit From 68646a34ea9080228dfe437fedcec84a41c1fd6d Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Thu, 19 Nov 2020 12:05:38 -0500 Subject: Add water puzzle solver, bug fixes Update trivia solutions Limit skills from achievement API to 50 Fix typo in puzzle solvers GUI --- src/main/java/me/Danker/handlers/ConfigHandler.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 131076d..408849c 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -199,6 +199,7 @@ public class ConfigHandler { 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("api", "APIKey")) writeStringConfig("api", "APIKey", ""); @@ -400,6 +401,7 @@ public class ConfigHandler { tf.oruoToggled = getBoolean("toggles", "OruoPuzzle"); tf.blazeToggled = getBoolean("toggles", "BlazePuzzle"); tf.creeperToggled = getBoolean("toggles", "CreeperPuzzle"); + tf.waterToggled = getBoolean("toggles", "WaterPuzzle"); final BlockSlayerCommand bs = new BlockSlayerCommand(); String onlySlayer = getString("toggles", "BlockSlayer"); -- cgit From b8481811e5e25f2a710053444347295010a6155c Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Fri, 20 Nov 2020 14:44:10 -0500 Subject: Change chat maddox to anywhere while chat is open, fix some dungeon loot Move Adaptive Blade to F2 loot Add Last Breath to F5 loot --- src/main/java/me/Danker/handlers/ConfigHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 408849c..5a59308 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -319,6 +319,7 @@ public class ConfigHandler { 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); @@ -338,7 +339,6 @@ public class ConfigHandler { 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", "trueChatMaddoxEnabled")) writeBooleanConfig("misc", "trueChatMaddoxEnabled", true); if (!hasKey("misc", "cakeTime")) writeDoubleConfig("misc", "cakeTime", 0); ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft()); @@ -527,6 +527,7 @@ public class ConfigHandler { 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"); @@ -547,7 +548,6 @@ public class ConfigHandler { ds.display = getString("misc", "display"); ds.auto = getBoolean("misc", "autoDisplay"); TheMod.SKILL_TIME = getInt("misc", "skill50Time") * 20; - tf.trueChatMaddoxEnabled = getBoolean("misc", "trueChatMaddoxEnabled"); TheMod.cakeTime = getDouble("misc", "cakeTime"); final MoveCommand moc = new MoveCommand(); -- cgit From 43c6b9c0387eb0294d12f9de22baad7f9235b86f Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Sat, 21 Nov 2020 19:16:08 -0500 Subject: Access static methods in static ways and remove unused imports --- src/main/java/me/Danker/handlers/APIHandler.java | 1 - .../java/me/Danker/handlers/ConfigHandler.java | 335 ++++++++++----------- 2 files changed, 165 insertions(+), 171 deletions(-) (limited to 'src/main/java/me/Danker/handlers') 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"); -- cgit From b89d16855374a3e75c4c1279226d23d923821084 Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Sun, 22 Nov 2020 19:19:35 -0500 Subject: Add F7 tracker --- .../java/me/Danker/handlers/ConfigHandler.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 08a78c4..6318abb 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -335,6 +335,19 @@ public class ConfigHandler { 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", "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); @@ -540,6 +553,19 @@ public class ConfigHandler { LootCommand.necroSwords = getInt("catacombs", "necroSword"); LootCommand.f6CoinsSpent = getDouble("catacombs", "floorSixCoins"); LootCommand.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.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"); // Misc DisplayCommand.display = getString("misc", "display"); -- cgit From ea9c0616fd3406c3a93995f6ab28309fe6cd8e05 Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Mon, 23 Nov 2020 09:57:06 -0500 Subject: Add skill xp/hour tracker, add Necron's Handle and bug fixes Fix F7 loot not saving to config Fix water puzzle variant 3 solution --- src/main/java/me/Danker/handlers/ConfigHandler.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 6318abb..b9bc860 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -341,6 +341,7 @@ public class ConfigHandler { 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); @@ -353,6 +354,7 @@ public class ConfigHandler { 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); ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft()); int height = scaled.getScaledHeight(); @@ -368,12 +370,15 @@ public class ConfigHandler { 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("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("colors", "main")) writeStringConfig("colors", "main", "" + EnumChatFormatting.GREEN); if (!hasKey("colors", "secondary")) writeStringConfig("colors", "secondary", "" + EnumChatFormatting.DARK_GREEN); @@ -386,6 +391,7 @@ public class ConfigHandler { if (!hasKey("colors", "skill50Display")) writeStringConfig("colors", "skill50Display", "" + EnumChatFormatting.AQUA); if (!hasKey("colors", "coordsDisplay")) writeStringConfig("colors", "coordsDisplay", "" + EnumChatFormatting.WHITE); if (!hasKey("colors", "cakeDisplay")) writeStringConfig("colors", "cakeDisplay", "" + EnumChatFormatting.GOLD); + if (!hasKey("colors", "skillTracker")) writeStringConfig("colors", "skillTracker", "" + EnumChatFormatting.AQUA); ToggleCommand.gpartyToggled = getBoolean("toggles", "GParty"); ToggleCommand.coordsToggled = getBoolean("toggles", "Coords"); @@ -559,6 +565,7 @@ public class ConfigHandler { 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"); @@ -572,6 +579,7 @@ public class ConfigHandler { DisplayCommand.auto = getBoolean("misc", "autoDisplay"); TheMod.SKILL_TIME = getInt("misc", "skill50Time") * 20; TheMod.cakeTime = getDouble("misc", "cakeTime"); + TheMod.showSkillTracker = getBoolean("misc", "showSkillTracker"); MoveCommand.coordsXY[0] = getInt("locations", "coordsX"); MoveCommand.coordsXY[1] = getInt("locations", "coordsY"); @@ -585,6 +593,8 @@ public class ConfigHandler { MoveCommand.lividHpXY[1] = getInt("locations", "lividHpY"); MoveCommand.cakeTimerXY[0] = getInt("locations", "cakeTimerX"); MoveCommand.cakeTimerXY[1] = getInt("locations", "cakeTimerY"); + MoveCommand.skillTrackerXY[0] = getInt("locations", "skillTrackerX"); + MoveCommand.skillTrackerXY[1] = getInt("locations", "skillTrackerY"); ScaleCommand.coordsScale = getDouble("scales", "coordsScale"); ScaleCommand.displayScale = getDouble("scales", "displayScale"); @@ -592,6 +602,7 @@ public class ConfigHandler { ScaleCommand.skill50Scale = getDouble("scales", "skill50Scale"); ScaleCommand.lividHpScale = getDouble("scales", "lividHpScale"); ScaleCommand.cakeTimerScale = getDouble("scales", "cakeTimerScale"); + ScaleCommand.skillTrackerScale = getDouble("scales", "skillTrackerScale"); TheMod.MAIN_COLOUR = getString("colors", "main"); TheMod.SECONDARY_COLOUR = getString("colors", "secondary"); @@ -604,6 +615,7 @@ public class ConfigHandler { TheMod.SKILL_50_COLOUR = getString("colors", "skill50Display"); TheMod.COORDS_COLOUR = getString("colors", "coordsDisplay"); TheMod.CAKE_COLOUR = getString("colors", "cakeDisplay"); + TheMod.SKILL_TRACKER_COLOUR = getString("colors", "skillTracker"); } } -- cgit From 1850983cc3b17e64974ebcadcca1bda5edf4db23 Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Tue, 24 Nov 2020 22:00:58 -0500 Subject: Add mythological event tracker that *might* work, bug fixes and changes Fix Wither Cloak triggering creeper solver Update README with more better information Replace most else ifs with switch statements Add Necron's Handle to /resetloot catacombs Update trivia answers --- .../java/me/Danker/handlers/ConfigHandler.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index b9bc860..8cfc9bf 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -284,6 +284,18 @@ public class ConfigHandler { 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); @@ -508,6 +520,18 @@ public class ConfigHandler { LootCommand.phantomFishers = getInt("fishing", "phantomFisher"); LootCommand.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"); + // Dungeons LootCommand.recombobulators = getInt("catacombs", "recombobulator"); LootCommand.fumingPotatoBooks = getInt("catacombs", "fumingBooks"); -- cgit From 8b78e680240a20d1b44c03f6bbcbb42b36a02827 Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Wed, 25 Nov 2020 22:55:50 -0500 Subject: Add low health alerts --- src/main/java/me/Danker/handlers/ConfigHandler.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 8cfc9bf..c5ede0c 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -193,6 +193,7 @@ public class ConfigHandler { if (!hasKey("toggles", "MidasStaffMessages")) writeBooleanConfig("toggles", "MidasStaffMessages", true); if (!hasKey("toggles", "HealMessages")) writeBooleanConfig("toggles", "HealMessages", true); if (!hasKey("toggles", "CakeTimer")) writeBooleanConfig("toggles", "CakeTimer", false); + if (!hasKey("toggles", "LowHealthNotify")) writeBooleanConfig("toggles", "LowHealthNotify", false); if (!hasKey("toggles", "LividSolver")) writeBooleanConfig("toggles", "LividSolver", false); // Puzzle Solvers if (!hasKey("toggles", "ThreeManPuzzle")) writeBooleanConfig("toggles", "ThreeManPuzzle", false); @@ -425,6 +426,7 @@ public class ConfigHandler { ToggleCommand.midasStaffMessages = getBoolean("toggles", "MidasStaffMessages"); ToggleCommand.healMessages = getBoolean("toggles", "HealMessages"); ToggleCommand.cakeTimerToggled = getBoolean("toggles", "CakeTimer"); + ToggleCommand.lowHealthNotifyToggled = getBoolean("toggles", "LowHealthNotify"); ToggleCommand.lividSolverToggled = getBoolean("toggles", "LividSolver"); // Puzzle Solvers ToggleCommand.threeManToggled = getBoolean("toggles", "ThreeManPuzzle"); -- cgit From 7d642a6baf59b98a63eaf15e4ba59f6a5210db8c Mon Sep 17 00:00:00 2001 From: bowser0000 Date: Thu, 26 Nov 2020 13:46:15 -0500 Subject: Possibly fix blaze hitbox issues, add more colours to config Add lowest/highest blaze colours to config Remove chat message for trivia --- .../java/me/Danker/handlers/ConfigHandler.java | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'src/main/java/me/Danker/handlers') diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index c5ede0c..c680716 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -393,18 +393,21 @@ public class ConfigHandler { if (!hasKey("scales", "cakeTimerScale")) writeDoubleConfig("scales", "cakeTimerScale", 1); if (!hasKey("scales", "skillTrackerScale")) writeDoubleConfig("scales", "skillTrackerScale", 1); - if (!hasKey("colors", "main")) writeStringConfig("colors", "main", "" + EnumChatFormatting.GREEN); - if (!hasKey("colors", "secondary")) writeStringConfig("colors", "secondary", "" + EnumChatFormatting.DARK_GREEN); - if (!hasKey("colors", "delimiter")) writeStringConfig("colors", "delimiter", "" + EnumChatFormatting.AQUA); - if (!hasKey("colors", "error")) writeStringConfig("colors", "error", "" + EnumChatFormatting.RED); - if (!hasKey("colors", "type")) writeStringConfig("colors", "type", "" + EnumChatFormatting.GREEN); - if (!hasKey("colors", "value")) writeStringConfig("colors", "value", "" + EnumChatFormatting.DARK_GREEN); - if (!hasKey("colors", "skillAverage")) writeStringConfig("colors", "skillAverage", "" + EnumChatFormatting.GOLD); - if (!hasKey("colors", "answer")) writeStringConfig("colors", "answer", "" + EnumChatFormatting.DARK_GREEN); - if (!hasKey("colors", "skill50Display")) writeStringConfig("colors", "skill50Display", "" + EnumChatFormatting.AQUA); - if (!hasKey("colors", "coordsDisplay")) writeStringConfig("colors", "coordsDisplay", "" + EnumChatFormatting.WHITE); - if (!hasKey("colors", "cakeDisplay")) writeStringConfig("colors", "cakeDisplay", "" + EnumChatFormatting.GOLD); - if (!hasKey("colors", "skillTracker")) writeStringConfig("colors", "skillTracker", "" + EnumChatFormatting.AQUA); + 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()); + 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", "blazeLowest")) writeIntConfig("colors", "blazeLowest", 0xFF0000); + if (!hasKey("colors", "blazeHighest")) writeIntConfig("colors", "blazeHighest", 0x40FF40); ToggleCommand.gpartyToggled = getBoolean("toggles", "GParty"); ToggleCommand.coordsToggled = getBoolean("toggles", "Coords"); @@ -642,6 +645,9 @@ public class ConfigHandler { TheMod.COORDS_COLOUR = getString("colors", "coordsDisplay"); TheMod.CAKE_COLOUR = getString("colors", "cakeDisplay"); TheMod.SKILL_TRACKER_COLOUR = getString("colors", "skillTracker"); + TheMod.TRIVIA_WRONG_ANSWER_COLOUR = getString("colors", "triviaWrongAnswer"); + TheMod.LOWEST_BLAZE_COLOUR = getInt("colors", "blazeLowest"); + TheMod.HIGHEST_BLAZE_COLOUR = getInt("colors", "blazeHighest"); } } -- cgit