Merge pull request #55 from My-Name-Is-Jeff/development

Features & Changes: Necron Notifications, Bonzo Mask Timer, OldAnimationsMod detection + more

2 files changed, 56 insertions, 8 deletions

diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index dbb6c11..2860997 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -58,6 +58,9 @@ public class DankerGui extends GuiScreen {
 	private GuiButton flowerWeapons;
 	private GuiButton pickBlock;
 	private GuiButton notifySlayerSlain;
+	private GuiButton necronNotifications;
+	private GuiButton bonzoTimer;
+	private GuiButton blockBreakingFarms;
 	
 	public DankerGui(int page) {
 		this.page = page;
@@ -120,7 +123,11 @@ public class DankerGui extends GuiScreen {
 		watcherReadyMessage = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Display Watcher Ready Message: " + Utils.getColouredBoolean(ToggleCommand.watcherReadyToggled));
 		splitFishing = new GuiButton(0, width / 2 - 100, (int) (height * 0.3), "Split Fishing Display: " + Utils.getColouredBoolean(ToggleCommand.splitFishing));
 		notifySlayerSlain = new GuiButton(0, width / 2 - 100, (int) (height * 0.4), "Notify when Slayer Slain: " + Utils.getColouredBoolean(ToggleCommand.notifySlayerSlainToggled));
-    		flowerWeapons = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Prevent Placing FoT/Spirit Sceptre: " + Utils.getColouredBoolean(ToggleCommand.flowerWeaponsToggled));
+		flowerWeapons = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), "Prevent Placing FoT/Spirit Sceptre: " + Utils.getColouredBoolean(ToggleCommand.flowerWeaponsToggled));
+		necronNotifications = new GuiButton(0, width / 2 - 100, (int) (height * 0.6), "Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled));
+		bonzoTimer = new GuiButton(0, width / 2 - 100, (int) (height * 0.7), "Bonzo's Mask Timer: " + Utils.getColouredBoolean(ToggleCommand.bonzoTimerToggled));
+		//Page 6
+		blockBreakingFarms = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Prevent Breaking Farms: " + Utils.getColouredBoolean(ToggleCommand.blockBreakingFarmsToggled));
 
 		switch (page) {
 			case 1:
@@ -171,7 +178,14 @@ public class DankerGui extends GuiScreen {
 				this.buttonList.add(watcherReadyMessage);
 				this.buttonList.add(splitFishing);
 				this.buttonList.add(notifySlayerSlain);
-     				this.buttonList.add(flowerWeapons);
+				this.buttonList.add(flowerWeapons);
+				this.buttonList.add(necronNotifications);
+				this.buttonList.add(bonzoTimer);
+				this.buttonList.add(nextPage);
+				this.buttonList.add(backPage);
+				break;
+			case 6:
+				this.buttonList.add(blockBreakingFarms);
 				this.buttonList.add(backPage);
 				break;
 		}
@@ -184,7 +198,7 @@ public class DankerGui extends GuiScreen {
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 		this.drawDefaultBackground();
-		String pageText = "Page: " + page + "/5";
+		String pageText = "Page: " + page + "/6";
 		int pageWidth = mc.fontRendererObj.getStringWidth(pageText);
 		new TextRenderer(mc, pageText, width / 2 - pageWidth / 2, 10, 1D);
 		super.drawScreen(mouseX, mouseY, partialTicks);
@@ -324,6 +338,18 @@ public class DankerGui extends GuiScreen {
 			ToggleCommand.notifySlayerSlainToggled = !ToggleCommand.notifySlayerSlainToggled;
 			ConfigHandler.writeBooleanConfig("toggles", "NotifySlayerSlain", ToggleCommand.notifySlayerSlainToggled);
 			notifySlayerSlain.displayString = "Notify when Slayer Slain: " + Utils.getColouredBoolean(ToggleCommand.notifySlayerSlainToggled);
+		} else if (button == necronNotifications) {
+			ToggleCommand.necronNotificationsToggled = !ToggleCommand.necronNotificationsToggled;
+			ConfigHandler.writeBooleanConfig("toggles", "NecronNotifications", ToggleCommand.necronNotificationsToggled);
+			necronNotifications.displayString = "Necron Phase Notifications: " + Utils.getColouredBoolean(ToggleCommand.necronNotificationsToggled);
+		} else if (button == bonzoTimer) {
+			ToggleCommand.bonzoTimerToggled = !ToggleCommand.bonzoTimerToggled;
+			ConfigHandler.writeBooleanConfig("toggles", "BonzoTimer", ToggleCommand.bonzoTimerToggled);
+			bonzoTimer.displayString = "Bonzo's Mask Timer: " + Utils.getColouredBoolean(ToggleCommand.bonzoTimerToggled);
+		} else if (button == blockBreakingFarms) {
+			ToggleCommand.blockBreakingFarmsToggled = !ToggleCommand.blockBreakingFarmsToggled;
+			ConfigHandler.writeBooleanConfig("toggles", "BlockBreakingFarms", ToggleCommand.blockBreakingFarmsToggled);
+			blockBreakingFarms.displayString = "Prevent Breaking Farms: " + Utils.getColouredBoolean(ToggleCommand.blockBreakingFarmsToggled);
 		} else if (button == pickBlock) {
 			ToggleCommand.swapToPickBlockToggled = !ToggleCommand.swapToPickBlockToggled;
 			ConfigHandler.writeBooleanConfig("toggles", "PickBlock", ToggleCommand.swapToPickBlockToggled);
diff --git a/src/main/java/me/Danker/gui/EditLocationsGui.java b/src/main/java/me/Danker/gui/EditLocationsGui.java
index b610ae0..e3d6b73 100644
--- a/src/main/java/me/Danker/gui/EditLocationsGui.java
+++ b/src/main/java/me/Danker/gui/EditLocationsGui.java
@@ -26,6 +26,7 @@ public class EditLocationsGui extends GuiScreen {
 	private LocationButton cakeTimer;
 	private LocationButton skillTracker;
 	private LocationButton waterAnswer;
+	private LocationButton bonzoTimer;
 	
 	@Override
 	public boolean doesGuiPauseGame() {
@@ -91,6 +92,8 @@ public class EditLocationsGui extends GuiScreen {
 		cakeTimer = new LocationButton(0, MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1] + 5, 85 * ScaleCommand.cakeTimerScale, 18 * ScaleCommand.cakeTimerScale, ScaleCommand.cakeTimerScale, DankersSkyblockMod.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, 85 * ScaleCommand.bonzoTimerScale, 18 * ScaleCommand.bonzoTimerScale, ScaleCommand.bonzoTimerScale, DankersSkyblockMod.BONZO_COLOR + "     3m30s", null, null);
+
 
 		this.buttonList.add(coords);
 		this.buttonList.add(dungeonTimer);
@@ -98,6 +101,7 @@ public class EditLocationsGui extends GuiScreen {
 		this.buttonList.add(cakeTimer);
 		this.buttonList.add(skillTracker);
 		this.buttonList.add(waterAnswer);
+		this.buttonList.add(bonzoTimer);
 		this.buttonList.add(display);
 		this.buttonList.add(skill50);
 	}
@@ -107,13 +111,21 @@ public class EditLocationsGui extends GuiScreen {
 		this.drawDefaultBackground();
 		mouseMoved(mouseX, mouseY);
 		
-		double scale = ScaleCommand.cakeTimerScale;
-		double scaleReset = Math.pow(scale, -1);
-		GL11.glScaled(scale, scale, scale);
+		double cakeTimerScale = ScaleCommand.cakeTimerScale;
+		double cakeTimerScaleReset = Math.pow(cakeTimerScale, -1);
+		GL11.glScaled(cakeTimerScale, cakeTimerScale, cakeTimerScale);
 		mc.getTextureManager().bindTexture(DankersSkyblockMod.CAKE_ICON);
 		Gui.drawModalRectWithCustomSizedTexture(MoveCommand.cakeTimerXY[0], MoveCommand.cakeTimerXY[1], 0, 0, 16, 16, 16, 16);
-		GL11.glScaled(scaleReset, scaleReset, scaleReset);
-		
+		GL11.glScaled(cakeTimerScaleReset, cakeTimerScaleReset, cakeTimerScaleReset);
+
+		double bonzoTimerScale = ScaleCommand.bonzoTimerScale;
+		double bonzoTimerScaleReset = Math.pow(bonzoTimerScale, -1);
+		GL11.glScaled(bonzoTimerScale, bonzoTimerScale, bonzoTimerScale);
+		mc.getTextureManager().bindTexture(DankersSkyblockMod.BONZO_ICON);
+		Gui.drawModalRectWithCustomSizedTexture(MoveCommand.bonzoTimerXY[0], MoveCommand.bonzoTimerXY[1], 0, 0, 16, 16, 16, 16);
+		GL11.glScaled(bonzoTimerScaleReset, bonzoTimerScaleReset, bonzoTimerScaleReset);
+
+
 		super.drawScreen(mouseX, mouseY, partialTicks);
 	}
 	
@@ -171,6 +183,12 @@ public class EditLocationsGui extends GuiScreen {
 					waterAnswer.xPosition = MoveCommand.waterAnswerXY[0];
 					waterAnswer.yPosition = MoveCommand.waterAnswerXY[1];
 					break;
+				case "bonzoTimer":
+					MoveCommand.bonzoTimerXY[0] += xMoved;
+					MoveCommand.bonzoTimerXY[1] += yMoved;
+					bonzoTimer.xPosition = MoveCommand.bonzoTimerXY[0];
+					bonzoTimer.yPosition = MoveCommand.bonzoTimerXY[1];
+					break;
 			}
 			this.buttonList.clear();
 			initGui();
@@ -199,6 +217,8 @@ public class EditLocationsGui extends GuiScreen {
 				moving = "skillTracker";
 			} else if (button == waterAnswer) {
 				moving = "waterAnswer";
+			} else if (button == bonzoTimer) {
+				moving = "bonzoTimer";
 			}
 		}
 	}
@@ -223,6 +243,8 @@ public class EditLocationsGui extends GuiScreen {
 		ConfigHandler.writeIntConfig("locations", "skillTrackerY", MoveCommand.skillTrackerXY[1]);
 		ConfigHandler.writeIntConfig("locations", "waterAnswerX", MoveCommand.waterAnswerXY[0]);
 		ConfigHandler.writeIntConfig("locations", "waterAnswerY", MoveCommand.waterAnswerXY[1]);
+		ConfigHandler.writeIntConfig("locations", "bonzoTimerX", MoveCommand.bonzoTimerXY[0]);
+		ConfigHandler.writeIntConfig("locations", "bonzoTimerY", MoveCommand.bonzoTimerXY[1]);
 	}
 	
 }