Add giant hp display

Also make LocationButton easy to add

3 files changed, 53 insertions, 24 deletions

diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 4797343..cc33514 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -64,6 +64,7 @@ public class DankerGui extends GuiScreen {
 	private GuiButton highlightSlayer;
 	private GuiButton highlightSkeletonMasters;
 	private GuiButton teammatesInRadius;
+	private GuiButton giantHP;
 	// Chat Messages
 	private GuiButton sceptreMessages;
 	private GuiButton midasStaffMessages;
@@ -149,6 +150,7 @@ public class DankerGui extends GuiScreen {
 		highlightSlayer = new FeatureButton("Highlight Slayer: " + Utils.getColouredBoolean(ToggleCommand.highlightSlayers), "Highlights Slayer bosses.");
 		highlightSkeletonMasters = new FeatureButton("Highlight Skeleton Masters: " + Utils.getColouredBoolean(ToggleCommand.highlightSkeletonMasters), "Highlights Skeleton Masters.");
 		teammatesInRadius = new FeatureButton("Display Players in 30 Block Radius: " + Utils.getColouredBoolean(ToggleCommand.teammatesInRadius), "Displays dungeon teammates in 30 block radius for tether and diversion.");
+		giantHP = new FeatureButton("Display Giant HP: " + Utils.getColouredBoolean(ToggleCommand.giantHP), "Displays health of Sadan's giants during F6 bossfight and F7 blood room.");
 
 		allButtons.clear();
 		allButtons.add(changeDisplay);
@@ -192,6 +194,7 @@ public class DankerGui extends GuiScreen {
 		allButtons.add(highlightSlayer);
 		allButtons.add(highlightSkeletonMasters);
 		allButtons.add(teammatesInRadius);
+		allButtons.add(giantHP);
 
 		search.setText(initSearchText);
 		search.setVisible(true);
@@ -426,6 +429,10 @@ public class DankerGui extends GuiScreen {
 			ToggleCommand.teammatesInRadius = !ToggleCommand.teammatesInRadius;
 			ConfigHandler.writeBooleanConfig("toggles", "TeammatesInRadius", ToggleCommand.teammatesInRadius);
 			teammatesInRadius.displayString = "Display Players in 30 Block Radius: " + Utils.getColouredBoolean(ToggleCommand.teammatesInRadius);
+		} else if (button == giantHP) {
+			ToggleCommand.giantHP = !ToggleCommand.giantHP;
+			ConfigHandler.writeBooleanConfig("toggles", "GiantHP", ToggleCommand.giantHP);
+			giantHP.displayString = "Display Giant HP: " + Utils.getColouredBoolean(ToggleCommand.giantHP);
 		}
 	}
 
diff --git a/src/main/java/me/Danker/gui/EditLocationsGui.java b/src/main/java/me/Danker/gui/EditLocationsGui.java
index c263d5a..2c8b336 100644
--- a/src/main/java/me/Danker/gui/EditLocationsGui.java
+++ b/src/main/java/me/Danker/gui/EditLocationsGui.java
@@ -1,5 +1,6 @@
 package me.Danker.gui;
 
+import javafx.scene.transform.Scale;
 import me.Danker.DankersSkyblockMod;
 import me.Danker.commands.MoveCommand;
 import me.Danker.commands.ScaleCommand;
@@ -32,6 +33,7 @@ public class EditLocationsGui extends GuiScreen {
 	private LocationButton bonzoTimer;
 	private LocationButton golemTimer;
 	private LocationButton teammatesInRadius;
+	private LocationButton giantHP;
 	
 	@Override
 	public boolean doesGuiPauseGame() {
@@ -95,18 +97,24 @@ public class EditLocationsGui extends GuiScreen {
 									   EnumChatFormatting.GREEN + "Not_A_Neko\n" +
 									   EnumChatFormatting.GREEN + "Minikloon";
 
-		// ive lost my marbles
-		display = new LocationButton(0, MoveCommand.displayXY[0], MoveCommand.displayXY[1], 145 * ScaleCommand.displayScale, 102 * ScaleCommand.displayScale, ScaleCommand.displayScale, displayText, displayNums, 110);
-		dungeonTimer = new LocationButton(0, MoveCommand.dungeonTimerXY[0], MoveCommand.dungeonTimerXY[1], 113 * ScaleCommand.dungeonTimerScale, 57 * ScaleCommand.dungeonTimerScale, ScaleCommand.dungeonTimerScale, dungeonTimerText, dungeonTimerNums, 80);
-		coords = new LocationButton(0, MoveCommand.coordsXY[0], MoveCommand.coordsXY[1], 141 * ScaleCommand.coordsScale, 12 * ScaleCommand.coordsScale, ScaleCommand.coordsScale, NoF3Coords.COORDS_COLOUR + "74 / 14 / -26 (141.1 / 6.7)", null, null);
-		skill50 = new LocationButton(0, MoveCommand.skill50XY[0], MoveCommand.skill50XY[1], 233 * ScaleCommand.skill50Scale, 12 * ScaleCommand.skill50Scale, ScaleCommand.skill50Scale, Skill50Display.SKILL_50_COLOUR + "+3.5 Farming (28,882,117.7/55,172,425) 52.34%", null, null);
-		lividHP = new LocationButton(0, MoveCommand.lividHpXY[0], MoveCommand.lividHpXY[1], 85 * ScaleCommand.lividHpScale, 12 * ScaleCommand.lividHpScale, ScaleCommand.lividHpScale, EnumChatFormatting.WHITE + "﴾ Livid " + EnumChatFormatting.YELLOW + "6.9M" + EnumChatFormatting.RED + "❤ " + EnumChatFormatting.WHITE + "﴿", null, null);
-		cakeTimer = new LocationButton(0, MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1] + 5, 85 * ScaleCommand.cakeTimerScale, 18 * ScaleCommand.cakeTimerScale, ScaleCommand.cakeTimerScale, CakeTimer.CAKE_COLOUR + "     11h16m", null, null);
-		skillTracker = new LocationButton(0, MoveCommand.skillTrackerXY[0], MoveCommand.skillTrackerXY[1], 150 * ScaleCommand.skillTrackerScale, 28 * ScaleCommand.skillTrackerScale, ScaleCommand.skillTrackerScale, skillTrackerText, null, null);
-		waterAnswer = new LocationButton(0, MoveCommand.waterAnswerXY[0], MoveCommand.waterAnswerXY[1], 190 * ScaleCommand.waterAnswerScale, 54 * ScaleCommand.waterAnswerScale, ScaleCommand.waterAnswerScale, waterAnswerText, null, null);
-		bonzoTimer = new LocationButton(0, MoveCommand.bonzoTimerXY[0], MoveCommand.bonzoTimerXY[1] + 5, 53 * ScaleCommand.bonzoTimerScale, 18 * ScaleCommand.bonzoTimerScale, ScaleCommand.bonzoTimerScale, BonzoMaskTimer.BONZO_COLOR + "     3m30s", null, null);
-		golemTimer = new LocationButton(0, MoveCommand.golemTimerXY[0], MoveCommand.golemTimerXY[1] + 5, 42 * ScaleCommand.golemTimerScale, 18 * ScaleCommand.golemTimerScale, ScaleCommand.golemTimerScale, GolemSpawningAlert.GOLEM_COLOUR + "     20s", null, null);
-		teammatesInRadius = new LocationButton(0, MoveCommand.teammatesInRadiusXY[0], MoveCommand.teammatesInRadiusXY[1], 107 * ScaleCommand.teammatesInRadiusScale, 45 * ScaleCommand.teammatesInRadiusScale, ScaleCommand.teammatesInRadiusScale, teammatesInRadiusText, null, null);
+		String giantHPText = EnumChatFormatting.DARK_RED + "L.A.S.R. " + EnumChatFormatting.GREEN + "25M" + EnumChatFormatting.RED + "❤\n" +
+							 EnumChatFormatting.RED + "Bigfoot " + EnumChatFormatting.GREEN + "25M" + EnumChatFormatting.RED + "❤\n" +
+							 EnumChatFormatting.LIGHT_PURPLE + "Jolly Pink Giant " + EnumChatFormatting.GREEN + "25M" + EnumChatFormatting.RED + "❤\n" +
+							 EnumChatFormatting.DARK_AQUA + "The Diamond Giant " + EnumChatFormatting.GREEN + "25M" + EnumChatFormatting.RED + "❤";
+
+
+		display = new LocationButton(MoveCommand.displayXY[0], MoveCommand.displayXY[1], ScaleCommand.displayScale, displayText, displayNums, 110);
+		dungeonTimer = new LocationButton(MoveCommand.dungeonTimerXY[0], MoveCommand.dungeonTimerXY[1], ScaleCommand.dungeonTimerScale, dungeonTimerText, dungeonTimerNums, 80);
+		coords = new LocationButton(MoveCommand.coordsXY[0], MoveCommand.coordsXY[1], ScaleCommand.coordsScale, NoF3Coords.COORDS_COLOUR + "74 / 14 / -26 (141.1 / 6.7)", null, null);
+		skill50 = new LocationButton(MoveCommand.skill50XY[0], MoveCommand.skill50XY[1], ScaleCommand.skill50Scale, Skill50Display.SKILL_50_COLOUR + "+3.5 Farming (28,882,117.7/55,172,425) 52.34%", null, null);
+		lividHP = new LocationButton(MoveCommand.lividHpXY[0], MoveCommand.lividHpXY[1], ScaleCommand.lividHpScale, EnumChatFormatting.WHITE + "﴾ Livid " + EnumChatFormatting.YELLOW + "6.9M" + EnumChatFormatting.RED + "❤ " + EnumChatFormatting.WHITE + "﴿", null, null);
+		cakeTimer = new LocationButton(MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1] + 5, ScaleCommand.cakeTimerScale, CakeTimer.CAKE_COLOUR + "     11h16m", null, null);
+		skillTracker = new LocationButton(MoveCommand.skillTrackerXY[0], MoveCommand.skillTrackerXY[1], ScaleCommand.skillTrackerScale, skillTrackerText, null, null);
+		waterAnswer = new LocationButton(MoveCommand.waterAnswerXY[0], MoveCommand.waterAnswerXY[1], ScaleCommand.waterAnswerScale, waterAnswerText, null, null);
+		bonzoTimer = new LocationButton(MoveCommand.bonzoTimerXY[0], MoveCommand.bonzoTimerXY[1] + 5, ScaleCommand.bonzoTimerScale, BonzoMaskTimer.BONZO_COLOR + "     3m30s", null, null);
+		golemTimer = new LocationButton(MoveCommand.golemTimerXY[0], MoveCommand.golemTimerXY[1] + 5, ScaleCommand.golemTimerScale, GolemSpawningAlert.GOLEM_COLOUR + "     20s", null, null);
+		teammatesInRadius = new LocationButton(MoveCommand.teammatesInRadiusXY[0], MoveCommand.teammatesInRadiusXY[1], ScaleCommand.teammatesInRadiusScale, teammatesInRadiusText, null, null);
+		giantHP = new LocationButton(MoveCommand.giantHPXY[0], MoveCommand.giantHPXY[1], ScaleCommand.giantHPScale, giantHPText, null, null);
 
 		this.buttonList.add(coords);
 		this.buttonList.add(dungeonTimer);
@@ -119,6 +127,7 @@ public class EditLocationsGui extends GuiScreen {
 		this.buttonList.add(skill50);
 		this.buttonList.add(golemTimer);
 		this.buttonList.add(teammatesInRadius);
+		this.buttonList.add(giantHP);
 	}
 	
 	@Override
@@ -222,6 +231,12 @@ public class EditLocationsGui extends GuiScreen {
 					teammatesInRadius.xPosition = MoveCommand.teammatesInRadiusXY[0];
 					teammatesInRadius.yPosition = MoveCommand.teammatesInRadiusXY[1];
 					break;
+				case "giantHP":
+					MoveCommand.giantHPXY[0] += xMoved;
+					MoveCommand.giantHPXY[1] += yMoved;
+					giantHP.xPosition = MoveCommand.giantHPXY[0];
+					giantHP.yPosition = MoveCommand.giantHPXY[1];
+					break;
 			}
 			this.buttonList.clear();
 			initGui();
@@ -256,6 +271,8 @@ public class EditLocationsGui extends GuiScreen {
 				moving = "golemTimer";
 			} else if (button == teammatesInRadius) {
 				moving = "teammatesInRadius";
+			} else if (button == giantHP) {
+				moving = "giantHP";
 			}
 		}
 	}
@@ -286,6 +303,8 @@ public class EditLocationsGui extends GuiScreen {
 		ConfigHandler.writeIntConfig("locations", "golemTimerY", MoveCommand.golemTimerXY[1]);
 		ConfigHandler.writeIntConfig("locations", "teammatesInRadiusX", MoveCommand.teammatesInRadiusXY[0]);
 		ConfigHandler.writeIntConfig("locations", "teammatesInRadiusY", MoveCommand.teammatesInRadiusXY[1]);
+		ConfigHandler.writeIntConfig("locations", "giantHPX", MoveCommand.giantHPXY[0]);
+		ConfigHandler.writeIntConfig("locations", "giantHPY", MoveCommand.giantHPXY[1]);
 	}
 	
 }
