Merge branch 'development' into development

3 files changed, 39 insertions, 7 deletions

diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index f4319a8..06c50d0 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -76,6 +76,7 @@ public class DankerGui extends GuiScreen {
 	private GuiButton hidePetCandy;
 	private GuiButton highlightCommissions;
 	private GuiButton customColouredNames;
+	private GuiButton customNametags;
 	private GuiButton endOfFarmAlert;
 	private GuiButton gemstoneLore;
 	private GuiButton autoAcceptReparty;
@@ -92,6 +93,9 @@ public class DankerGui extends GuiScreen {
 	private GuiButton hideArmour;
 	private GuiButton autoJoinSkyblock;
 	private GuiButton firePillar;
+	private GuiButton fishingAlert;
+	private GuiButton minionLastCollected;
+	private GuiButton showTrophyCompletion;
 	// Chat Messages
 	private GuiButton sceptreMessages;
 	private GuiButton midasStaffMessages;
@@ -179,6 +183,7 @@ public class DankerGui extends GuiScreen {
 		hidePetCandy = new FeatureButton("Hide Pet Candy: " + Utils.getColouredBoolean(ToggleCommand.hidePetCandy), "Hide pet candy in pet tooltips.");
 		highlightCommissions = new FeatureButton("Highlight Commissions: " + Utils.getColouredBoolean(ToggleCommand.highlightCommissions), "Show which commissions are completed.");
 		customColouredNames = new FeatureButton("Custom Name Colors: " + Utils.getColouredBoolean(ToggleCommand.customColouredNames), "Replaces some player's usernames with a custom color.");
+		customNametags = new FeatureButton("Custom Color on Nametags: " + Utils.getColouredBoolean(ToggleCommand.customNametags), "Displays custom name colors on nametags. Disabling will increase performance with custom colors.");
 		endOfFarmAlert = new FeatureButton("Alert When Reaching End of Farm: " + Utils.getColouredBoolean(ToggleCommand.endOfFarmAlert), "Alerts when you go past coords set with /dsmfarmlength.");
 		gemstoneLore = new FeatureButton("Applied Gemstones in Lore: " + Utils.getColouredBoolean(ToggleCommand.gemstoneLore), "Adds applied gemstones to item tooltip.");
 		autoAcceptReparty = new FeatureButton("Auto Accept Reparty: " + Utils.getColouredBoolean(ToggleCommand.autoAcceptReparty), "Automatically rejoins parties when disbanded and invited.");
@@ -187,6 +192,9 @@ public class DankerGui extends GuiScreen {
 		hideArmour = new FeatureButton("Hide Player Armour: " + Utils.getColouredBoolean(ToggleCommand.hideArmour), "Makes player armour invisible, showing their skin.");
 		autoJoinSkyblock = new FeatureButton("Automatically Join Skyblock: " + Utils.getColouredBoolean(ToggleCommand.autoJoinSkyblock), "Automatically join Skyblock when you join Hypixel.\nYou have an addiction.");
 		firePillar = new FeatureButton("Fire Pillar Display: " + Utils.getColouredBoolean(ToggleCommand.firePillar), "Displays blaze fire pillar text on screen");
+		fishingAlert = new FeatureButton("Fishing Spawn Alerts: " + Utils.getColouredBoolean(ToggleCommand.fishingAlert), "Alerts when a Thunder or Lord Jawbus spawns nearby");
+		minionLastCollected = new FeatureButton("Show When Minion Last Collected: " + Utils.getColouredBoolean(ToggleCommand.minionLastCollected), "Displays when a minion was last collected over the minion.");
+		showTrophyCompletion = new FeatureButton("Show Trophy Fish Completion: " + Utils.getColouredBoolean(ToggleCommand.showTrophyCompletion), "Show completion instead of count in trophy fish tracker display.");
 
 		allButtons.clear();
 		allButtons.add(changeDisplay);
@@ -240,6 +248,7 @@ public class DankerGui extends GuiScreen {
 		allButtons.add(hidePetCandy);
 		allButtons.add(highlightCommissions);
 		allButtons.add(customColouredNames);
+		allButtons.add(customNametags);
 		allButtons.add(endOfFarmAlert);
 		allButtons.add(gemstoneLore);
 		allButtons.add(autoAcceptReparty);
@@ -248,6 +257,9 @@ public class DankerGui extends GuiScreen {
 		allButtons.add(hideArmour);
 		allButtons.add(autoJoinSkyblock);
 		allButtons.add(firePillar);
+		allButtons.add(fishingAlert);
+		allButtons.add(minionLastCollected);
+		allButtons.add(showTrophyCompletion);
 
 		search.setText(initSearchText);
 		search.setVisible(true);
@@ -545,6 +557,22 @@ public class DankerGui extends GuiScreen {
 			ToggleCommand.firePillar = !ToggleCommand.firePillar;
 			ConfigHandler.writeBooleanConfig("toggles", "FirePillar", ToggleCommand.firePillar);
 			firePillar.displayString = "Fire Pillar Display: " + Utils.getColouredBoolean(ToggleCommand.firePillar);
+		} else if (button == fishingAlert) {
+			ToggleCommand.fishingAlert = !ToggleCommand.fishingAlert;
+			ConfigHandler.writeBooleanConfig("toggles", "FishingAlert", ToggleCommand.fishingAlert);
+			fishingAlert.displayString = "Fishing Spawn Alerts: " + Utils.getColouredBoolean(ToggleCommand.fishingAlert);
+		} else if (button == customNametags) {
+			ToggleCommand.customNametags = !ToggleCommand.customNametags;
+			ConfigHandler.writeBooleanConfig("toggles", "CustomNametags", ToggleCommand.customNametags);
+			customNametags.displayString = "Custom Color on Nametags: " + Utils.getColouredBoolean(ToggleCommand.customNametags);
+		} else if (button == minionLastCollected) {
+			ToggleCommand.minionLastCollected = !ToggleCommand.minionLastCollected;
+			ConfigHandler.writeBooleanConfig("toggles", "MinionLastCollected", ToggleCommand.minionLastCollected);
+			minionLastCollected.displayString = "Show When Minion Last Collected: " + Utils.getColouredBoolean(ToggleCommand.minionLastCollected);
+		} else if (button == showTrophyCompletion) {
+			ToggleCommand.showTrophyCompletion = !ToggleCommand.showTrophyCompletion;
+			ConfigHandler.writeBooleanConfig("toggles", "ShowTrophyCompletion", ToggleCommand.showTrophyCompletion);
+			showTrophyCompletion.displayString = "Show Trophy Fish Completion: " + Utils.getColouredBoolean(ToggleCommand.showTrophyCompletion);
 		}
 	}
 
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index b8be3d6..f7fd2f3 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -28,6 +28,7 @@ public class DisplayGui extends GuiScreen {
 	private GuiButton fishingSpooky;
 	private GuiButton fishingCH;
 	private GuiButton fishingLava;
+	private GuiButton fishingTrophy;
 	private GuiButton catacombsF1;
 	private GuiButton catacombsF2;
 	private GuiButton catacombsF3;
@@ -61,12 +62,13 @@ public class DisplayGui extends GuiScreen {
 		wolf = new GuiButton(0, width / 2 - 50, (int) (height * 0.35), 100, 20, "Wolf");
 		enderman = new GuiButton(0, width / 2 + 60, (int) (height * 0.35), 100, 20, "Enderman");
 		blaze = new GuiButton(0, width / 2 + 170, (int) (height * 0.35), 100, 20, "Blaze");
-		fishing = new GuiButton(0, width / 2 - 295, (int) (height * 0.5), 90, 20, "Fishing");
-		fishingWinter = new GuiButton(0, width / 2 - 195, (int) (height * 0.5), 90, 20, "Fishing Winter");
-		fishingFestival = new GuiButton(0, width / 2 - 95, (int) (height * 0.5), 90, 20, "Fishing Festival");
-		fishingSpooky = new GuiButton(0, width / 2 + 5, (int) (height * 0.5), 90, 20, "Fishing Spooky");
-		fishingCH = new GuiButton(0, width / 2 + 105, (int) (height * 0.5), 90, 20, "CH Fishing");
-		fishingLava = new GuiButton(0, width / 2 + 205, (int) (height * 0.5), 90, 20, "Lava Fishing");
+		fishing = new GuiButton(0, width / 2 - 310, (int) (height * 0.5), 80, 20, "Fishing");
+		fishingWinter = new GuiButton(0, width / 2 - 220, (int) (height * 0.5), 80, 20, "Fishing Winter");
+		fishingFestival = new GuiButton(0, width / 2 - 130, (int) (height * 0.5), 80, 20, "Fishing Festival");
+		fishingSpooky = new GuiButton(0, width / 2 - 40, (int) (height * 0.5), 80, 20, "Fishing Spooky");
+		fishingCH = new GuiButton(0, width / 2 + 50, (int) (height * 0.5), 80, 20, "CH Fishing");
+		fishingLava = new GuiButton(0, width / 2 + 140, (int) (height * 0.5), 80, 20, "Lava Fishing");
+		fishingTrophy = new GuiButton(0, width / 2 + 230, (int) (height * 0.5), 80, 20, "Fishing Trophy");
 		catacombsF1 = new GuiButton(0, width / 2 - 235, (int) (height * 0.65), 50, 20, "F1");
 		catacombsF2 = new GuiButton(0, width / 2 - 175, (int) (height * 0.65), 50, 20, "F2");
 		catacombsF3 = new GuiButton(0, width / 2 - 115, (int) (height * 0.65), 50, 20, "F3");
@@ -92,6 +94,7 @@ public class DisplayGui extends GuiScreen {
 		this.buttonList.add(fishingSpooky);
 		this.buttonList.add(fishingCH);
 		this.buttonList.add(fishingLava);
+		this.buttonList.add(fishingTrophy);
 		this.buttonList.add(catacombsF1);
 		this.buttonList.add(catacombsF2);
 		this.buttonList.add(catacombsF3);
@@ -153,6 +156,8 @@ public class DisplayGui extends GuiScreen {
 			setDisplay("fishing_ch");
 		} else if (button == fishingLava) {
 			setDisplay("fishing_lava");
+		} else if (button == fishingTrophy) {
+			setDisplay("fishing_trophy");
 		} else if (button == mythological) {
 			setDisplay("mythological");
 		} else if (button == catacombsF1) {
diff --git a/src/main/java/me/Danker/gui/alerts/AlertActionGui.java b/src/main/java/me/Danker/gui/alerts/AlertActionGui.java
index 4853ac1..02c3d3b 100644
--- a/src/main/java/me/Danker/gui/alerts/AlertActionGui.java
+++ b/src/main/java/me/Danker/gui/alerts/AlertActionGui.java
@@ -1,7 +1,6 @@
 package me.Danker.gui.alerts;
 
 import me.Danker.features.Alerts;
-import me.Danker.handlers.TextRenderer;
 import me.Danker.utils.RenderUtils;
 import me.Danker.utils.Utils;
 import net.minecraft.client.Minecraft;