1.8.2v1.8.3v1.8.2

Merge pull request #30 from bowser0000/development

1 files changed, 22 insertions, 12 deletions

diff --git a/src/main/java/me/Danker/gui/DisplayGui.java b/src/main/java/me/Danker/gui/DisplayGui.java
index 9f00ed3..0a5f805 100644
--- a/src/main/java/me/Danker/gui/DisplayGui.java
+++ b/src/main/java/me/Danker/gui/DisplayGui.java
@@ -25,13 +25,15 @@ public class DisplayGui extends GuiScreen {
 	private GuiButton fishing;
 	private GuiButton fishingWinter;
 	private GuiButton fishingFestival;
-	private GuiButton spookyFishing;
+	private GuiButton fishingSpooky;
+	private GuiButton mythological;
 	private GuiButton catacombsF1;
 	private GuiButton catacombsF2;
 	private GuiButton catacombsF3;
 	private GuiButton catacombsF4;
 	private GuiButton catacombsF5;
 	private GuiButton catacombsF6;
+	private GuiButton catacombsF7;
 	
 	@Override
 	public boolean doesGuiPauseGame() {
@@ -57,13 +59,15 @@ public class DisplayGui extends GuiScreen {
 		fishing = new GuiButton(0, width / 2 - 230, (int) (height * 0.4), 100, 20, "Fishing");
 		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");
-		spookyFishing = new GuiButton(0, width / 2 + 130, (int) (height * 0.4), 100, 20, "Spooky Fishing");
-		catacombsF1 = new GuiButton(0, width / 2 - 145, (int) (height * 0.55), 50, 20, "F1");
-		catacombsF2 = new GuiButton(0, width / 2 - 85, (int) (height * 0.55), 50, 20, "F2");
-		catacombsF3 = new GuiButton(0, width / 2 - 25, (int) (height * 0.55), 50, 20, "F3");
-		catacombsF4 = new GuiButton(0, width / 2 + 35, (int) (height * 0.55), 50, 20, "F4");
-		catacombsF5 = new GuiButton(0, width / 2 + 95, (int) (height * 0.55), 50, 20, "F5");
-		catacombsF6 = new GuiButton(0, width / 2 - 145, (int) (height * 0.63), 50, 20, "F6");
+		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");
+		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");
+		catacombsF4 = new GuiButton(0, width / 2 - 25, (int) (height * 0.65), 50, 20, "F4");
+		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");
 		
 		this.buttonList.add(showSession);
 		this.buttonList.add(off);
@@ -74,13 +78,15 @@ public class DisplayGui extends GuiScreen {
 		this.buttonList.add(fishing);
 		this.buttonList.add(fishingWinter);
 		this.buttonList.add(fishingFestival);
-		this.buttonList.add(spookyFishing);
+		this.buttonList.add(fishingSpooky);
+		this.buttonList.add(mythological);
 		this.buttonList.add(catacombsF1);
 		this.buttonList.add(catacombsF2);
 		this.buttonList.add(catacombsF3);
 		this.buttonList.add(catacombsF4);
 		this.buttonList.add(catacombsF5);
 		this.buttonList.add(catacombsF6);
+		this.buttonList.add(catacombsF7);
 		this.buttonList.add(editLocations);
 		this.buttonList.add(goBack);
 	}
@@ -101,7 +107,7 @@ public class DisplayGui extends GuiScreen {
 		
 		String catacombsTitleText = "Catacombs Dungeon";
 		int catacombsTitleWidth = mc.fontRendererObj.getStringWidth(catacombsTitleText);
-		new TextRenderer(mc, catacombsTitleText, width / 2 - catacombsTitleWidth / 2, (int) (height * 0.5), 1D);
+		new TextRenderer(mc, catacombsTitleText, width / 2 - catacombsTitleWidth / 2, (int) (height * 0.6), 1D);
 		
 		super.drawScreen(mouseX, mouseY, partialTicks);
 	}
@@ -132,8 +138,10 @@ public class DisplayGui extends GuiScreen {
 			setDisplay("fishing_winter", false);
 		} else if (button == fishingFestival) {
 			setDisplay("fishing_festival", false);
-		} else if (button == spookyFishing) {
-			setDisplay("spooky_fishing", false);
+		} else if (button == fishingSpooky) {
+			setDisplay("fishing_spooky", false);
+		} else if (button == mythological) {
+			setDisplay("mythological", false);
 		} else if (button == catacombsF1) {
 			setDisplay("catacombs_floor_one", false);
 		} else if (button == catacombsF2) {
@@ -146,6 +154,8 @@ public class DisplayGui extends GuiScreen {
 			setDisplay("catacombs_floor_five", false);
 		} else if (button == catacombsF6) {
 			setDisplay("catacombs_floor_six", false);
+		} else if (button == catacombsF7) {
+			setDisplay("catacombs_floor_seven", false);
 		}
 	}