diff --git a/src/main/java/me/Danker/gui/buttons/LocationButton.java b/src/main/java/me/Danker/gui/buttons/LocationButton.java
index a8937fd..f328c58 100644
--- a/src/main/java/me/Danker/gui/buttons/LocationButton.java
+++ b/src/main/java/me/Danker/gui/buttons/LocationButton.java
@@ -13,21 +13,17 @@ public class LocationButton extends GuiButton {
 	private String text;
 	private String text2;
 	private Integer text2Offset;
+	private int longestText;
 	
-	public LocationButton(int buttonId, int x, int y, double width, double height, double scale, String text, String text2, Integer text2Offset) {
-		super(buttonId, x, y, text);
+	public LocationButton(int x, int y, double scale, String text, String text2, Integer text2Offset) {
+		super(0, x, y, text);
 		this.x = x;
 		this.y = y;
-		this.width = (int) width;
-		this.height = (int) height;
 		this.scale = scale;
 		this.text = text;
 		this.text2 = text2;
 		this.text2Offset = text2Offset;
-	}
-	
-	@Override
-	public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+
 		String[] splitText;
 		if (text2 == null) {
 			splitText = text.split("\n");
@@ -37,16 +33,23 @@ public class LocationButton extends GuiButton {
 
 		int longestText = -1;
 		for (String s : splitText) {
-			int stringLength = mc.fontRendererObj.getStringWidth(s);
+			int stringLength = Minecraft.getMinecraft().fontRendererObj.getStringWidth(s);
 			if (stringLength > longestText) {
 				longestText = stringLength;
 			}
 		}
-		
+
+		this.longestText = longestText;
+		this.height = (int) ((splitText.length * 9 + 3) * scale);
+		this.width = (int) ((this.longestText + 3) * scale);
+	}
+	
+	@Override
+	public void drawButton(Minecraft mc, int mouseX, int mouseY) {
 		if (text2 == null) {
-			drawRect(x - 2, y - 2, (int) (x + longestText * scale + 3), (int) (y + (splitText.length * 9 + 3) * scale), 0x40D3D3D3);
+			drawRect(x - 2, y - 2, x + width, y + height, 0x40D3D3D3);
 		} else {
-			drawRect(x - 2, y - 2, (int) (x + (longestText + text2Offset) * scale + 3), (int) (y + (splitText.length * 9 + 3) * scale), 0x40D3D3D3);
+			drawRect(x - 2, y - 2, (int) (x + (longestText + text2Offset + 3) * scale), y + height, 0x40D3D3D3);
 			new TextRenderer(mc, text2, (int) (x + (text2Offset * scale)), y, scale);
 		}
 		new TextRenderer(mc, text, x, y, scale);