aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2020-10-18 21:34:56 -0400
committerbowser0000 <bowser0000@gmail.com>2020-10-18 21:34:56 -0400
commit3dde239389482ef25825a5fc9e6379430360a228 (patch)
tree5b4ccb3c6bf749e3eeb0e38be2c2bea27e77c23e /src
parent65f8c8ea13df8451583ef257976f761d13d35f1f (diff)
downloadSkyblockMod-3dde239389482ef25825a5fc9e6379430360a228.tar.gz
SkyblockMod-3dde239389482ef25825a5fc9e6379430360a228.tar.bz2
SkyblockMod-3dde239389482ef25825a5fc9e6379430360a228.zip
Add dungeons to auto display
Diffstat (limited to 'src')
-rw-r--r--src/main/java/me/Danker/TheMod.java15
-rw-r--r--src/main/java/me/Danker/gui/DisplayGui.java12
2 files changed, 21 insertions, 6 deletions
diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
index fa327fe..87e4dd7 100644
--- a/src/main/java/me/Danker/TheMod.java
+++ b/src/main/java/me/Danker/TheMod.java
@@ -1837,6 +1837,21 @@ public class TheMod
} else if (sCleaned.contains("Revenant Horror")) {
DisplayCommand.display = "zombie";
found = true;
+ } else if (sCleaned.contains("The Catacombs (")) {
+ if (sCleaned.contains("F1")) {
+ DisplayCommand.display = "catacombs_floor_one";
+ } else if (sCleaned.contains("F2")) {
+ DisplayCommand.display = "catacombs_floor_two";
+ } else if (sCleaned.contains("F3")) {
+ DisplayCommand.display = "catacombs_floor_three";
+ } else if (sCleaned.contains("F4")) {
+ DisplayCommand.display = "catacombs_floor_four";
+ } else if (sCleaned.contains("F5")) {
+ DisplayCommand.display = "catacombs_floor_five";
+ } else if (sCleaned.contains("F6")) {
+ DisplayCommand.display = "catacombs_floor_six";
+ }
+ found = true;
}
}
if (!found) DisplayCommand.display = "off";
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index 945dbc3..243bedb 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -48,11 +48,11 @@ public class DisplayGui extends GuiScreen {
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 - 100, (int) (height * 0.2), "Off");
- zombie = new GuiButton(0, width / 2 - 190, (int) (height * 0.3), 80, 20, "Zombie");
- spider = new GuiButton(0, width / 2 - 90, (int) (height * 0.3), 80, 20, "Spider");
- wolf = new GuiButton(0, width / 2 + 10, (int) (height * 0.3), 80, 20, "Wolf");
- auto = new GuiButton(0, width / 2 + 110, (int) (height * 0.3), 80, 20, "Auto");
+ off = new GuiButton(0, width / 2 - 210, (int) (height * 0.2), "Off");
+ auto = new GuiButton(0, width / 2 + 10, (int) (height * 0.2), "Auto");
+ zombie = new GuiButton(0, width / 2 - 190, (int) (height * 0.3), 110, 20, "Zombie");
+ spider = new GuiButton(0, width / 2 - 55, (int) (height * 0.3), 110, 20, "Spider");
+ wolf = new GuiButton(0, width / 2 + 75, (int) (height * 0.3), 110, 20, "Wolf");
fishing = new GuiButton(0, width / 2 - 190, (int) (height * 0.4), 110, 20, "Fishing");
fishingWinter = new GuiButton(0, width / 2 - 55, (int) (height * 0.4), 110, 20, "Fishing Winter");
fishingFestival = new GuiButton(0, width / 2 + 75, (int) (height * 0.4), 110, 20, "Fishing Festival");
@@ -65,10 +65,10 @@ public class DisplayGui extends GuiScreen {
this.buttonList.add(showSession);
this.buttonList.add(off);
+ this.buttonList.add(auto);
this.buttonList.add(zombie);
this.buttonList.add(spider);
this.buttonList.add(wolf);
- this.buttonList.add(auto);
this.buttonList.add(fishing);
this.buttonList.add(fishingWinter);
this.buttonList.add(fishingFestival);