Add custom alerts based on chat

Also move some other stuff around

13 files changed, 343 insertions, 18 deletions

diff --git a/src/main/java/me/Danker/gui/CustomMusicGui.java b/src/main/java/me/Danker/gui/CustomMusicGui.java
index 83bed09..6695b9a 100644
--- a/src/main/java/me/Danker/gui/CustomMusicGui.java
+++ b/src/main/java/me/Danker/gui/CustomMusicGui.java
@@ -111,7 +111,7 @@ public class CustomMusicGui extends GuiScreen {
     @Override
     public void actionPerformed(GuiButton button) {
         if (button == goBack) {
-            DankersSkyblockMod.guiToOpen = "dankergui1";
+            mc.displayGuiScreen(new DankerGui(1, ""));
         } else if (button == backPage) {
             Minecraft.getMinecraft().displayGuiScreen(new CustomMusicGui(page - 1));
         } else if (button == nextPage) {
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index acd997e..2a081e1 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -2,7 +2,9 @@ package me.Danker.gui;
 
 import me.Danker.DankersSkyblockMod;
 import me.Danker.commands.ToggleCommand;
+import me.Danker.gui.alerts.AlertsGui;
 import me.Danker.gui.buttons.FeatureButton;
+import me.Danker.gui.crystalhollowwaypoints.CrystalHollowWaypointsGui;
 import me.Danker.handlers.ConfigHandler;
 import me.Danker.handlers.TextRenderer;
 import me.Danker.utils.Utils;
@@ -43,6 +45,7 @@ public class DankerGui extends GuiScreen {
 	private GuiButton skillTracker;
 	private GuiButton customMusic;
 	private GuiButton crystalHollowWaypoints;
+	private GuiButton alerts;
 	// Toggles
 	private GuiButton gparty;
 	private GuiButton coords;
@@ -124,6 +127,7 @@ public class DankerGui extends GuiScreen {
 		skillTracker = new GuiButton(0, 0, 0, "Toggle Skill XP/Hour Tracking");
 		customMusic = new GuiButton(0, 0, 0, "Custom Music");
 		crystalHollowWaypoints = new GuiButton(0, 0, 0, "Crystal Hollows Waypoints");
+		alerts = new GuiButton(0, 0, 0, "Alerts");
 		outlineText = new FeatureButton("Outline Displayed Text: " + Utils.getColouredBoolean(ToggleCommand.outlineTextToggled), "Adds bold outline to on-screen text.");
 		pickBlock = new FeatureButton("Auto-Swap to Pick Block: " + Utils.getColouredBoolean(ToggleCommand.swapToPickBlockToggled), "Automatically changes left clicks to middle clicks.\nHelpful when lagging.");
 		coords = new FeatureButton("Coordinate/Angle Display: " + Utils.getColouredBoolean(ToggleCommand.coordsToggled), "Displays coordinates and angle.");
@@ -177,6 +181,7 @@ public class DankerGui extends GuiScreen {
 		allButtons.add(skillTracker);
 		allButtons.add(customMusic);
 		allButtons.add(crystalHollowWaypoints);
+		allButtons.add(alerts);
 		allButtons.add(outlineText);
 		allButtons.add(pickBlock);
 		allButtons.add(coords);
@@ -288,7 +293,7 @@ public class DankerGui extends GuiScreen {
 		} else if (button == backPage) {
 			mc.displayGuiScreen(new DankerGui(page - 1, search.getText()));
 		} else if (button == editLocations) {
-			DankersSkyblockMod.guiToOpen = "editlocations";
+			mc.displayGuiScreen(new EditLocationsGui());
 		} else if (button == githubLink) {
 			try {
 				Desktop.getDesktop().browse(new URI("https://github.com/bowser0000/SkyblockMod"));
@@ -302,19 +307,21 @@ public class DankerGui extends GuiScreen {
 				ex.printStackTrace();
 			}
 		} else if (button == changeDisplay) {
-			DankersSkyblockMod.guiToOpen = "displaygui";
+			mc.displayGuiScreen(new DisplayGui());
 		} else if (button == onlySlayer) {
-			DankersSkyblockMod.guiToOpen = "onlyslayergui";
+			mc.displayGuiScreen(new OnlySlayerGui());
 		} else if (button == puzzleSolvers) {
-			DankersSkyblockMod.guiToOpen = "puzzlesolvers";
+			mc.displayGuiScreen(new PuzzleSolversGui(1));
 		} else if (button == experimentationTableSolvers) {
-			DankersSkyblockMod.guiToOpen = "experimentsolvers";
+			mc.displayGuiScreen(new ExperimentsGui());
 		} else if (button == skillTracker) {
-			DankersSkyblockMod.guiToOpen = "skilltracker";
+			mc.displayGuiScreen(new SkillTrackerGui());
 		} else if (button == customMusic) {
-			DankersSkyblockMod.guiToOpen = "custommusic";
+			mc.displayGuiScreen(new CustomMusicGui(1));
 		} else if (button == crystalHollowWaypoints) {
-			DankersSkyblockMod.guiToOpen = "crystalwaypoints";
+			mc.displayGuiScreen(new CrystalHollowWaypointsGui(1));
+		} else if (button == alerts) {
+			mc.displayGuiScreen(new AlertsGui(1));
 		} else if (button == outlineText) {
 			ToggleCommand.outlineTextToggled = !ToggleCommand.outlineTextToggled;
 			ConfigHandler.writeBooleanConfig("toggles", "OutlineText", ToggleCommand.outlineTextToggled);
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index e5a6641..c6b1381 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -118,7 +118,7 @@ public class DisplayGui extends GuiScreen {
 	@Override
 	public void actionPerformed(GuiButton button) {
 		if (button == goBack) {
-			DankersSkyblockMod.guiToOpen = "dankergui1";
+			mc.displayGuiScreen(new DankerGui(1, ""));
 		} else if (button == showSession) {
 			addSession = !addSession;
 			showSession.displayString = "Current Session Only: " + Utils.getColouredBoolean(addSession);
diff --git a/src/main/java/me/Danker/gui/ExperimentsGui.java b/src/main/java/me/Danker/gui/ExperimentsGui.java
index c3f4f47..3cc4929 100644
--- a/src/main/java/me/Danker/gui/ExperimentsGui.java
+++ b/src/main/java/me/Danker/gui/ExperimentsGui.java
@@ -52,7 +52,7 @@ public class ExperimentsGui extends GuiScreen {
     @Override
     public void actionPerformed(GuiButton button) {
         if (button == goBack) {
-            DankersSkyblockMod.guiToOpen = "dankergui1";
+            mc.displayGuiScreen(new DankerGui(1, ""));
         } else if (button == ultrasequencer) {
             ToggleCommand.ultrasequencerToggled = !ToggleCommand.ultrasequencerToggled;
             ConfigHandler.writeBooleanConfig("toggles", "UltraSequencer", ToggleCommand.ultrasequencerToggled);
diff --git a/src/main/java/me/Danker/gui/OnlySlayerGui.java b/src/main/java/me/Danker/gui/OnlySlayerGui.java
index 8d56156..c203b8a 100644
--- a/src/main/java/me/Danker/gui/OnlySlayerGui.java
+++ b/src/main/java/me/Danker/gui/OnlySlayerGui.java
@@ -106,7 +106,7 @@ public class OnlySlayerGui extends GuiScreen {
     @Override
     public void actionPerformed(GuiButton button) {
         if (button == goBack) {
-            DankersSkyblockMod.guiToOpen = "dankergui1";
+            mc.displayGuiScreen(new DankerGui(1, ""));
             return;
         } else if (button == off) {
             BlockWrongSlayer.onlySlayerName = "";
diff --git a/src/main/java/me/Danker/gui/PuzzleSolversGui.java b/src/main/java/me/Danker/gui/PuzzleSolversGui.java
index 27233d8..3356ead 100644
--- a/src/main/java/me/Danker/gui/PuzzleSolversGui.java
+++ b/src/main/java/me/Danker/gui/PuzzleSolversGui.java
@@ -110,7 +110,7 @@ public class PuzzleSolversGui extends GuiScreen {
 	@Override
 	public void actionPerformed(GuiButton button) {
 		if (button == goBack) {
-			DankersSkyblockMod.guiToOpen = "dankergui1";
+			mc.displayGuiScreen(new DankerGui(1, ""));
 		} else if (button == backPage) {
 			Minecraft.getMinecraft().displayGuiScreen(new PuzzleSolversGui(page - 1));
 		} else if (button == nextPage) {
diff --git a/src/main/java/me/Danker/gui/SkillTrackerGui.java b/src/main/java/me/Danker/gui/SkillTrackerGui.java
index fb7a7c9..290310f 100644
--- a/src/main/java/me/Danker/gui/SkillTrackerGui.java
+++ b/src/main/java/me/Danker/gui/SkillTrackerGui.java
@@ -67,7 +67,7 @@ public class SkillTrackerGui extends GuiScreen {
 	@Override
 	public void actionPerformed(GuiButton button) {
 		if (button == goBack) {
-			DankersSkyblockMod.guiToOpen = "dankergui1";
+			mc.displayGuiScreen(new DankerGui(1, ""));
 		} else if (button == start) {
 			if (SkillTracker.skillStopwatch.isStarted() && SkillTracker.skillStopwatch.isSuspended()) {
 				SkillTracker.skillStopwatch.resume();
diff --git a/src/main/java/me/Danker/gui/alerts/AlertActionGui.java b/src/main/java/me/Danker/gui/alerts/AlertActionGui.java
new file mode 100644
index 0000000..06dfd91
--- /dev/null
+++ b/src/main/java/me/Danker/gui/alerts/AlertActionGui.java
@@ -0,0 +1,82 @@
+package me.Danker.gui.alerts;
+
+import me.Danker.features.Alerts;
+import me.Danker.handlers.TextRenderer;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.util.EnumChatFormatting;
+
+public class AlertActionGui extends GuiScreen {
+
+    private final int id;
+
+    private GuiButton goBack;
+    private GuiButton toggle;
+    private GuiButton edit;
+    private GuiButton delete;
+
+    public AlertActionGui(int id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean doesGuiPauseGame() {
+        return false;
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+
+        ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft());
+        int height = sr.getScaledHeight();
+        int width = sr.getScaledWidth();
+
+        Alerts.Alert alert = Alerts.alerts.get(id);
+
+        goBack = new GuiButton(0, 2, height - 30, 100, 20, "Go Back");
+        toggle = new GuiButton(0, width / 2 - 100, (int) (height * 0.1), "Enabled: " + Utils.getColouredBoolean(alert.toggled));
+        edit = new GuiButton(0, width / 2 - 100, (int) (height * 0.2), "Edit >");
+        delete = new GuiButton(0, width / 2 - 100, (int) (height * 0.8), EnumChatFormatting.RED + "Delete Alert");
+
+        this.buttonList.add(toggle);
+        this.buttonList.add(edit);
+        this.buttonList.add(delete);
+        this.buttonList.add(goBack);
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        this.drawDefaultBackground();
+        super.drawScreen(mouseX, mouseY, partialTicks);
+
+        Alerts.Alert alert = Alerts.alerts.get(id);
+
+        String alertText = alert.alert;
+        int textWidth = mc.fontRendererObj.getStringWidth(alertText);
+        new TextRenderer(mc, alertText, width / 2 - textWidth / 2, 10, 1D);
+    }
+
+    @Override
+    public void actionPerformed(GuiButton button) {
+        Alerts.Alert alert = Alerts.alerts.get(id);
+        if (button == goBack) {
+            mc.displayGuiScreen(new AlertsGui(1));
+        } else if (button == toggle) {
+            alert.toggle();
+            toggle.displayString = "Enabled: " + Utils.getColouredBoolean(alert.toggled);
+        } else if (button == edit) {
+            mc.displayGuiScreen(new AlertAddGui(alert, id));
+        } else if (button == delete) {
+            Alerts.alerts.remove(id);
+            Alerts.saveToFile();
+            mc.displayGuiScreen(new AlertsGui(1));
+            return;
+        }
+        Alerts.alerts.set(id, alert);
+    }
+
+}
diff --git a/src/main/java/me/Danker/gui/alerts/AlertAddGui.java b/src/main/java/me/Danker/gui/alerts/AlertAddGui.java
new file mode 100644
index 0000000..9014ea1
--- /dev/null
+++ b/src/main/java/me/Danker/gui/alerts/AlertAddGui.java
@@ -0,0 +1,130 @@
+package me.Danker.gui.alerts;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import me.Danker.features.Alerts;
+import me.Danker.handlers.TextRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraftforge.fml.client.config.GuiCheckBox;
+
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class AlertAddGui extends GuiScreen {
+
+    private boolean editing;
+    private Alerts.Alert base = null;
+    private int id;
+
+    private GuiButton cancel;
+
+    private String mode = "Contains";
+    private GuiButton startsWith;
+    private GuiButton contains;
+    private GuiButton endsWith;
+    private GuiTextField message;
+    private GuiTextField alert;
+    private GuiCheckBox toggled;
+    private GuiButton add;
+
+    public AlertAddGui() {}
+
+    public AlertAddGui(Alerts.Alert alert, int id) {
+        editing = true;
+        base = alert;
+        this.id = id;
+    }
+
+    @Override
+    public boolean doesGuiPauseGame() {
+        return false;
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+
+        ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft());
+        int height = sr.getScaledHeight();
+        int width = sr.getScaledWidth();
+
+        cancel = new GuiButton(0, 2, height - 30, 100, 20, "Cancel");
+
+        startsWith = new GuiButton(0, width / 2 - 200, (int) (height * 0.2), 120, 20, "Starts With");
+        contains = new GuiButton(0, width / 2 - 60, (int) (height * 0.2), 120, 20, "Contains");
+        endsWith = new GuiButton(0, width / 2 + 80, (int) (height * 0.2), 120, 20, "Ends With");
+        message = new GuiTextField(0, this.fontRendererObj, width / 2 - 100, (int) (height * 0.3), 200, 20);
+        alert = new GuiTextField(0, this.fontRendererObj, width / 2 - 100, (int) (height * 0.4), 200, 20);
+        toggled = new GuiCheckBox(0, width / 2 - 26, (int) (height * 0.5), "Toggled", true);
+        add = new GuiButton(0, width / 2 - 25, (int) (height * 0.7), 50, 20, "Add");
+
+        if (editing) {
+            mode = base.mode;
+            message.setText(base.message);
+            alert.setText(base.alert);
+            toggled.setIsChecked(base.toggled);
+        }
+
+        message.setVisible(true);
+        message.setEnabled(true);
+        alert.setVisible(true);
+        alert.setEnabled(true);
+
+        this.buttonList.add(cancel);
+        this.buttonList.add(startsWith);
+        this.buttonList.add(contains);
+        this.buttonList.add(endsWith);
+        this.buttonList.add(toggled);
+        this.buttonList.add(add);
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        this.drawDefaultBackground();
+        super.drawScreen(mouseX, mouseY, partialTicks);
+
+        message.drawTextBox();
+        alert.drawTextBox();
+
+        new TextRenderer(mc, "Mode: " + mode, width / 2 - 35, (int) (height * 0.15), 1D);
+        new TextRenderer(mc, "Trigger:", width / 2 - 145, (int) (height * 0.32), 1D);
+        new TextRenderer(mc, "Alert Text:", width / 2 - 158, (int) (height * 0.42), 1D);
+    }
+
+    @Override
+    public void actionPerformed(GuiButton button) {
+        if (button == cancel) {
+            mc.displayGuiScreen(new AlertsGui(1));
+        } else if (button == startsWith) {
+            mode = "Starts With";
+        } else if (button == contains) {
+            mode = "Contains";
+        } else if (button == endsWith) {
+            mode = "Ends With";
+        } else if (button == add) {
+            Alerts.alerts.add(new Alerts.Alert(mode, message.getText(), alert.getText(), toggled.isChecked()));
+            if (editing) Alerts.alerts.remove(id);
+            Alerts.saveToFile();
+            mc.displayGuiScreen(new AlertsGui(1));
+        }
+    }
+
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
+        super.mouseClicked(mouseX, mouseY, mouseButton);
+        message.mouseClicked(mouseX, mouseY, mouseButton);
+        alert.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+
+    @Override
+    protected void keyTyped(char typedChar, int keyCode) throws IOException {
+        super.keyTyped(typedChar, keyCode);
+        message.textboxKeyTyped(typedChar, keyCode);
+        alert.textboxKeyTyped(typedChar, keyCode);
+    }
+
+}
diff --git a/src/main/java/me/Danker/gui/alerts/AlertsGui.java b/src/main/java/me/Danker/gui/alerts/AlertsGui.java
new file mode 100644
index 0000000..3ccd869
--- /dev/null
+++ b/src/main/java/me/Danker/gui/alerts/AlertsGui.java
@@ -0,0 +1,104 @@
+package me.Danker.gui.alerts;
+
+import me.Danker.commands.ToggleCommand;
+import me.Danker.features.Alerts;
+import me.Danker.gui.DankerGui;
+import me.Danker.gui.buttons.FeatureButton;
+import me.Danker.handlers.ConfigHandler;
+import me.Danker.handlers.TextRenderer;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AlertsGui extends GuiScreen {
+
+    private final int page;
+    private final List<GuiButton> allButtons = new ArrayList<>();
+
+    private GuiButton goBack;
+    private GuiButton backPage;
+    private GuiButton nextPage;
+    private GuiButton add;
+    private GuiButton alerts;
+
+    public AlertsGui(int page) {
+        this.page = page;
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+
+        ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft());
+        int height = sr.getScaledHeight();
+        int width = sr.getScaledWidth();
+
+        goBack = new GuiButton(0, 2, height - 30, 100, 20, "Go Back");
+        backPage = new GuiButton(0, width / 2 - 100, (int) (height * 0.8), 80, 20, "< Back");
+        nextPage = new GuiButton(0, width / 2 + 20, (int) (height * 0.8), 80, 20, "Next >");
+        alerts = new FeatureButton("Alerts: " + Utils.getColouredBoolean(ToggleCommand.alerts), "Sends custom alert when a message is recieved");
+        add = new GuiButton(0, 0, 0, "Add Alert");
+
+        allButtons.clear();
+        allButtons.add(alerts);
+        allButtons.add(add);
+        for (int i = 0; i < Alerts.alerts.size(); i++) {
+            Alerts.Alert alert = Alerts.alerts.get(i);
+            GuiButton button = new GuiButton(i, 0, 0, alert.alert + " >");
+            allButtons.add(button);
+        }
+
+        reInit();
+    }
+
+    public void reInit() {
+        this.buttonList.clear();
+
+        for (int i = (page - 1) * 7, iteration = 0; iteration < 7 && i < allButtons.size(); i++, iteration++) {
+            GuiButton button = allButtons.get(i);
+            button.xPosition = width / 2 - 100;
+            button.yPosition = (int) (height * (0.1 * (iteration + 1)));
+            this.buttonList.add(button);
+        }
+
+        if (page > 1) this.buttonList.add(backPage);
+        if (page < Math.ceil(allButtons.size() / 7D)) this.buttonList.add(nextPage);
+
+        this.buttonList.add(goBack);
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        this.drawDefaultBackground();
+        super.drawScreen(mouseX, mouseY, partialTicks);
+
+        String pageText = "Page: " + page + "/" + (int) Math.ceil(allButtons.size() / 7D);
+        int pageWidth = mc.fontRendererObj.getStringWidth(pageText);
+        new TextRenderer(mc, pageText, width / 2 - pageWidth / 2, 10, 1D);
+    }
+
+    @Override
+    public void actionPerformed(GuiButton button) {
+        if (button == goBack) {
+            mc.displayGuiScreen(new DankerGui(1, ""));
+        } else if (button == nextPage) {
+            mc.displayGuiScreen(new AlertsGui(page + 1));
+        } else if (button == backPage) {
+            mc.displayGuiScreen(new AlertsGui(page - 1));
+        } else if (button == add) {
+            mc.displayGuiScreen(new AlertAddGui());
+        } else if (button == alerts) {
+            ToggleCommand.alerts = !ToggleCommand.alerts;
+            ConfigHandler.writeBooleanConfig("toggles", "Alerts", ToggleCommand.alerts);
+            alerts.displayString = "Alerts: " + Utils.getColouredBoolean(ToggleCommand.alerts);
+        } else {
+            mc.displayGuiScreen(new AlertActionGui(button.id));
+        }
+    }
+
+}
diff --git a/src/main/java/me/Danker/gui/CrystalHollowAddWaypointGui.java b/src/main/java/me/Danker/gui/crystalhollowwaypoints/CrystalHollowAddWaypointGui.java
index 7bb26cf..df91f04 100644
--- a/src/main/java/me/Danker/gui/CrystalHollowAddWaypointGui.java
+++ b/src/main/java/me/Danker/gui/crystalhollowwaypoints/CrystalHollowAddWaypointGui.java
@@ -1,4 +1,4 @@
-package me.Danker.gui;
+package me.Danker.gui.crystalhollowwaypoints;
 
 import me.Danker.features.CrystalHollowWaypoints;
 import me.Danker.handlers.TextRenderer;
diff --git a/src/main/java/me/Danker/gui/CrystalHollowWaypointActionGui.java b/src/main/java/me/Danker/gui/crystalhollowwaypoints/CrystalHollowWaypointActionGui.java
index 1575c18..f792892 100644
--- a/src/main/java/me/Danker/gui/CrystalHollowWaypointActionGui.java
+++ b/src/main/java/me/Danker/gui/crystalhollowwaypoints/CrystalHollowWaypointActionGui.java
@@ -1,4 +1,4 @@
-package me.Danker.gui;
+package me.Danker.gui.crystalhollowwaypoints;
 
 import me.Danker.DankersSkyblockMod;
 import me.Danker.features.CrystalHollowWaypoints;
@@ -73,6 +73,7 @@ public class CrystalHollowWaypointActionGui extends GuiScreen {
         CrystalHollowWaypoints.Waypoint waypoint = CrystalHollowWaypoints.waypoints.get(id);
         EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
         if (button == goBack) {
+            mc.displayGuiScreen(new CrystalHollowWaypointsGui(1));
             DankersSkyblockMod.guiToOpen = "crystalwaypoints";
         } else if (button == toggle) {
             waypoint.toggle();
diff --git a/src/main/java/me/Danker/gui/CrystalHollowWaypointsGui.java b/src/main/java/me/Danker/gui/crystalhollowwaypoints/CrystalHollowWaypointsGui.java
index de20cf1..a3d0452 100644
--- a/src/main/java/me/Danker/gui/CrystalHollowWaypointsGui.java
+++ b/src/main/java/me/Danker/gui/crystalhollowwaypoints/CrystalHollowWaypointsGui.java
@@ -1,8 +1,9 @@
-package me.Danker.gui;
+package me.Danker.gui.crystalhollowwaypoints;
 
 import me.Danker.DankersSkyblockMod;
 import me.Danker.commands.ToggleCommand;
 import me.Danker.features.CrystalHollowWaypoints;
+import me.Danker.gui.DankerGui;
 import me.Danker.gui.buttons.FeatureButton;
 import me.Danker.handlers.ConfigHandler;
 import me.Danker.handlers.TextRenderer;
@@ -101,7 +102,7 @@ public class CrystalHollowWaypointsGui extends GuiScreen {
     public void actionPerformed(GuiButton button) {
         EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
         if (button == goBack) {
-            DankersSkyblockMod.guiToOpen = "dankergui1";
+            mc.displayGuiScreen(new DankerGui(1, ""));
         } else if (button == nextPage) {
             mc.displayGuiScreen(new CrystalHollowWaypointsGui(page + 1));
         } else if (button == backPage) {