From a63c48e3380d94f2dfdef4fb27d5d7e0b7ebe9b3 Mon Sep 17 00:00:00 2001
From: Shaun Bennett <shaun@mineplex.com>
Date: Wed, 17 Dec 2014 18:45:15 -0600
Subject: [PATCH] Refactoring private server menu

---
 .../game/arcade/addons/CompassAddon.java      |  2 +-
 .../game/arcade/gui/GameHostShop.java         | 30 -------------------
 .../arcade/gui/button/GameSettingsButton.java | 28 -----------------
 .../gui/privateServer/PrivateServerShop.java  | 24 +++++++++++++++
 .../{ => privateServer}/button/BanButton.java | 10 +++----
 .../button/EditRotationButton.java            | 10 +++----
 .../button/GiveAdminButton.java               | 10 +++----
 .../privateServer/button/OptionsButton.java   | 27 +++++++++++++++++
 .../button/SetGameButton.java                 | 10 +++----
 .../button/UnbanButton.java                   | 11 ++++---
 .../gui/{ => privateServer}/page/BanPage.java |  6 ++--
 .../page/BasePage.java}                       | 13 ++++----
 .../page/EditRotationPage.java                |  8 ++---
 .../page/GiveAdminPage.java                   |  6 ++--
 .../page/MenuPage.java}                       | 25 ++++++++--------
 .../page/OptionsPage.java}                    |  8 ++---
 .../{ => privateServer}/page/PlayerPage.java  |  8 ++---
 .../{ => privateServer}/page/SetGamePage.java | 12 ++++----
 .../{ => privateServer}/page/UnbanPage.java   |  8 ++---
 .../{ => spectatorMenu}/SpectatorShop.java    |  4 +--
 .../button/SpectatorButton.java               |  3 +-
 .../page/SpectatorPage.java                   | 10 +++----
 .../game/arcade/managers/GameHostManager.java |  7 ++---
 23 files changed, 132 insertions(+), 148 deletions(-)
 delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/GameHostShop.java
 delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/GameSettingsButton.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/PrivateServerShop.java
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/button/BanButton.java (61%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/button/EditRotationButton.java (61%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/button/GiveAdminButton.java (61%)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/OptionsButton.java
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/button/SetGameButton.java (61%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/button/UnbanButton.java (61%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/page/BanPage.java (71%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{page/GameHostPage.java => privateServer/page/BasePage.java} (74%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/page/EditRotationPage.java (85%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/page/GiveAdminPage.java (71%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{page/GameHostMenuPage.java => privateServer/page/MenuPage.java} (66%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{page/GameHostOptionsPage.java => privateServer/page/OptionsPage.java} (91%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/page/PlayerPage.java (82%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/page/SetGamePage.java (78%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => privateServer}/page/UnbanPage.java (84%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => spectatorMenu}/SpectatorShop.java (90%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => spectatorMenu}/button/SpectatorButton.java (93%)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/{ => spectatorMenu}/page/SpectatorPage.java (95%)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java
index f7569f949..b28f531fe 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/CompassAddon.java
@@ -32,7 +32,7 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.gui.SpectatorShop;
+import nautilus.game.arcade.gui.spectatorMenu.SpectatorShop;
 
 public class CompassAddon extends MiniPlugin
 {
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/GameHostShop.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/GameHostShop.java
deleted file mode 100644
index 9bdc7809c..000000000
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/GameHostShop.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package nautilus.game.arcade.gui;
-
-import java.util.Arrays;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.SkullMeta;
-
-import mineplex.core.account.CoreClientManager;
-import mineplex.core.donation.DonationManager;
-import mineplex.core.shop.ShopBase;
-import mineplex.core.shop.page.ShopPageBase;
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.page.GameHostMenuPage;
-
-public class GameHostShop extends ShopBase<ArcadeManager>
-{
-	public GameHostShop(ArcadeManager plugin, CoreClientManager clientManager, DonationManager donationManager)
-	{
-		super(plugin, clientManager, donationManager, "Private Server Menu");
-	}
-
-	@Override
-	protected ShopPageBase<ArcadeManager, ? extends ShopBase<ArcadeManager>> BuildPagesFor(Player player)
-	{
-		return new GameHostMenuPage(Plugin, this, player);
-	}
-}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/GameSettingsButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/GameSettingsButton.java
deleted file mode 100644
index 037683152..000000000
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/GameSettingsButton.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package nautilus.game.arcade.gui.button;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-
-import mineplex.core.shop.item.IButton;
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
-import nautilus.game.arcade.gui.page.GameHostOptionsPage;
-import nautilus.game.arcade.gui.page.GiveAdminPage;
-
-public class GameSettingsButton implements IButton
-{
-	private ArcadeManager _arcadeManager;
-	private GameHostShop _shop;
-
-	public GameSettingsButton(ArcadeManager arcadeManager, GameHostShop shop)
-	{
-		_shop = shop;
-		_arcadeManager = arcadeManager;
-	}
-
-	@Override
-	public void onClick(Player player, ClickType clickType)
-	{
-		_shop.OpenPageForPlayer(player, new GameHostOptionsPage(_arcadeManager, _shop, player));
-	}
-}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/PrivateServerShop.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/PrivateServerShop.java
new file mode 100644
index 000000000..a6dbe14df
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/PrivateServerShop.java
@@ -0,0 +1,24 @@
+package nautilus.game.arcade.gui.privateServer;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.gui.privateServer.page.MenuPage;
+
+public class PrivateServerShop extends ShopBase<ArcadeManager>
+{
+	public PrivateServerShop(ArcadeManager plugin, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Private Server Menu");
+	}
+
+	@Override
+	protected ShopPageBase<ArcadeManager, ? extends ShopBase<ArcadeManager>> BuildPagesFor(Player player)
+	{
+		return new MenuPage(Plugin, this, player);
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/BanButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BanButton.java
similarity index 61%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/BanButton.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BanButton.java
index 7d09e2ff2..180bb8ee1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/BanButton.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BanButton.java
@@ -1,19 +1,19 @@
-package nautilus.game.arcade.gui.button;
+package nautilus.game.arcade.gui.privateServer.button;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
-import nautilus.game.arcade.gui.page.BanPage;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.BanPage;
 
 public class BanButton implements IButton
 {
 	private ArcadeManager _arcadeManager;
-	private GameHostShop _shop;
+	private PrivateServerShop _shop;
 
-	public BanButton(ArcadeManager arcadeManager, GameHostShop shop)
+	public BanButton(ArcadeManager arcadeManager, PrivateServerShop shop)
 	{
 		_shop = shop;
 		_arcadeManager = arcadeManager;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/EditRotationButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/EditRotationButton.java
similarity index 61%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/EditRotationButton.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/EditRotationButton.java
index bf7d0eb09..9e02640ae 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/EditRotationButton.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/EditRotationButton.java
@@ -1,19 +1,19 @@
-package nautilus.game.arcade.gui.button;
+package nautilus.game.arcade.gui.privateServer.button;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
-import nautilus.game.arcade.gui.page.EditRotationPage;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.EditRotationPage;
 
 public class EditRotationButton implements IButton
 {
 	private ArcadeManager _arcadeManager;
-	private GameHostShop _shop;
+	private PrivateServerShop _shop;
 
-	public EditRotationButton(ArcadeManager arcadeManager, GameHostShop shop)
+	public EditRotationButton(ArcadeManager arcadeManager, PrivateServerShop shop)
 	{
 		_shop = shop;
 		_arcadeManager = arcadeManager;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/GiveAdminButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/GiveAdminButton.java
similarity index 61%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/GiveAdminButton.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/GiveAdminButton.java
index 17fe7ef93..19fd20f85 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/GiveAdminButton.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/GiveAdminButton.java
@@ -1,19 +1,19 @@
-package nautilus.game.arcade.gui.button;
+package nautilus.game.arcade.gui.privateServer.button;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
-import nautilus.game.arcade.gui.page.GiveAdminPage;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.GiveAdminPage;
 
 public class GiveAdminButton implements IButton
 {
 	private ArcadeManager _arcadeManager;
-	private GameHostShop _shop;
+	private PrivateServerShop _shop;
 
-	public GiveAdminButton(ArcadeManager arcadeManager, GameHostShop shop)
+	public GiveAdminButton(ArcadeManager arcadeManager, PrivateServerShop shop)
 	{
 		_shop = shop;
 		_arcadeManager = arcadeManager;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/OptionsButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/OptionsButton.java
new file mode 100644
index 000000000..4b1e934a3
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/OptionsButton.java
@@ -0,0 +1,27 @@
+package nautilus.game.arcade.gui.privateServer.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.OptionsPage;
+
+public class OptionsButton implements IButton
+{
+	private ArcadeManager _arcadeManager;
+	private PrivateServerShop _shop;
+
+	public OptionsButton(ArcadeManager arcadeManager, PrivateServerShop shop)
+	{
+		_shop = shop;
+		_arcadeManager = arcadeManager;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_shop.OpenPageForPlayer(player, new OptionsPage(_arcadeManager, _shop, player));
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/SetGameButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/SetGameButton.java
similarity index 61%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/SetGameButton.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/SetGameButton.java
index 1fb348a07..80159ae1f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/SetGameButton.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/SetGameButton.java
@@ -1,19 +1,19 @@
-package nautilus.game.arcade.gui.button;
+package nautilus.game.arcade.gui.privateServer.button;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
-import nautilus.game.arcade.gui.page.SetGamePage;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.SetGamePage;
 
 public class SetGameButton implements IButton
 {
 	private ArcadeManager _arcadeManager;
-	private GameHostShop _shop;
+	private PrivateServerShop _shop;
 
-	public SetGameButton(ArcadeManager arcadeManager, GameHostShop shop)
+	public SetGameButton(ArcadeManager arcadeManager, PrivateServerShop shop)
 	{
 		_shop = shop;
 		_arcadeManager = arcadeManager;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/UnbanButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/UnbanButton.java
similarity index 61%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/UnbanButton.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/UnbanButton.java
index 2ca023eb5..affb50a28 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/UnbanButton.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/UnbanButton.java
@@ -1,20 +1,19 @@
-package nautilus.game.arcade.gui.button;
+package nautilus.game.arcade.gui.privateServer.button;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
-import nautilus.game.arcade.gui.page.BanPage;
-import nautilus.game.arcade.gui.page.UnbanPage;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.UnbanPage;
 
 public class UnbanButton implements IButton
 {
 	private ArcadeManager _arcadeManager;
-	private GameHostShop _shop;
+	private PrivateServerShop _shop;
 
-	public UnbanButton(ArcadeManager arcadeManager, GameHostShop shop)
+	public UnbanButton(ArcadeManager arcadeManager, PrivateServerShop shop)
 	{
 		_shop = shop;
 		_arcadeManager = arcadeManager;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/BanPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BanPage.java
similarity index 71%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/BanPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BanPage.java
index 64514cecb..5779e1f58 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/BanPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BanPage.java
@@ -1,12 +1,12 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.entity.Player;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
 public class BanPage extends PlayerPage
 {
-	public BanPage(ArcadeManager plugin, GameHostShop shop, Player player)
+	public BanPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
 		super(plugin, shop, "Ban Players", player);
 		BuildPage();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
similarity index 74%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
index 717829671..9629edc8c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
@@ -1,7 +1,6 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import java.util.Arrays;
-import java.util.function.Consumer;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -14,19 +13,19 @@ import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import mineplex.core.shop.page.ShopPageBase;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 import nautilus.game.arcade.managers.GameHostManager;
 
-public abstract class GameHostPage extends ShopPageBase<ArcadeManager, GameHostShop>
+public abstract class BasePage extends ShopPageBase<ArcadeManager, PrivateServerShop>
 {
 	protected GameHostManager _manager;
 
-	public GameHostPage(ArcadeManager plugin, GameHostShop shop, String pageName, Player player)
+	public BasePage(ArcadeManager plugin, PrivateServerShop shop, String pageName, Player player)
 	{
 		this(plugin, shop, pageName, player, 54);
 	}
 
-	public GameHostPage(ArcadeManager plugin, GameHostShop shop, String pageName, Player player, int slots)
+	public BasePage(ArcadeManager plugin, PrivateServerShop shop, String pageName, Player player, int slots)
 	{
 		super(plugin, shop, plugin.GetClients(), plugin.GetDonation(), pageName, player, slots);
 
@@ -40,7 +39,7 @@ public abstract class GameHostPage extends ShopPageBase<ArcadeManager, GameHostS
 			@Override
 			public void onClick(Player player, ClickType clickType)
 			{
-				Shop.OpenPageForPlayer(player, new GameHostMenuPage(Plugin, Shop, player));
+				Shop.OpenPageForPlayer(player, new MenuPage(Plugin, Shop, player));
 			}
 		});
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/EditRotationPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
similarity index 85%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/EditRotationPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
index a7e6a9334..0c4f3fa3b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/EditRotationPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
@@ -1,4 +1,4 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import java.util.List;
 
@@ -11,11 +11,11 @@ import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
-public class EditRotationPage extends GameHostPage
+public class EditRotationPage extends BasePage
 {
-	public EditRotationPage(ArcadeManager plugin, GameHostShop shop, Player player)
+	public EditRotationPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
 		super(plugin, shop, "Edit Rotation", player);
 		BuildPage();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GiveAdminPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GiveAdminPage.java
similarity index 71%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GiveAdminPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GiveAdminPage.java
index f08098ce8..c4c75ada6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GiveAdminPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GiveAdminPage.java
@@ -1,13 +1,13 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.entity.Player;
 
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
 public class GiveAdminPage extends PlayerPage
 {
-	public GiveAdminPage(ArcadeManager plugin, GameHostShop shop, Player player)
+	public GiveAdminPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
 		super(plugin, shop, "Give Admin", player);
 		BuildPage();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostMenuPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
similarity index 66%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostMenuPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
index 956699bec..e018af96b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostMenuPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
@@ -1,4 +1,4 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -7,18 +7,17 @@ import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.shop.item.ShopItem;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
-import nautilus.game.arcade.gui.button.BanButton;
-import nautilus.game.arcade.gui.button.EditRotationButton;
-import nautilus.game.arcade.gui.button.GiveAdminButton;
-import nautilus.game.arcade.gui.button.SetGameButton;
-import nautilus.game.arcade.gui.button.GameSettingsButton;
-import nautilus.game.arcade.gui.button.UnbanButton;
-import nautilus.game.arcade.managers.GameHostManager;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.button.BanButton;
+import nautilus.game.arcade.gui.privateServer.button.EditRotationButton;
+import nautilus.game.arcade.gui.privateServer.button.GiveAdminButton;
+import nautilus.game.arcade.gui.privateServer.button.SetGameButton;
+import nautilus.game.arcade.gui.privateServer.button.OptionsButton;
+import nautilus.game.arcade.gui.privateServer.button.UnbanButton;
 
-public class GameHostMenuPage extends GameHostPage
+public class MenuPage extends BasePage
 {
-	public GameHostMenuPage(ArcadeManager plugin, GameHostShop shop, Player player)
+	public MenuPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
 		super(plugin, shop, "Private Server Menu", player, 9*3);
 		BuildPage();
@@ -39,8 +38,8 @@ public class GameHostMenuPage extends GameHostPage
 		GiveAdminButton giveAdminButton = new GiveAdminButton(Plugin, Shop);
 		AddButton(3 + 9, new ShopItem(Material.ENDER_CHEST, "Give Admin", new String[] {}, 1, false), giveAdminButton);
 
-		GameSettingsButton gameSettingsButton = new GameSettingsButton(Plugin, Shop);
-		AddButton(5 + 9, new ShopItem(Material.LEVER, "Toggle Game Settings", new String[] {}, 1, false), gameSettingsButton);
+		OptionsButton optionsButton = new OptionsButton(Plugin, Shop);
+		AddButton(5 + 9, new ShopItem(Material.LEVER, "Toggle Game Settings", new String[] {}, 1, false), optionsButton);
 
 		BanButton banButton = new BanButton(Plugin, Shop);
 		AddButton(7 + 9, new ShopItem(Material.MONSTER_EGG, "Ban Player", new String[] {}, 1, false), banButton);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostOptionsPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
similarity index 91%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostOptionsPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
index 0ea0f74a2..8f446bd02 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/GameHostOptionsPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
@@ -1,4 +1,4 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -9,13 +9,13 @@ import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.GameServerConfig;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
-public class GameHostOptionsPage extends GameHostPage
+public class OptionsPage extends BasePage
 {
 	private GameServerConfig _config;
 
-	public GameHostOptionsPage(ArcadeManager plugin, GameHostShop shop, Player player)
+	public OptionsPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
 		super(plugin, shop, "Game Options", player);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/PlayerPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/PlayerPage.java
similarity index 82%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/PlayerPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/PlayerPage.java
index 249ec3f6a..c67f7d845 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/PlayerPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/PlayerPage.java
@@ -1,4 +1,4 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -9,11 +9,11 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
-public abstract class PlayerPage extends GameHostPage
+public abstract class PlayerPage extends BasePage
 {
-	public PlayerPage(ArcadeManager plugin, GameHostShop shop, String pageName, Player player)
+	public PlayerPage(ArcadeManager plugin, PrivateServerShop shop, String pageName, Player player)
 	{
 		super(plugin, shop, pageName, player);
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
similarity index 78%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/SetGamePage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index 0694122df..95e8f20bc 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -1,6 +1,4 @@
-package nautilus.game.arcade.gui.page;
-
-import java.util.List;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -11,11 +9,11 @@ import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
-public class SetGamePage extends GameHostPage
+public class SetGamePage extends BasePage
 {
-	public SetGamePage(ArcadeManager plugin, GameHostShop shop, Player player)
+	public SetGamePage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
 		super(plugin, shop, "Set Game", player);
 		BuildPage();
@@ -44,7 +42,7 @@ public class SetGamePage extends GameHostPage
 			public void onClick(Player player, ClickType clickType)
 			{
 				Plugin.GetGame().setGame(type, player, true);
-				Player.closeInventory();
+				org.bukkit.entity.Player.closeInventory();
 			}
 		});
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/UnbanPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/UnbanPage.java
similarity index 84%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/UnbanPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/UnbanPage.java
index 512061060..cd19e83a9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/UnbanPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/UnbanPage.java
@@ -1,4 +1,4 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.privateServer.page;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -11,11 +11,11 @@ import org.bukkit.inventory.ItemStack;
 import mineplex.core.common.util.C;
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
-public class UnbanPage extends GameHostPage
+public class UnbanPage extends BasePage
 {
-	public UnbanPage(ArcadeManager plugin, GameHostShop shop, Player player)
+	public UnbanPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
 		super(plugin, shop, "Unban Players", player);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/SpectatorShop.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/SpectatorShop.java
similarity index 90%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/SpectatorShop.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/SpectatorShop.java
index c161ea981..5e8271d82 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/SpectatorShop.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/SpectatorShop.java
@@ -1,4 +1,4 @@
-package nautilus.game.arcade.gui;
+package nautilus.game.arcade.gui.spectatorMenu;
 
 import org.bukkit.entity.Player;
 import mineplex.core.account.CoreClientManager;
@@ -8,7 +8,7 @@ import mineplex.core.shop.ShopBase;
 import mineplex.core.shop.page.ShopPageBase;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.addons.CompassAddon;
-import nautilus.game.arcade.gui.page.SpectatorPage;
+import nautilus.game.arcade.gui.spectatorMenu.page.SpectatorPage;
 
 /**
  * Created by shaun on 14-09-24.
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/SpectatorButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/button/SpectatorButton.java
similarity index 93%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/SpectatorButton.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/button/SpectatorButton.java
index 775ffed4e..19783df13 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/button/SpectatorButton.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/button/SpectatorButton.java
@@ -1,6 +1,5 @@
-package nautilus.game.arcade.gui.button;
+package nautilus.game.arcade.gui.spectatorMenu.button;
 
-import org.bukkit.GameMode;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/SpectatorPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/page/SpectatorPage.java
similarity index 95%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/SpectatorPage.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/page/SpectatorPage.java
index 5166e9999..0f449b5b0 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/page/SpectatorPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/spectatorMenu/page/SpectatorPage.java
@@ -1,17 +1,15 @@
-package nautilus.game.arcade.gui.page;
+package nautilus.game.arcade.gui.spectatorMenu.page;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
-import org.bukkit.scoreboard.Team;
 
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.util.C;
@@ -23,8 +21,8 @@ import mineplex.core.shop.page.ShopPageBase;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.addons.CompassAddon;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.gui.SpectatorShop;
-import nautilus.game.arcade.gui.button.SpectatorButton;
+import nautilus.game.arcade.gui.spectatorMenu.SpectatorShop;
+import nautilus.game.arcade.gui.spectatorMenu.button.SpectatorButton;
 
 /**
  * Created by shaun on 14-09-24.
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index 7994633e7..f296b39f9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import com.sun.org.apache.xpath.internal.SourceTree;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
@@ -17,7 +16,7 @@ import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.game.Game.GameState;
-import nautilus.game.arcade.gui.GameHostShop;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -49,12 +48,12 @@ public class GameHostManager implements Listener
 	private HashSet<String> _whitelist = new HashSet<String>();
 	private HashSet<String> _blacklist = new HashSet<String>();
 
-	private GameHostShop _shop;
+	private PrivateServerShop _shop;
 	
 	public GameHostManager(ArcadeManager manager)
 	{
 		Manager = manager;
-		_shop = new GameHostShop(manager, manager.GetClients(), manager.GetDonation());
+		_shop = new PrivateServerShop(manager, manager.GetClients(), manager.GetDonation());
 		Manager.GetPluginManager().registerEvents(this, Manager.GetPlugin());
 
 		//Ultra Games