Add correct livid finder, change dungeon timer to only display in dungeons, bug fixes

Change jar encoding to UTF-8
Update /resetloot catacombs with F5 and F6
Fix Spirit Sceptre message hider
Remove debug message from fishing in Jerry Pond

2 files changed, 19 insertions, 0 deletions

diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 7316395..15e0fa5 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -46,6 +46,7 @@ public class DankerGui extends GuiScreen {
 	private GuiButton skill50Display;
 	private GuiButton outlineText;
 	private GuiButton midasStaffMessages;
+	private GuiButton lividSolver;
 	
 	public DankerGui(int page) {
 		this.page = page;
@@ -94,6 +95,7 @@ public class DankerGui extends GuiScreen {
 		golemAlerts = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Alert When Golem Spawns: " + Utils.getColouredBoolean(ToggleCommand.golemAlertToggled));
 		expertiseLore = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Expertise Kills In Lore: " + Utils.getColouredBoolean(ToggleCommand.expertiseLoreToggled));
 		skill50Display = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Display Progress To Skill Level 50: " + Utils.getColouredBoolean(ToggleCommand.skill50DisplayToggled));
+		lividSolver = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Find Correct Livid: " + Utils.getColouredBoolean(ToggleCommand.lividSolverToggled));
 		
 		if (page == 1) {
 			this.buttonList.add(changeDisplay);
@@ -121,6 +123,7 @@ public class DankerGui extends GuiScreen {
 			this.buttonList.add(golemAlerts);
 			this.buttonList.add(expertiseLore);
 			this.buttonList.add(skill50Display);
+			this.buttonList.add(lividSolver);
 			this.buttonList.add(backPage);
 		}
 		this.buttonList.add(githubLink);
@@ -228,6 +231,10 @@ public class DankerGui extends GuiScreen {
 			ToggleCommand.midasStaffMessages = !ToggleCommand.midasStaffMessages;
 			ConfigHandler.writeBooleanConfig("toggles", "MidasStaffMessages", ToggleCommand.midasStaffMessages);
 			midasStaffMessages.displayString = "Midas Staff Messages: " + Utils.getColouredBoolean(ToggleCommand.midasStaffMessages);
+		} else if (button == lividSolver) {
+			ToggleCommand.lividSolverToggled = !ToggleCommand.lividSolverToggled;
+			ConfigHandler.writeBooleanConfig("toggles", "LividSolver", ToggleCommand.lividSolverToggled);
+			lividSolver.displayString = "Find Correct Livid: " + Utils.getColouredBoolean(ToggleCommand.lividSolverToggled);
 		}
 	}
 	
diff --git a/src/main/java/me/Danker/gui/EditLocationsGui.java b/src/main/java/me/Danker/gui/EditLocationsGui.java
index 8fbc4cb..f8b6712 100644
--- a/src/main/java/me/Danker/gui/EditLocationsGui.java
+++ b/src/main/java/me/Danker/gui/EditLocationsGui.java
@@ -19,6 +19,7 @@ public class EditLocationsGui extends GuiScreen {
 	private LocationButton dungeonTimer;
 	private LocationButton coords;
 	private LocationButton skill50;
+	private LocationButton lividHP;
 	
 	@Override
 	public boolean doesGuiPauseGame() {
@@ -72,9 +73,11 @@ public class EditLocationsGui extends GuiScreen {
 		dungeonTimer = new LocationButton(0, moc.dungeonTimerXY[0], moc.dungeonTimerXY[1], 113 * sc.dungeonTimerScale, 57 * sc.dungeonTimerScale, sc.dungeonTimerScale, dungeonTimerText, dungeonTimerNums, 80);
 		coords = new LocationButton(0, moc.coordsXY[0], moc.coordsXY[1], 141 * sc.coordsScale, 12 * sc.coordsScale, sc.coordsScale, "74 / 14 / -26 (141.1 / 6.7)", null, null);
 		skill50 = new LocationButton(0, moc.skill50XY[0], moc.skill50XY[1], 233 * sc.skill50Scale, 12 * sc.skill50Scale, sc.skill50Scale, EnumChatFormatting.AQUA + "+3.5 Farming (28,882,117.7/55,172,425) 52.34%", null, null);
+		lividHP = new LocationButton(0, moc.lividHpXY[0], moc.lividHpXY[1], 85 * sc.lividHpScale, 12 * sc.lividHpScale, sc.lividHpScale, EnumChatFormatting.WHITE + "﴾ Livid " + EnumChatFormatting.YELLOW + "6.9M" + EnumChatFormatting.RED + "❤ " + EnumChatFormatting.WHITE + "﴿", null, null);
 		
 		this.buttonList.add(coords);
 		this.buttonList.add(dungeonTimer);
+		this.buttonList.add(lividHP);
 		this.buttonList.add(display);
 		this.buttonList.add(skill50);
 	}
@@ -111,6 +114,11 @@ public class EditLocationsGui extends GuiScreen {
 				MoveCommand.skill50XY[1] += yMoved;
 				skill50.xPosition = MoveCommand.skill50XY[0];
 				skill50.yPosition = MoveCommand.skill50XY[1];
+			} else if (moving.equals("lividHP")) {
+				MoveCommand.lividHpXY[0] += xMoved;
+				MoveCommand.lividHpXY[1] += yMoved;
+				lividHP.xPosition = MoveCommand.lividHpXY[0];
+				lividHP.yPosition = MoveCommand.lividHpXY[1];
 			}
 			this.buttonList.clear();
 			initGui();
@@ -131,6 +139,8 @@ public class EditLocationsGui extends GuiScreen {
 				moving = "coords";
 			} else if (button == skill50) {
 				moving = "skill50";
+			} else if (button == lividHP) {
+				moving = "lividHP";
 			}
 		}
 	}
@@ -147,6 +157,8 @@ public class EditLocationsGui extends GuiScreen {
 		ConfigHandler.writeIntConfig("locations", "dungeonTimerY", MoveCommand.dungeonTimerXY[1]);
 		ConfigHandler.writeIntConfig("locations", "skill50X", MoveCommand.skill50XY[0]);
 		ConfigHandler.writeIntConfig("locations", "skill50Y", MoveCommand.skill50XY[1]);
+		ConfigHandler.writeIntConfig("locations", "lividHpX", MoveCommand.lividHpXY[0]);
+		ConfigHandler.writeIntConfig("locations", "lividHpY", MoveCommand.lividHpXY[1]);
 	}
 	
 }