diff options
| author | RabbitType99 <luis.be@gmx.de> | 2021-03-13 17:10:14 +0100 |
|---|---|---|
| committer | RabbitType99 <luis.be@gmx.de> | 2021-03-13 17:10:14 +0100 |
| commit | 440911c722b2acaa94a4d40daae3f29d81329441 (patch) | |
| tree | 75d31ad4e45f43085c826d722f0df6879e95a518 /src/main/java/me/Danker/gui/DisplayGui.java | |
| parent | a3f51f679364d8d97fe55f4aed3a80c61d6849b7 (diff) | |
| parent | ed93b04124db9b8944ddd1ed33d0f4dabf4a486b (diff) | |
| download | SkyblockMod-440911c722b2acaa94a4d40daae3f29d81329441.tar.gz SkyblockMod-440911c722b2acaa94a4d40daae3f29d81329441.tar.bz2 SkyblockMod-440911c722b2acaa94a4d40daae3f29d81329441.zip | |
Merge branch 'InstallerFrame' into development_test
# Conflicts:
# src/main/java/me/Danker/commands/ToggleCommand.java
Diffstat (limited to 'src/main/java/me/Danker/gui/DisplayGui.java')
| -rw-r--r-- | src/main/java/me/Danker/gui/DisplayGui.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java index ceda556..f38c29e 100644 --- a/src/main/java/me/Danker/gui/DisplayGui.java +++ b/src/main/java/me/Danker/gui/DisplayGui.java @@ -33,6 +33,7 @@ public class DisplayGui extends GuiScreen { private GuiButton catacombsF5; private GuiButton catacombsF6; private GuiButton catacombsF7; + private GuiButton ghost; @Override public boolean doesGuiPauseGame() { @@ -58,7 +59,7 @@ public class DisplayGui extends GuiScreen { fishingWinter = new GuiButton(0, width / 2 - 110, (int) (height * 0.4), 100, 20, "Fishing Winter"); fishingFestival = new GuiButton(0, width / 2 + 10, (int) (height * 0.4), 100, 20, "Fishing Festival"); fishingSpooky = new GuiButton(0, width / 2 + 130, (int) (height * 0.4), 100, 20, "Fishing Spooky"); - mythological = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), 200, 20, "Mythological"); + mythological = new GuiButton(0, width / 2 - 100, (int) (height * 0.5), 95, 20, "Mythological"); catacombsF1 = new GuiButton(0, width / 2 - 205, (int) (height * 0.65), 50, 20, "F1"); catacombsF2 = new GuiButton(0, width / 2 - 145, (int) (height * 0.65), 50, 20, "F2"); catacombsF3 = new GuiButton(0, width / 2 - 85, (int) (height * 0.65), 50, 20, "F3"); @@ -66,6 +67,7 @@ public class DisplayGui extends GuiScreen { catacombsF5 = new GuiButton(0, width / 2 + 35, (int) (height * 0.65), 50, 20, "F5"); catacombsF6 = new GuiButton(0, width / 2 + 95, (int) (height * 0.65), 50, 20, "F6"); catacombsF7 = new GuiButton(0, width / 2 + 155, (int) (height * 0.65), 50, 20, "F7"); + ghost = new GuiButton(0, width / 2 + 5, (int) (height * 0.5), 95, 20, "Ghost"); this.buttonList.add(showSession); this.buttonList.add(off); @@ -85,6 +87,7 @@ public class DisplayGui extends GuiScreen { this.buttonList.add(catacombsF5); this.buttonList.add(catacombsF6); this.buttonList.add(catacombsF7); + this.buttonList.add(ghost); this.buttonList.add(goBack); } @@ -151,7 +154,8 @@ public class DisplayGui extends GuiScreen { setDisplay("catacombs_floor_six", false); } else if (button == catacombsF7) { setDisplay("catacombs_floor_seven", false); - } + } else if (button == ghost) + setDisplay("ghost",false); } public void setDisplay(String display, boolean forceNoSession) { |