Move EditLocations Button to Main

Moved editLocations GUI button to the main pages.

2 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 613e968..de99686 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -24,6 +24,7 @@ public class DankerGui extends GuiScreen {
 	private GuiButton nextPage;
 	private GuiButton githubLink;
 	private GuiButton discordLink;
+	private GuiButton editLocations;
 	private GuiButton changeDisplay;
 	private GuiButton onlySlayer;
 	private GuiButton puzzleSolvers;
@@ -80,6 +81,7 @@ public class DankerGui extends GuiScreen {
 		nextPage = new GuiButton(0, width / 2 + 20, (int) (height * 0.8), 80, 20, "Next >");
 		githubLink = new GuiButton(0, 2, height - 50, 80, 20, "GitHub");
 		discordLink = new GuiButton(0, 2, height - 30, 80, 20, "Discord");
+		editLocations = new GuiButton(0, 2, 5, 100, 20, "Edit Locations");
 		
 		// Page 1
 		changeDisplay = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Change Display Settings");
@@ -117,6 +119,7 @@ public class DankerGui extends GuiScreen {
 		stopSalvageStarred = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Stop Salvaging Starred Items: " + Utils.getColouredBoolean(ToggleCommand.stopSalvageStarredToggled));
 		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));
+		
 		switch (page) {
 			case 1:
 				this.buttonList.add(changeDisplay);
@@ -172,6 +175,7 @@ public class DankerGui extends GuiScreen {
 		this.buttonList.add(githubLink);
 		this.buttonList.add(discordLink);
 		this.buttonList.add(closeGUI);
+		this.buttonList.add(editLocations);
 	}
 	
 	@Override
@@ -191,6 +195,8 @@ public class DankerGui extends GuiScreen {
 			DankersSkyblockMod.guiToOpen = "dankergui" + (page + 1);
 		} else if (button == backPage) {
 			DankersSkyblockMod.guiToOpen = "dankergui" + (page - 1);
+		} else if (button == editLocations) {
+			DankersSkyblockMod.guiToOpen = "editlocations";
 		} else if (button == githubLink) {
 			try {
 				Desktop.getDesktop().browse(new URI("https://github.com/bowser0000/SkyblockMod"));
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index f498a67..2f704b3 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -15,7 +15,6 @@ public class DisplayGui extends GuiScreen {
 	private boolean addSession = false;
 	
 	private GuiButton goBack;
-	private GuiButton editLocations;
 	private GuiButton off;
 	private GuiButton showSession;
 	private GuiButton zombie;
@@ -49,7 +48,6 @@ public class DisplayGui extends GuiScreen {
 		int width = sr.getScaledWidth();
 		
 		goBack = new GuiButton(0, 2, height - 30, 100, 20, "Go Back");
-		editLocations = new GuiButton(0, 2, height - 55, 100, 20, "Edit Locations");
 		showSession = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Current Session Only: " + Utils.getColouredBoolean(addSession));
 		off = new GuiButton(0, width / 2 - 210, (int) (height * 0.2), "Off");
 		auto = new GuiButton(0, width / 2 + 10, (int) (height * 0.2), "Auto");
@@ -87,7 +85,6 @@ public class DisplayGui extends GuiScreen {
 		this.buttonList.add(catacombsF5);
 		this.buttonList.add(catacombsF6);
 		this.buttonList.add(catacombsF7);
-		this.buttonList.add(editLocations);
 		this.buttonList.add(goBack);
 	}
 	
@@ -116,8 +113,6 @@ public class DisplayGui extends GuiScreen {
 	public void actionPerformed(GuiButton button) {
 		if (button == goBack) {
 			DankersSkyblockMod.guiToOpen = "dankergui1";
-		} else if (button == editLocations) {
-			DankersSkyblockMod.guiToOpen = "editlocations";
 		} else if (button == showSession) {
 			addSession = !addSession;
 			showSession.displayString = "Current Session Only: " + Utils.getColouredBoolean(addSession);